From e3a835a4dc33c942eb5b01c52af8fc2d394435ed Mon Sep 17 00:00:00 2001
From: Flavio Torres <flavio@apetis.com>
Date: Tue, 26 Sep 2017 23:52:20 -0300
Subject: [PATCH 001/388] Parse.Relation.add and Parse.Relation.remove can
 accept a Array of Parse.Object

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

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 82194e65a2..ee79e94955 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -280,13 +280,13 @@ declare namespace Parse {
         constructor(parent?: S, key?: string);
 
         //Adds a Parse.Object or an array of Parse.Objects to the relation.
-        add(object: T): void;
+        add(object: T | Array<T>): void;
 
         // Returns a Parse.Query that is limited to objects in this relation.
         query(): Query<T>;
 
         // Removes a Parse.Object or an array of Parse.Objects from this relation.
-        remove(object: T): void;
+        remove(object: T | Array<T>): void;
     }
 
     /**
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index 76440e46d3..eba5adc91b 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -227,7 +227,15 @@ function test_analytics() {
 }
 
 function test_relation() {
+    var game1 = new Game();
+    var game2 = new Game();
+
     new Parse.User().relation("games").query().find().then((g: Game[]) => { });
+    new Parse.User().relation("games").add(game1)
+    new Parse.User().relation("games").add([game1, game2])
+
+    new Parse.User().relation("games").remove(game1)
+    new Parse.User().relation("games").remove([game1, game2])
 }
 
 function test_user_acl_roles() {

From 26d39cd9cf9cd16765f560cbe02b873ba5ba41a1 Mon Sep 17 00:00:00 2001
From: Flavio Torres <flavio@apetis.com>
Date: Tue, 9 Jan 2018 09:04:19 -0200
Subject: [PATCH 002/388] Parse.Object set and save methods can receive a
 object as parameter

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

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 8afefce1d5..0042e1d9e6 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -98,11 +98,11 @@ declare namespace Parse {
         reject(error: any): void;
         resolve(result: any): void;
         then<U>(resolvedCallback: (...values: T[]) => IPromise<U>,
-                rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
+            rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
         then<U>(resolvedCallback: (...values: T[]) => U,
-                rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
+            rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
         then<U>(resolvedCallback: (...values: T[]) => U,
-                rejectedCallback?: (reason: any) => U): IPromise<U>;
+            rejectedCallback?: (reason: any) => U): IPromise<U>;
     }
 
     interface Pointer {
@@ -373,7 +373,9 @@ declare namespace Parse {
         remove(attr: string, item: any): any;
         save(attrs?: { [key: string]: any } | null, options?: Object.SaveOptions): Promise<this>;
         save(key: string, value: any, options?: Object.SaveOptions): Promise<this>;
+        save(attrs: object, options?: Object.SaveOptions): Promise<this>;
         set(key: string, value: any, options?: Object.SetOptions): boolean;
+        set(attrs: object, options?: Object.SetOptions): boolean;
         setACL(acl: ACL, options?: SuccessFailureOptions): boolean;
         toPointer(): Pointer;
         unset(attr: string, options?: any): any;
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index dbfa82fa3f..2c122a295c 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -57,6 +57,12 @@ function test_object() {
     gameScore.set("cheatMode", false);
 
 
+    // Setting attrs using object
+    gameScore.set({
+        level: '10',
+        difficult: 15
+    });
+
     const score = gameScore.get("score");
     const playerName = gameScore.get("playerName");
     const cheatMode = gameScore.get("cheatMode");
@@ -274,6 +280,7 @@ function test_user_acl_roles() {
     game.setACL(new Parse.ACL(Parse.User.current()));
     game.save().then((game: Game) => { });
     game.save(null, { useMasterKey: true });
+    game.save({ score: '10' }, { useMasterKey: true });
 
     const groupACL = new Parse.ACL();
 
@@ -366,7 +373,7 @@ function test_cloud_functions() {
     });
 
     Parse.Cloud.beforeDelete('MyCustomClass', (request: Parse.Cloud.BeforeDeleteRequest,
-                                               response: Parse.Cloud.BeforeDeleteResponse) => {
+        response: Parse.Cloud.BeforeDeleteResponse) => {
         // result
     });
 

From 8656d6391434e77b76a5af0d8105922ca1029650 Mon Sep 17 00:00:00 2001
From: Flavio Torres <flavio@apetis.com>
Date: Tue, 9 Jan 2018 09:31:21 -0200
Subject: [PATCH 003/388] Parse.User signup method options fix

---
 types/parse/index.d.ts     | 9 +++++++--
 types/parse/parse-tests.ts | 8 ++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 0042e1d9e6..1973c8938b 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -31,6 +31,11 @@ declare namespace Parse {
     interface SuccessFailureOptions extends SuccessOption, ErrorOption {
     }
 
+    interface SignUpOptions {
+        useMasterKey?: boolean;
+        installationId?: string;
+    }
+
     interface SessionTokenOption {
         sessionToken?: string;
     }
@@ -741,7 +746,7 @@ declare namespace Parse {
     class User extends Object {
 
         static current(): User | undefined;
-        static signUp(username: string, password: string, attrs: any, options?: SuccessFailureOptions): Promise<User>;
+        static signUp(username: string, password: string, attrs: any, options?: SignUpOptions): Promise<User>;
         static logIn(username: string, password: string, options?: SuccessFailureOptions): Promise<User>;
         static logOut(): Promise<User>;
         static allowCustomUserClass(isAllowed: boolean): void;
@@ -749,7 +754,7 @@ declare namespace Parse {
         static requestPasswordReset(email: string, options?: SuccessFailureOptions): Promise<User>;
         static extend(protoProps?: any, classProps?: any): any;
 
-        signUp(attrs: any, options?: SuccessFailureOptions): Promise<this>;
+        signUp(attrs: any, options?: SignUpOptions): Promise<this>;
         logIn(options?: SuccessFailureOptions): Promise<this>;
         authenticated(): boolean;
         isCurrent(): boolean;
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index 2c122a295c..87194ba02c 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -252,6 +252,14 @@ function test_relation() {
     new Parse.User().relation("games").remove([game1, game2])
 }
 
+function test_user() {
+    const user = new Parse.User();
+    user.set("username", "my name");
+    user.set("password", "my pass");
+    user.set("email", "email@example.com");
+    user.signUp(null, { useMasterKey: true });
+}
+
 function test_user_acl_roles() {
 
     const user = new Parse.User();

From 59cc96866866f5f6c97b939cc6448caf369a288d Mon Sep 17 00:00:00 2001
From: shrey <shrey-jain@hotmail.com>
Date: Sat, 20 Jan 2018 19:22:24 -0500
Subject: [PATCH 004/388] Fixed definitions for parsers.

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

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index fdf23891cb..08d27a75c6 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Nico Zelaya <https://github.com/NicoZelaya>
 //                 Michael Ledin <https://github.com/mxl>
 //                 Pap Lőrinc <https://github.com/paplorinc>
+//                 Shrey Jain <https://github.com/shreyjain1994>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -16,6 +17,8 @@ type CallbackHandler = (err: any, res: request.Response) => void;
 
 type Serializer = (obj: any) => string;
 
+type Parser = (res: request.Response, callback: (err: Error | null, body: any) => void) => void;
+
 type MultipartValueSingle = Blob | Buffer | fs.ReadStream | string | boolean | number;
 
 type MultipartValue = MultipartValueSingle | MultipartValueSingle[];
@@ -37,6 +40,7 @@ declare namespace request {
 
         agent(): SuperAgent<SuperAgentRequest>;
         serialize: { [type: string]: Serializer };
+        parse: { [type: string]: Parser };
     }
 
     interface SuperAgent<Req extends SuperAgentRequest> extends stream.Stream {
@@ -55,7 +59,6 @@ declare namespace request {
         move(url: string, callback?: CallbackHandler): Req;
         notify(url: string, callback?: CallbackHandler): Req;
         options(url: string, callback?: CallbackHandler): Req;
-        parse(fn: (res: Response, callback: (err: Error | null, body: any) => void) => void): this;
         patch(url: string, callback?: CallbackHandler): Req;
         post(url: string, callback?: CallbackHandler): Req;
         propfind(url: string, callback?: CallbackHandler): Req;
@@ -122,7 +125,7 @@ declare namespace request {
         on(name: 'error', handler: (err: any) => void): this;
         on(name: 'progress', handler: (event: ProgressEvent) => void): this;
         on(name: string, handler: (event: any) => void): this;
-        parse(fn: (res: Response, callback: (err: Error | null, body: any) => void) => void): this;
+        parse(parser: Parser): this;
         part(): this;
         pfx(cert: Buffer | string): this;
         pipe(stream: NodeJS.WritableStream, options?: object): stream.Writable;

From b6c91649b43859a56fe80ab1adbc9fc159bc8a8b Mon Sep 17 00:00:00 2001
From: Shrey Jain <shrey.jain@mail.utoronto.ca>
Date: Mon, 22 Jan 2018 10:28:54 -0500
Subject: [PATCH 005/388] Different parser functions signatures for browser and
 node.

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

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index 08d27a75c6..200046d439 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -17,7 +17,11 @@ type CallbackHandler = (err: any, res: request.Response) => void;
 
 type Serializer = (obj: any) => string;
 
-type Parser = (res: request.Response, callback: (err: Error | null, body: any) => void) => void;
+type BrowserParser = (str: string) => any;
+
+type NodeParser = (res: request.Response, callback: (err: Error | null, body: any) => void) => void;
+
+type Parser = BrowserParser | NodeParser;
 
 type MultipartValueSingle = Blob | Buffer | fs.ReadStream | string | boolean | number;
 

From c5c1d63e4cd32a45f771158b1b949d1eee2a571b Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Mon, 22 Jan 2018 22:22:44 -0800
Subject: [PATCH 006/388] 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 3157b3c04909dbf5ade1833b65432c08b2cf5ee8 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Mon, 22 Jan 2018 23:47:53 -0800
Subject: [PATCH 007/388] 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 64113e42c74783b90de48b45bf6c7fb70a686f26 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:00:12 -0800
Subject: [PATCH 008/388] 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 a0e3aae50fda3f355de7f23272c85d0762222afe Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:11:13 -0800
Subject: [PATCH 009/388] 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 9df6a9f1d4775bc5171910f2f74d30ae1896b778 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:25:00 -0800
Subject: [PATCH 010/388] 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 e73013b99b43cda544c6f4a43ef1029962c32eb1 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:33:24 -0800
Subject: [PATCH 011/388] 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 b3a964504c5336dfe28e2f309b427972e96c190a Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:36:55 -0800
Subject: [PATCH 012/388] 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 1d931013bf77701f44a5540b9cbcd544ab568b3f Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:39:49 -0800
Subject: [PATCH 013/388] 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 75db9206689a205e8fe882eba68c422680bb5b27 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 08:56:53 -0800
Subject: [PATCH 014/388] 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 d0adcf2e8f3235e98ca35ef9481d349ac82fad59 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 13:00:24 -0800
Subject: [PATCH 015/388] 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 d4db7918028efa97f6d046bb33789e4ae169027b Mon Sep 17 00:00:00 2001
From: Derek Wickern <dwickern@gmail.com>
Date: Sat, 27 Jan 2018 19:04:30 -0800
Subject: [PATCH 016/388] ember-data: fix error when using async/await

---
 types/ember-data/index.d.ts    |  4 ++--
 types/ember-data/test/store.ts | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index a59ab4de97..e485edff21 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -854,7 +854,7 @@ declare module "ember-data" {
          */
         interface PromiseArray<T>
             extends Ember.ArrayProxy<T>,
-        Ember.PromiseProxyMixin<PromiseArray<T>> {}
+        Ember.PromiseProxyMixin<Ember.ArrayProxy<T>> {}
         class PromiseArray<T> {}
         /**
          * A `PromiseObject` is an object that acts like both an `Ember.Object`
@@ -865,7 +865,7 @@ declare module "ember-data" {
          */
         interface PromiseObject<T>
             extends Ember.ObjectProxy,
-        Ember.PromiseProxyMixin<T & PromiseObject<T>> {}
+        Ember.PromiseProxyMixin<T & Ember.ObjectProxy> {}
         class PromiseObject<T> {}
         /**
          * A PromiseManyArray is a PromiseArray that also proxies certain method calls
diff --git a/types/ember-data/test/store.ts b/types/ember-data/test/store.ts
index 46b0987981..a651cd23db 100644
--- a/types/ember-data/test/store.ts
+++ b/types/ember-data/test/store.ts
@@ -4,8 +4,10 @@ import { assertType } from "./lib/assert";
 
 declare const store: DS.Store;
 
+class Comment extends DS.Model {}
 class Post extends DS.Model {
   title = DS.attr('string');
+  comments = DS.hasMany<Comment>('comment');
 }
 
 let post = store.createRecord<Post>('post', {
@@ -74,6 +76,34 @@ const MyRoute = Ember.Route.extend({
     }
 });
 
+const MyRouteAsync = Ember.Route.extend({
+    async beforeModel(): Promise<Ember.Array<DS.Model>> {
+        const store = Ember.get(this, 'store');
+        return await store.findAll('someStoreRecord');
+    },
+    async model(): Promise<DS.Model> {
+        const store = this.get('store');
+        return await store.findRecord('someStoreRecord', 1);
+    },
+    async afterModel(): Promise<Ember.Array<Comment>> {
+        const post = await this.get('store').findRecord<Post>('post', 1);
+        return await post.get('comments');
+    }
+});
+
+class MyRouteAsyncES6 extends Ember.Route {
+    async beforeModel(): Promise<Ember.Array<DS.Model>> {
+        return await this.store.findAll('someStoreRecord');
+    }
+    async model(): Promise<DS.Model> {
+        return await this.store.findRecord('someStoreRecord', 1);
+    }
+    async afterModel(): Promise<Ember.Array<Comment>> {
+        const post = await this.store.findRecord<Post>('post', 1);
+        return await post.get('comments');
+    }
+}
+
 // GET to /users?filter[email]=tomster@example.com
 const tom = store.query('user', {
     filter: {

From b59ec53dd0324dcf017cbdb33c7eedb4a6721db4 Mon Sep 17 00:00:00 2001
From: Rahul Kashyap <kashyaprahul94@gmail.com>
Date: Sun, 28 Jan 2018 18:20:43 +0530
Subject: [PATCH 017/388] Update index.d.ts

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

diff --git a/types/johnny-five/index.d.ts b/types/johnny-five/index.d.ts
index 95a348429d..689a78050a 100644
--- a/types/johnny-five/index.d.ts
+++ b/types/johnny-five/index.d.ts
@@ -510,10 +510,10 @@ export declare module Led {
 
         on(): void;
         off(): void;
-        color(value: number): void;
+        color(value: string): void;
         toggle(): void;
         strobe(ms: number): void;
-        brightness(value: number): void;
+        intensity(value: number): void;
         fadeIn(ms: number): void;
         fadeOut(ms: number): void;
         pulse(ms: number): void;

From 45b0c5292e28b3a29cdf870ec1d231902293cb86 Mon Sep 17 00:00:00 2001
From: Derek Wickern <dwickern@gmail.com>
Date: Mon, 29 Jan 2018 07:05:40 -0800
Subject: [PATCH 018/388] silence "no-return-await"

---
 types/ember-data/tslint.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/ember-data/tslint.json b/types/ember-data/tslint.json
index 6d765664cf..bd25c193fd 100644
--- a/types/ember-data/tslint.json
+++ b/types/ember-data/tslint.json
@@ -13,6 +13,7 @@
         "prefer-const": false,
         "no-unnecessary-generics": false,
         "no-declare-current-package": false,
-        "no-self-import": false
+        "no-self-import": false,
+        "no-return-await": false // used in tests
     }
 }

From 0e0af52729eacebeceb0be751ff90d8d319115df Mon Sep 17 00:00:00 2001
From: Anatoly Belonog <anatoly.belonog@xored.com>
Date: Thu, 1 Feb 2018 19:05:56 +0700
Subject: [PATCH 019/388] [async-lock] update types and tests

---
 types/async-lock/async-lock-tests.ts | 7 ++++---
 types/async-lock/index.d.ts          | 4 ++--
 types/async-lock/tsconfig.json       | 0
 types/async-lock/tslint.json         | 0
 4 files changed, 6 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 types/async-lock/async-lock-tests.ts
 mode change 100644 => 100755 types/async-lock/index.d.ts
 mode change 100644 => 100755 types/async-lock/tsconfig.json
 mode change 100644 => 100755 types/async-lock/tslint.json

diff --git a/types/async-lock/async-lock-tests.ts b/types/async-lock/async-lock-tests.ts
old mode 100644
new mode 100755
index c6866d270b..64a1e89c75
--- a/types/async-lock/async-lock-tests.ts
+++ b/types/async-lock/async-lock-tests.ts
@@ -6,9 +6,9 @@ lock.acquire("key", (done) => {
   done();
 }, (err, ret) => { /* ... */ });
 
-lock.acquire("key", (done) => {
-  done();
-}).then(() => { /* ... */ });
+lock.acquire("key", (done) => { done(); })
+  .then(() => { /* ... */ })
+  .catch(() => { /* ... */ });
 
 lock.acquire("key", () => "stringValue")
 // Check returned value's type is inherited properly
@@ -23,6 +23,7 @@ lock.acquire([ "key1", "key2" ], (done) => {
 }, (err, ret) => { /* ... */ });
 
 lock.isBusy();
+lock.isBusy('key')
 
 const lock2 = new AsyncLock({ timeout : 5000 });
 const lock3 = new AsyncLock({ maxPending : 5000 });
diff --git a/types/async-lock/index.d.ts b/types/async-lock/index.d.ts
old mode 100644
new mode 100755
index 5527482748..37bfe33aaf
--- a/types/async-lock/index.d.ts
+++ b/types/async-lock/index.d.ts
@@ -21,13 +21,13 @@ declare class AsyncLock {
 
     acquire<T>(key: string | string[],
                fn: (() => T | PromiseLike<T>) | ((done: AsyncLockDoneCallback<T>) => any),
-               opts?: AsyncLockOptions): PromiseLike<T>;
+               opts?: AsyncLockOptions): Promise<T>;
     acquire<T>(key: string | string[],
                fn: (done: AsyncLockDoneCallback<T>) => any,
                cb: AsyncLockDoneCallback<T>,
                opts?: AsyncLockOptions): void;
 
-    isBusy(): boolean;
+    isBusy(key?: string): boolean;
 }
 
 declare namespace AsyncLock { }
diff --git a/types/async-lock/tsconfig.json b/types/async-lock/tsconfig.json
old mode 100644
new mode 100755
diff --git a/types/async-lock/tslint.json b/types/async-lock/tslint.json
old mode 100644
new mode 100755

From 8d89c445b273b94e9187d78dac18229aa3cee490 Mon Sep 17 00:00:00 2001
From: Anatoly Belonog <anatoly.belonog@xored.com>
Date: Thu, 1 Feb 2018 19:15:19 +0700
Subject: [PATCH 020/388] add version and update authors

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

diff --git a/types/async-lock/index.d.ts b/types/async-lock/index.d.ts
index 37bfe33aaf..9e56e00a21 100755
--- a/types/async-lock/index.d.ts
+++ b/types/async-lock/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for async-lock
+// Type definitions for async-lock 1.1.0
 // Project: https://github.com/rain1017/async-lock
-// Definitions by: Elisée MAURER <https://github.com/elisee>, Alejandro <https://github.com/afharo>
+// Definitions by: Elisée MAURER <https://github.com/elisee> 
+//                 Alejandro <https://github.com/afharo>
+//                 Anatoly <https://github.com/rhymmor>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 

From 88e6900f8f03a0500ec4e056094fff6e6c761898 Mon Sep 17 00:00:00 2001
From: Mathias Lykkegaard Lorenzen <mathias.lorenzen@live.com>
Date: Wed, 7 Feb 2018 11:36:00 +0100
Subject: [PATCH 021/388] Update index.d.ts

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

diff --git a/types/knockout.mapping/index.d.ts b/types/knockout.mapping/index.d.ts
index 62effd565c..58a6c24d3a 100644
--- a/types/knockout.mapping/index.d.ts
+++ b/types/knockout.mapping/index.d.ts
@@ -48,7 +48,8 @@ declare global {
         fromJSON(jsonString: string, targetOrOptions: any): any;
         fromJSON(jsonString: string, inputOptions: any, target: any): any;
         toJS<T>(viewModel: KnockoutObservableArray<T>|KnockoutObservableType<T>[]|KnockoutObservableArray<KnockoutObservableType<T>>|T[], options?: KnockoutMappingOptions): T[];
-        toJS<T>(viewModel: KnockoutObservable<T>|KnockoutObservableType<T>|KnockoutObservable<KnockoutObservableType<T>>|T, options?: KnockoutMappingOptions): T;
+        toJS<T>(viewModel: KnockoutObservable<T>|KnockoutObservableType<T>|KnockoutObservable<KnockoutObservableType<T>>, options?: KnockoutMappingOptions): T;
+        toJS<T>(viewModel: T, options?: KnockoutMappingOptions): T;
         toJSON(rootObject: any, options?: KnockoutMappingOptions): string;
         defaultOptions(): KnockoutMappingOptions;
         resetDefaultOptions(): void;

From b0f63edb426da8bc99cec9994d227a6bfa523303 Mon Sep 17 00:00:00 2001
From: Flarna <deb2001-github@yahoo.de>
Date: Wed, 7 Feb 2018 22:05:33 +0100
Subject: [PATCH 022/388] [sinon] allow SinonSpyCall for some asserts

---
 types/sinon/index.d.ts     | 14 +++++++-------
 types/sinon/sinon-tests.ts | 12 ++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index f0433a694e..9348f3a690 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -353,19 +353,19 @@ declare namespace Sinon {
         calledThrice(spy: SinonSpy): void;
         callCount(spy: SinonSpy, count: number): void;
         callOrder(...spies: SinonSpy[]): void;
-        calledOn(spy: SinonSpy, obj: any): void;
+        calledOn(spy: SinonSpy | SinonSpyCall, obj: any): void;
         alwaysCalledOn(spy: SinonSpy, obj: any): void;
-        calledWith(spy: SinonSpy, ...args: any[]): void;
+        calledWith(spy: SinonSpy | SinonSpyCall, ...args: any[]): void;
         alwaysCalledWith(spy: SinonSpy, ...args: any[]): void;
         neverCalledWith(spy: SinonSpy, ...args: any[]): void;
-        calledWithExactly(spy: SinonSpy, ...args: any[]): void;
+        calledWithExactly(spy: SinonSpy | SinonSpyCall, ...args: any[]): void;
         alwaysCalledWithExactly(spy: SinonSpy, ...args: any[]): void;
-        calledWithMatch(spy: SinonSpy, ...args: any[]): void;
+        calledWithMatch(spy: SinonSpy | SinonSpyCall, ...args: any[]): void;
         alwaysCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
         neverCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
-        threw(spy: SinonSpy): void;
-        threw(spy: SinonSpy, exception: string): void;
-        threw(spy: SinonSpy, exception: any): void;
+        threw(spy: SinonSpy | SinonSpyCall): void;
+        threw(spy: SinonSpy | SinonSpyCall, exception: string): void;
+        threw(spy: SinonSpy | SinonSpyCall, exception: any): void;
         alwaysThrew(spy: SinonSpy): void;
         alwaysThrew(spy: SinonSpy, exception: string): void;
         alwaysThrew(spy: SinonSpy, exception: any): void;
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index 2e2286e538..16ec014b21 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -88,6 +88,18 @@ function testNine() {
     sinon.assert.calledWithMatch(callback, { x: 5 });
     sinon.assert.alwaysCalledWithMatch(callback, { y: 5 });
     sinon.assert.neverCalledWithMatch(callback, { x: 6 });
+
+    callback.call("this", "that");
+    callback.throws("Error");
+    try {
+        callback(15);
+    } catch (e) { }
+    sinon.assert.calledWith(callback.firstCall, { x: 5, y: 5});
+    sinon.assert.calledWithExactly(callback.firstCall, { x: 5, y: 5 });
+    sinon.assert.calledWithMatch(callback.firstCall, { x: 5 });
+    sinon.assert.calledOn(callback.secondCall, "this");
+    sinon.assert.threw(callback.thirdCall);
+    sinon.assert.threw(callback.thirdCall, "Error");
 }
 
 function testAssert() {

From 03957cb2727629860454dc131967a26b87860324 Mon Sep 17 00:00:00 2001
From: believer <rickard.laurin@gmail.com>
Date: Thu, 8 Feb 2018 19:38:08 +0100
Subject: [PATCH 023/388] Update bytes to 3.0.0

---
 types/bytes/bytes-tests.ts | 23 ++++++++++++-------
 types/bytes/index.d.ts     | 45 +++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/types/bytes/bytes-tests.ts b/types/bytes/bytes-tests.ts
index 69bac3977d..704b45eee4 100644
--- a/types/bytes/bytes-tests.ts
+++ b/types/bytes/bytes-tests.ts
@@ -1,17 +1,24 @@
-import bytes = require('bytes');
+import bytes = require("bytes");
 
 // 1024*1024 = 1048576
+console.log(bytes(undefined));
+console.log(bytes(null));
+
+console.log(bytes(1024));
 console.log(bytes(104857));
-console.log(bytes(104857, { thousandsSeparator: ' ' }));
+console.log(bytes(104857, { thousandsSeparator: " " }));
+console.log(bytes(104857, { decimalPlaces: 2 }));
+console.log(bytes(104857, { fixedDecimals: true }));
+console.log(bytes(104857, { unitSeparator: "-" }));
+console.log(bytes(104857, { unit: "GB" }));
 
 console.log(bytes.format(104857));
-console.log(bytes.format(104857, { thousandsSeparator: ' ' }));
+console.log(bytes.format(104857, { thousandsSeparator: " " }));
 console.log(bytes.format(104857, { decimalPlaces: 2 }));
 console.log(bytes.format(104857, { fixedDecimals: true }));
-console.log(bytes.format(104857, { unitSeparator: '-' }));
-console.log(bytes.format(104857, { unit: 'GB' }));
-console.log(bytes('1024kb'));
-console.log(bytes(1024));
+console.log(bytes.format(104857, { unitSeparator: "-" }));
+console.log(bytes.format(104857, { unit: "GB" }));
 
-console.log(bytes.parse('1024kb'));
+console.log(bytes("1024kb"));
+console.log(bytes.parse("1024kb"));
 console.log(bytes.parse(1024));
diff --git a/types/bytes/index.d.ts b/types/bytes/index.d.ts
index 0f438052e3..b91e9d8ec1 100644
--- a/types/bytes/index.d.ts
+++ b/types/bytes/index.d.ts
@@ -1,29 +1,28 @@
-// Type definitions for bytes v2.5.0
+// Type definitions for bytes v3.0.0
 // Project: https://github.com/visionmedia/bytes.js
 // Definitions by: Zhiyuan Wang <https://github.com/danny8002>
+//                 Rickard Laurin <https://github.com/believer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface BytesOptions {
-    decimalPlaces?: number,
-    thousandsSeparator?: string,
-    unitSeparator?: string,
-    fixedDecimals?: boolean,
-    unit?: string
+    decimalPlaces?: number;
+    thousandsSeparator?: string;
+    unitSeparator?: string;
+    fixedDecimals?: boolean;
+    unit?: string;
 }
-/**
- *Convert the given value in bytes into a string.
- *
- * @param {number} value
- * @param {{
- *  thousandsSeparator: [string]
- *  }} [options] bytes options.
- *
- * @returns {string}
- */
-declare function bytes(value: number, options?: { thousandsSeparator: string }): string;
 
 /**
- *Parse string to an integer in bytes.
+ * Convert the given value in bytes into a string.
+ *
+ * @param {number} value
+ * @param {BytesFormatOptions} [options]
+ * @returns {string}
+ */
+declare function bytes(value: number, options?: BytesOptions): string;
+
+/**
+ * Parse string to an integer in bytes.
  *
  * @param {string} value
  * @returns {number}
@@ -31,15 +30,15 @@ declare function bytes(value: number, options?: { thousandsSeparator: string }):
 declare function bytes(value: string): number;
 
 declare namespace bytes {
-
     /**
      * Format the given value in bytes into a string.
      *
-     * If the value is negative, take Math.abs(). If it is a float,
-     * it is rounded.
+     * If the value is negative, it is kept as such.
+     * If it is a float, it is rounded.
      *
      * @param {number} value
      * @param {BytesFormatOptions} [options]
+     * @returns {string}
      */
 
     function format(value: number, options?: BytesOptions): string;
@@ -48,7 +47,7 @@ declare namespace bytes {
      * Just return the input number value.
      *
      * @param {number} value
-     * @return {number}
+     * @returns {number}
      */
     function parse(value: number): number;
 
@@ -58,7 +57,7 @@ declare namespace bytes {
      * If no unit is given, it is assumed the value is in bytes.
      *
      * @param {string} value
-     * @return {number}
+     * @returns {number}
      */
     function parse(value: string): number;
 }

From c169269a44fc02ce33e716f108aaec7bdc9a31a5 Mon Sep 17 00:00:00 2001
From: believer <rickard.laurin@gmail.com>
Date: Thu, 8 Feb 2018 19:42:15 +0100
Subject: [PATCH 024/388] Fix formatting

---
 types/bytes/bytes-tests.ts | 18 +++++++++---------
 types/bytes/index.d.ts     | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/types/bytes/bytes-tests.ts b/types/bytes/bytes-tests.ts
index 704b45eee4..e15b248650 100644
--- a/types/bytes/bytes-tests.ts
+++ b/types/bytes/bytes-tests.ts
@@ -1,4 +1,4 @@
-import bytes = require("bytes");
+import bytes = require('bytes');
 
 // 1024*1024 = 1048576
 console.log(bytes(undefined));
@@ -6,19 +6,19 @@ console.log(bytes(null));
 
 console.log(bytes(1024));
 console.log(bytes(104857));
-console.log(bytes(104857, { thousandsSeparator: " " }));
+console.log(bytes(104857, { thousandsSeparator: ' ' }));
 console.log(bytes(104857, { decimalPlaces: 2 }));
 console.log(bytes(104857, { fixedDecimals: true }));
-console.log(bytes(104857, { unitSeparator: "-" }));
-console.log(bytes(104857, { unit: "GB" }));
+console.log(bytes(104857, { unitSeparator: '-' }));
+console.log(bytes(104857, { unit: 'GB' }));
 
 console.log(bytes.format(104857));
-console.log(bytes.format(104857, { thousandsSeparator: " " }));
+console.log(bytes.format(104857, { thousandsSeparator: ' ' }));
 console.log(bytes.format(104857, { decimalPlaces: 2 }));
 console.log(bytes.format(104857, { fixedDecimals: true }));
-console.log(bytes.format(104857, { unitSeparator: "-" }));
-console.log(bytes.format(104857, { unit: "GB" }));
+console.log(bytes.format(104857, { unitSeparator: '-' }));
+console.log(bytes.format(104857, { unit: 'GB' }));
 
-console.log(bytes("1024kb"));
-console.log(bytes.parse("1024kb"));
+console.log(bytes('1024kb'));
+console.log(bytes.parse('1024kb'));
 console.log(bytes.parse(1024));
diff --git a/types/bytes/index.d.ts b/types/bytes/index.d.ts
index b91e9d8ec1..565ee3f175 100644
--- a/types/bytes/index.d.ts
+++ b/types/bytes/index.d.ts
@@ -5,11 +5,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface BytesOptions {
-    decimalPlaces?: number;
-    thousandsSeparator?: string;
-    unitSeparator?: string;
-    fixedDecimals?: boolean;
-    unit?: string;
+    decimalPlaces?: number,
+    thousandsSeparator?: string,
+    unitSeparator?: string,
+    fixedDecimals?: boolean,
+    unit?: string
 }
 
 /**

From ea50fe268cdb3cd7ce202b01734bf787e7ec8dce Mon Sep 17 00:00:00 2001
From: believer <rickard.laurin@gmail.com>
Date: Thu, 8 Feb 2018 19:52:05 +0100
Subject: [PATCH 025/388] Remove duplicate test

---
 types/bytes/bytes-tests.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/bytes/bytes-tests.ts b/types/bytes/bytes-tests.ts
index e15b248650..d296f0b28f 100644
--- a/types/bytes/bytes-tests.ts
+++ b/types/bytes/bytes-tests.ts
@@ -4,7 +4,6 @@ import bytes = require('bytes');
 console.log(bytes(undefined));
 console.log(bytes(null));
 
-console.log(bytes(1024));
 console.log(bytes(104857));
 console.log(bytes(104857, { thousandsSeparator: ' ' }));
 console.log(bytes(104857, { decimalPlaces: 2 }));

From 424c62b965785ae396dda68f026f5d3c45a15089 Mon Sep 17 00:00:00 2001
From: Ryo Kawaguchi <ryo@istellar.jp>
Date: Fri, 9 Feb 2018 21:22:29 +0900
Subject: [PATCH 026/388] Add missing properties to material-ui/DialogProps.

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

diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 9624e6d4a2..030dd21bff 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -1051,6 +1051,8 @@ declare namespace __MaterialUI {
         open: boolean;
         overlayClassName?: string;
         overlayStyle?: React.CSSProperties;
+        paperClassName?: string;
+        paperProps?: any;
         repositionOnUpdate?: boolean;
         style?: React.CSSProperties;
         title?: React.ReactNode;

From 5d912ee0850eb7ac08af1a0ac40291a808f33f9c Mon Sep 17 00:00:00 2001
From: Ryo Kawaguchi <ryo@istellar.jp>
Date: Fri, 9 Feb 2018 22:58:42 +0900
Subject: [PATCH 027/388] Increment version.

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

diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 030dd21bff..85a8f46f65 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for material-ui v0.20.0
+// Type definitions for material-ui v0.20.1
 // Project: https://github.com/callemall/material-ui
 // Definitions by: Nathan Brown <https://github.com/ngbrown>
 //                 Igor Beagorudsky <https://github.com/theigor>

From 24fd4930ae9f88ce50e026b261f710aa1cdf92fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Jedli=C4=8Dka?= <jedlicka.r@gmail.com>
Date: Fri, 9 Feb 2018 15:35:38 +0100
Subject: [PATCH 028/388] Add module declaration

Fix '.../node_modules/@types/fingerprintjs2/index.d.ts' is not a module.
---
 types/fingerprintjs2/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/fingerprintjs2/index.d.ts b/types/fingerprintjs2/index.d.ts
index 94b705b807..afd500647c 100644
--- a/types/fingerprintjs2/index.d.ts
+++ b/types/fingerprintjs2/index.d.ts
@@ -41,3 +41,7 @@ interface Fingerprint2Options {
     excludePixelRatio?: boolean;
     excludeHardwareConcurrency?: boolean;
 }
+
+declare module "fingerprintjs2" {
+    export = Fingerprint2;
+}

From 1323c4c63a8a3fa35e2ec8810be1d14ebbf164a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Jedli=C4=8Dka?= <jedlicka.r@gmail.com>
Date: Fri, 9 Feb 2018 15:48:26 +0100
Subject: [PATCH 029/388] Use export without a module declaration

See https://github.com/Microsoft/dtslint/blob/master/docs/no-declare-current-package.md
---
 types/fingerprintjs2/index.d.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/types/fingerprintjs2/index.d.ts b/types/fingerprintjs2/index.d.ts
index afd500647c..b4d8d5ff6c 100644
--- a/types/fingerprintjs2/index.d.ts
+++ b/types/fingerprintjs2/index.d.ts
@@ -42,6 +42,4 @@ interface Fingerprint2Options {
     excludeHardwareConcurrency?: boolean;
 }
 
-declare module "fingerprintjs2" {
-    export = Fingerprint2;
-}
+export = Fingerprint2;

From 32db52f565c5999fbaa6a23e1e3c9ca2bc835667 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Sat, 10 Feb 2018 21:38:13 +0200
Subject: [PATCH 030/388] Default properties; extended samples

---
 types/activex-wia/activex-wia-tests.ts | 546 ++++++++++++++++++++++---
 types/activex-wia/index.d.ts           | 356 +++++++++-------
 types/activex-wia/tslint.json          |   5 +-
 3 files changed, 689 insertions(+), 218 deletions(-)

diff --git a/types/activex-wia/activex-wia-tests.ts b/types/activex-wia/activex-wia-tests.ts
index d8046ef319..a5babea924 100644
--- a/types/activex-wia/activex-wia-tests.ts
+++ b/types/activex-wia/activex-wia-tests.ts
@@ -1,79 +1,493 @@
+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;
+};
+
 // source -- https://msdn.microsoft.com/en-us/library/windows/desktop/ms630826(v=vs.85).aspx
+{
+    const cd = new ActiveXObject('WIA.CommonDialog');
+    const dm = new ActiveXObject('WIA.DeviceManager');
 
-// Convert a file
-let commonDialog = new ActiveXObject('WIA.CommonDialog');
-let img = commonDialog.ShowAcquireImage();
+    // Download new items as they are created
+    {
+        dm.RegisterEvent(WIA.EventID.wiaEventItemCreated, WIA.Miscellaneous.wiaAnyDeviceID);
+        ActiveXObject.on(dm, 'OnEvent', ['EventID', 'DeviceID', 'ItemID'], x => {
+            const dev = dm.DeviceInfos(x.DeviceID).Connect();
+            const itm = dev.GetItem(x.ItemID);
+            const img = cd.ShowTransfer(itm);
+            const v = img.FileData;
+            // Picture type not available in Javascript
+        });
+    }
 
-// when DefinitelyTyped supports Typescript 2.4 -- end of July 2017, replace these:
-let jpegFormatID =  '{B96B3CAE-0728-11D3-9D7B-0000F81EF32E}';
-if (img.FormatID !== jpegFormatID) {
-    const ip = new ActiveXObject('WIA.ImageProcess');
-    ip.Filters.Add(ip.FilterInfos.Item('Convert').FilterID);
-    ip.Filters.Item(1).Properties.Item('FormatID').Value = jpegFormatID;
-    img = ip.Apply(img);
-}
-// with this:
-/*if (img.FormatID !== WIA.FormatID.wiaFormatJPEG) {
-    let ip = new ActiveXObject('WIA.ImageProcess');
-    ip.Filters.Add(ip.FilterInfos.Item('Convert').FilterID);
-    ip.Filters.Item(1).Properties.Item('FormatID').Value = WIA.FormatID.wiaFormatJPEG;
-    img = ip.Apply(img);
-}*/
-
-// Take a picture
-let dev = commonDialog.ShowSelectDevice();
-if (dev.Type === WIA.WiaDeviceType.CameraDeviceType) {
-    // when DefinitelyTyped supports Typescript 2.4 -- end of July 2017, replace these:
-    const commandID = '{AF933CAC-ACAD-11D2-A093-00C04F72DC3C}';
-    const itm = dev.ExecuteCommand(commandID);
-
-    // with this:
-    // let itm = dev.ExecuteCommand(WIA.CommandID.wiaCommandTakePicture);
-}
-
-// Display detailed property information
-dev = commonDialog.ShowSelectDevice();
-let e = new Enumerator<WIA.Property>(dev.Properties);  // no foreach over ActiveX collections
-e.moveFirst();
-while (!e.atEnd()) {
-    const p = e.item();
-    let s = `${p.Name} (${p.PropertyID}) = `;
-    if (p.IsVector) {
-        s += '[vector of data]';
-    } else {
-        s += p.Value;
-        if (p.SubType !== WIA.WiaSubType.UnspecifiedSubType) {
-            if (p.Value !== p.SubTypeDefault) {
-                s += ` (Default = ${p.SubTypeDefault})`;
-            }
+    // Convert a file
+    {
+        let img = cd.ShowAcquireImage();
+        if (img && img.FormatID !== WIA.FormatID.wiaFormatJPEG) {
+            const ip = new ActiveXObject('WIA.ImageProcess');
+            ip.Filters.Add(ip.FilterInfos('Convert').FilterID);
+            ip.Filters(1).Properties('FormatID').Value = WIA.FormatID.wiaFormatJPEG;
+            img = ip.Apply(img);
         }
     }
 
-    if (p.IsReadOnly) {
-        s += ' [READ ONLY]';
-    } else {
-        switch (p.SubType) {
-            case WIA.WiaSubType.FlagSubType:
-            case WIA.WiaSubType.ListSubType:
-                if (p.SubType === WIA.WiaSubType.FlagSubType) {
-                    s += ' [valid flags include: ';
+    // Take a picture
+    {
+        const dev = cd.ShowSelectDevice();
+        if (dev && dev.Type === WIA.WiaDeviceType.CameraDeviceType) {
+            const item = dev.ExecuteCommand(WIA.CommandID.wiaCommandTakePicture);
+        }
+    }
+
+    // Display detailed property information
+    {
+        const dev = cd.ShowSelectDevice();
+        if (dev) {
+            collectionToArray(dev.Properties).forEach(p => {
+                let s = `${p.Name} (${p.PropertyID}) = `;
+                if (p.IsVector) {
+                    s += '[vector of data]';
                 } else {
-                    s += ' [valid values include: ';
-                }
-                const count = p.SubTypeValues.Count;
-                for (let i = 1; i <= count; i++) {
-                    s += p.SubTypeValues.Item(i);
-                    if (i < count) {
-                        s += ', ';
+                    s += p.Value;
+                    if (p.SubType !== WIA.WiaSubType.UnspecifiedSubType
+                        && p.Value !== p.SubTypeDefault) {
+                        s += ` (Default = ${p.SubTypeDefault})`;
                     }
                 }
-                s += ']';
-                break;
-            case WIA.WiaSubType.RangeSubType:
-                s += ` [valid values in the range from ${p.SubTypeMin} to ${p.SubTypeMax} in increments of ${p.SubTypeStep}]`;
-                break;
+
+                if (p.IsReadOnly) {
+                    s += ' [READ ONLY]';
+                } else {
+                    switch (p.SubType) {
+                        case WIA.WiaSubType.FlagSubType:
+                        case WIA.WiaSubType.ListSubType:
+                            const count = p.SubTypeValues.Count;
+                            const items: string[] = [];
+                            for (let i = 1; i <= count; i++) {
+                                items.push(p.SubTypeValues(i));
+                            }
+                            const descr = p.SubType === WIA.WiaSubType.FlagSubType ? 'flags' : 'values';
+                            s += ` [valid ${descr} include: ${items.join(',')}]`;
+                            break;
+                        case WIA.WiaSubType.RangeSubType:
+                            s += ` [valid values in the range from ${p.SubTypeMin} to ${p.SubTypeMax} in increments of ${p.SubTypeStep}]`;
+                            break;
+                    }
+                }
+
+                WScript.Echo(s);
+            });
         }
     }
 
-    WScript.Echo(s);
+    // Determine whether the selected device is a camera
+    {
+        const dev = cd.ShowSelectDevice();
+        if (dev && dev.Type === WIA.WiaDeviceType.CameraDeviceType) {
+            WScript.Echo('Selectd device is a camera');
+        }
+    }
+
+    // Count root - level images for transfer
+    {
+        const dev = cd.ShowSelectDevice();
+        if (dev) {
+            const count = collectionToArray(dev.Items).filter(f => {
+                const imageFlag = WIA.WiaItemFlag.ImageItemFlag;
+                return (f.Properties('Item Flags').Value & imageFlag) === imageFlag;
+            }).length;
+            WScript.Echo(`Selected device has ${count} top-level images`);
+        }
+    }
+
+    // Display all imagefile properties
+    {
+        const img = cd.ShowAcquireImage();
+        if (img) {
+            collectionToArray(img.Properties).forEach(p => {
+                let contents = '';
+                if (p.IsVector) {
+                    contents = '[vector data not emitted]';
+                } else if (p.Type === WIA.WiaImagePropertyType.RationalImagePropertyType) {
+                    contents = `${p.Value.Nunerator}/${p.Value.Denominator}`;
+                } else if (p.Type === WIA.WiaImagePropertyType.StringImagePropertyType) {
+                    contents = `"${p.Value}"`;
+                } else {
+                    contents = p.Value;
+                }
+                WScript.Echo(`${p.Name} (${p.PropertyID}) = ${contents}`);
+            });
+        }
+    }
+
+    // Determine the event type
+    {
+        const dev = cd.ShowSelectDevice();
+        if (dev) {
+            const actionEvent = WIA.WiaEventFlag.ActionEvent;
+            collectionToArray(dev.Events).forEach(e => {
+                const msg = (e.Type & actionEvent) === actionEvent ?
+                    `${e.Name} is an Action event` :
+                    `${e.Name} is not an Action event`;
+                WScript.Echo(msg);
+            });
+        }
+    }
+
+    // Set rational numerator and denominator
+    {
+        const r = new ActiveXObject('WIA.Rational');
+        r.Numerator = 1;
+        r.Denominator = 3;
+        WScript.Echo(`1/3 = ${r.Value}`);
+        r.Numerator = 2;
+        r.Denominator = 6;
+        WScript.Echo(`2/6 = ${r.Value}`);
+    }
+
+    // Create and initialize a vector object
+    {
+        const v: WIA.Vector<number> = new ActiveXObject('WIA.Vector');
+        v.SetFromString('This is a test', true, false);
+        collectionToArray(v).forEach(chr => WScript.Echo(String.fromCharCode(chr)));
+    }
+
+    // Display detailed image information
+    {
+        const img = new ActiveXObject('WIA.ImageFile');
+        img.LoadFile('c:\\windows\\web\\Screen\\img102.jpg');
+
+        let s = `
+Width = ${img.Width}
+Height = ${img.Height}
+Depth = ${img.PixelDepth}
+Horizontal resolution = ${img.HorizontalResolution}
+Vertical resolution = ${img.VerticalResolution}
+Frame count = ${img.FrameCount}}
+        `.trim();
+
+        let arr: string[] = [];
+
+        if (img.IsIndexedPixelFormat) { arr.push('Pixel data contains palette indexes'); }
+        if (img.IsAlphaPixelFormat) { arr.push('Pixel data has alpha information'); }
+        if (img.IsExtendedPixelFormat) { arr.push('Pixel data has extended color information (16 bit/channel)'); }
+        if (img.IsAnimated) { arr.push('Image is animated'); }
+
+        const propertyTests = [40091, 40092, 40093, 40094, 40095]
+            .filter(n => img.Properties.Exists(n))
+            .map(n => {
+                const prp = img.Properties(n);
+                return `${prp.Name} = ${prp.Value.String}`;
+            });
+        arr = arr.concat(propertyTests);
+
+        if (arr.length) {
+            s += '\n' + arr.join('\n');
+        }
+
+        WScript.Echo(s);
+    }
+
+    // Create an imageprocess object and enumerate filters
+    {
+        const ip = new ActiveXObject('WIA.ImageProcess');
+        collectionToArray(ip.FilterInfos).forEach(fi => {
+            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
+    {
+        const ip = new ActiveXObject('WIA.ImageProcess');
+
+        const stringValue = (v: any) => {
+            if (typeof v === 'string') { return `"${v}"`; }
+            return v;
+        };
+
+        const listValues = (v: any) => collectionToArray(v).join(', ');
+
+        const listProperties = (filter: WIA.Filter) => {
+            let s = [
+                `${filter.Name} (${filter.FilterID})`,
+                new Array(51).join('='),
+                filter.Description,
+                new Array(51).join('=')
+            ].map(line => line + '\n').join('');
+
+            s += collectionToArray(filter.Properties).map(p => {
+                let contents: string;
+
+                switch (typeof p.Value) {
+                    // these case clauses replace the IsObject function in VB6/VBScript
+                    case 'boolean':
+                    case 'string':
+                    case 'number':
+                        contents = stringValue(p.Value);
+                    default:
+                        switch (p.SubType) {
+                            case WIA.WiaSubType.FlagSubType:
+                                contents = ` // [valid values formed by using the OR operator with the following bit flags: ${listValues(p.SubTypeValues)}]`;
+                                break;
+                            case WIA.WiaSubType.ListSubType:
+                                contents = ` // [valid values from the following list: ${listValues(p.SubTypeValues)}]`;
+                                break;
+                            case WIA.WiaSubType.RangeSubType:
+                                contents = ` // [valid values between ${p.SubTypeMin} and ${p.SubTypeMax}, with a step of ${p.SubTypeStep}]`;
+                                break;
+                            default:
+                                contents = '';
+                                break;
+                        }
+                }
+
+                return `ip.Filters(1).Properties("${p.Name}") = ${contents}`;
+            }).join('\n');
+
+            WScript.Echo(s);
+        };
+
+        collectionToArray(ip.FilterInfos).forEach(fi => {
+            ip.Filters.Add(fi.FilterID);
+            listProperties(ip.Filters(1));
+            ip.Filters.Remove(1);
+        });
+    }
+
+    // List the supported transfer formats
+    {
+        const stringFormat = (fld: string) => {
+            switch (fld) {
+                case WIA.FormatID.wiaFormatBMP: return 'BMP';
+                case WIA.FormatID.wiaFormatPNG: return 'PNG';
+                case WIA.FormatID.wiaFormatGIF: return 'GIF';
+                case WIA.FormatID.wiaFormatJPEG: return 'JPEG';
+                case WIA.FormatID.wiaFormatTIFF: return 'TIFF';
+                default: return 'Unknown';
+            }
+        };
+
+        const dev = cd.ShowSelectDevice();
+        const items = dev && cd.ShowSelectItems(dev, WIA.WiaImageIntent.UnspecifiedIntent, WIA.WiaImageBias.MaximizeQuality, true);
+        if (items) {
+            WScript.Echo(collectionToArray(items(1).Formats).map(stringFormat).join(', '));
+        }
+    }
+
+    // Enumerate supported commands in commands collection
+    {
+        const dev = cd.ShowSelectDevice();
+        if (dev && collectionToArray(dev.Commands).some(dc => dc.CommandID === WIA.CommandID.wiaCommandTakePicture)) {
+            WScript.Echo('Selected device supports the TakePicture command');
+        }
+    }
+
+    // Enumerate root - level items and display their names
+    {
+        const dev = cd.ShowSelectDevice();
+        if (dev) {
+            collectionToArray(dev.Items).forEach(item => {
+                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);
+            });
+        }
+    }
+
+    // Determine the number of items returned by ShowSelectItems
+    {
+        const dev = cd.ShowSelectDevice();
+        const items = dev && cd.ShowSelectItems(dev, WIA.WiaImageIntent.UnspecifiedIntent, WIA.WiaImageBias.MaximizeQuality, true);
+        if (items) {
+            WScript.Echo(`You selected ${items.Count} items`);
+        }
+    }
+
+    // Enumerate all the supported events for the selected device
+    {
+        const dev = cd.ShowSelectDevice();
+        if (dev) {
+            const msg = collectionToArray(dev.Events)
+                .map(e => `\n${e.Name} (${e.EventID}): ${e.Description}`)
+                .join('');
+            WScript.Echo('The selected device supports the following events: ' + msg);
+        }
+    }
+
+    // List all available devices by name and deviceid
+    collectionToArray(dm.DeviceInfos).forEach(di => {
+        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 => {
+                const name = `${p.Name} (${p.PropertyID})`;
+                let contents: string;
+                if (p.IsVector) {
+                    contents = '[vector of data]';
+                } else if (p.Type === WIA.WiaPropertyType.StringPropertyType) {
+                    contents = `"${p.Value}"`;
+                } else {
+                    contents = p.Value;
+                }
+                WScript.Echo(`${name} = ${contents}`);
+            });
+        }
+    }
+
+    // Enumerate the supported commands
+    {
+        const dev = cd.ShowSelectDevice();
+        const items = dev && cd.ShowSelectItems(dev, WIA.WiaImageIntent.UnspecifiedIntent, WIA.WiaImageBias.MaximizeQuality, true);
+        if (items) {
+            const msg = collectionToArray(items(1).Commands)
+                .map(c => `${c.Name}: ${c.Description}\n`)
+                .join('');
+            WScript.Echo(`The selected item supports the following commands:\n${msg}`);
+        }
+    }
+
+    // Create an imagefile object that contains a blank page
+    {
+        const c = 0xFF0000FF;
+        const v: WIA.Vector<number> = new ActiveXObject('WIA.Vector');
+        for (let i = 0; i < 4; i++) {
+            v.Add(c);
+        }
+        const img = v.ImageFile(2, 2);
+        img.SaveFile('C:\\test.' + img.FileExtension);
+    }
+
+    interface WshArgumentsBase<TKey = number | string> {
+        Item(index: TKey): string;
+        (index: TKey): string;
+        length: number;
+        Count(): number;
+    }
+
+    interface WshArguments extends WshArgumentsBase {  // not sure if WshArguments takes a string as well, or only a number
+        Named: WshArgumentsBase<string>;
+        Unnamed: WshArgumentsBase<number>;
+        ShowUsage(): void;
+    }
+
+    // Implement a windows script host script that runs automatically
+    {
+        const args = collectionToArray(WScript.Arguments as WshArguments)
+            .map(arg => arg.toLowerCase());
+
+        switch (args.length) {
+            case 1:
+            case 2:
+                const command = `${WScript.FullName} "${WScript.ScriptFullName}" connect`;
+                const name = 'QuickTransfer';
+                const title = 'Quick Scripting Transfer';
+                const icon = `${WScript.FullName}, 0`;
+                const eventID = WIA.EventID.wiaEventDeviceConnected;
+                const deviceID = args.length === 2 ? args[1] : WIA.Miscellaneous.wiaAnyDeviceID;
+
+                if (args[0] === 'register') {
+                    WScript.Echo('Registering event handler');
+                    dm.RegisterPersistentEvent(command, name, title, icon, eventID, deviceID);
+                    WScript.Quit();
+                } else if (args[0] === 'unregister') {
+                    WScript.Echo('Unregistering event handler');
+                    dm.UnregisterPersistentEvent(command, name, title, icon, eventID, deviceID);
+                    WScript.Quit();
+                }
+                break;
+            case 3:
+                if (args[0] === 'connect') {
+                    const deviceID = args[1].substr(12);
+                    const device = dm.DeviceInfos(deviceID).Connect();
+                    collectionToArray(device.Items).forEach(item => {
+                        const img = item.Transfer();
+                        img.SaveFile(`C:\\${item.Properties('Item Name').Value}.${img.FileExtension}`);
+
+                        // Uncomment the following lines to remove the picture from the camera after transfer
+                        for (let i = 1; i < device.Items.Count; i++) {
+                            const item2 = device.Items(i);
+                            if (item2.ItemID !== item.ItemID) { continue; }
+                            try {
+                                // some cameras don't support deleting a picture
+                                device.Items.Remove(i);
+                            } catch (error) {
+                                WScript.Echo(error);
+                            }
+                        }
+                    });
+                    WScript.Quit();
+                }
+                break;
+        }
+
+        const usage = `
+Usage:
+
+To register, type:
+
+    ${WScript.ScriptName} register [<device id>]
+
+To unregister, type:
+
+    ${WScript.ScriptName} unregister [<device id>]
+
+Available device ids:
+${collectionToArray(dm.DeviceInfos)
+                .map(device => `${device.DeviceID} '${device.Properties("Name").Value}'`)
+                .join('\n')}
+            `.trim();
+
+        WScript.Echo(usage);
+    }
+
+    // Count the number of child items available for transfer
+    {
+        const device = cd.ShowSelectDevice();
+        const items = device && cd.ShowSelectItems(device, WIA.WiaImageIntent.UnspecifiedIntent, WIA.WiaImageBias.MaximizeQuality, true);
+        const item = items && items(1);
+        if (item) {
+            const count = collectionToArray(item.Items).filter(childItem => {
+                const flags = childItem.Properties('Item Flags').Value as number;
+                return (flags & WIA.WiaItemFlag.TransferItemFlag) === WIA.WiaItemFlag.TransferItemFlag;
+            }).length;
+            WScript.Echo(`Selected device has ${count} child items that can be transferred.`);
+        }
+    }
+
+    // Use a vector object
+    {
+        const v: WIA.Vector<number | string> = new ActiveXObject('WIA.Vector');
+        v.Add(1);
+        v.Add(42);
+        v.Add(3);
+        v.Remove(1);
+        v.Remove(2);
+        WScript.Echo(`v(1) = ${v(1)}`);
+        v.Clear();
+        v.Add('This');
+        v.Add('is');
+        v.Add('Cool');
+        v.Remove(1);
+        v.Remove(2);
+        WScript.Echo(`v(1) = ${v(1)}`);
+    }
 }
diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index 7d7cbae727..ae21c9c77c 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -2,22 +2,22 @@
 // Project: https://msdn.microsoft.com/en-us/library/windows/desktop/ms630368(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.4
+// TypeScript Version: 2.6
 
 declare namespace WIA {
     /** String versions of globally unique identifiers (GUIDs) that identify common Device and Item commands. */
-    // uncomment when DefinitelyTyped supports Typescript 2.4 (end of July 2017)
-    /*const enum CommandID {
+    // tslint:disable-next-line no-const-enum
+    const enum CommandID {
         wiaCommandChangeDocument = '{04E725B0-ACAE-11D2-A093-00C04F72DC3C}',
         wiaCommandDeleteAllItems = '{E208C170-ACAD-11D2-A093-00C04F72DC3C}',
         wiaCommandSynchronize = '{9B26B7B2-ACAD-11D2-A093-00C04F72DC3C}',
         wiaCommandTakePicture = '{AF933CAC-ACAD-11D2-A093-00C04F72DC3C}',
-        wiaCommandUnloadDocument = '{1F3B3D8E-ACAE-11D2-A093-00C04F72DC3C}'
-    }*/
+        wiaCommandUnloadDocument = '{1F3B3D8E-ACAE-11D2-A093-00C04F72DC3C}',
+    }
 
     /** String versions of globally unique identifiers (GUIDs) that identify DeviceManager events. */
-    // uncomment when DefinitelyTyped supports Typescript 2.4 (end of July 2017)
-    /*const enum EventID {
+    // tslint:disable-next-line no-const-enum
+    const enum EventID {
         wiaEventDeviceConnected = '{A28BBADE-64B6-11D2-A231-00C04FA31809}',
         wiaEventDeviceDisconnected = '{143E4E83-6497-11D2-A231-00C04FA31809}',
         wiaEventItemCreated = '{4C8F4EF5-E14F-11D2-B326-00C04F68CE61}',
@@ -30,64 +30,69 @@ declare namespace WIA {
         wiaEventScanImage3 = '{154E27BE-B617-4653-ACC5-0FD7BD4C65CE}',
         wiaEventScanImage4 = '{A65B704A-7F3C-4447-A75D-8A26DFCA1FDF}',
         wiaEventScanOCRImage = '{9D095B89-37D6-4877-AFED-62A297DC6DBE}',
-        wiaEventScanPrintImage = '{B441F425-8C6E-11D2-977A-0000F87A926F}'
-    }*/
+        wiaEventScanPrintImage = '{B441F425-8C6E-11D2-977A-0000F87A926F}',
+    }
 
     /** String versions of globally unique identifiers (GUIDs) that indicate the file format of an image. */
-    // uncomment when DefinitelyTyped supports Typescript 2.4 (end of July 2017)
-    /*const enum FormatID {
+    // tslint:disable-next-line no-const-enum
+    const enum FormatID {
         wiaFormatBMP = '{B96B3CAB-0728-11D3-9D7B-0000F81EF32E}',
         wiaFormatGIF = '{B96B3CB0-0728-11D3-9D7B-0000F81EF32E}',
         wiaFormatJPEG = '{B96B3CAE-0728-11D3-9D7B-0000F81EF32E}',
         wiaFormatPNG = '{B96B3CAF-0728-11D3-9D7B-0000F81EF32E}',
-        wiaFormatTIFF = '{B96B3CB1-0728-11D3-9D7B-0000F81EF32E}'
-    }*/
+        wiaFormatTIFF = '{B96B3CB1-0728-11D3-9D7B-0000F81EF32E}',
+    }
 
     /** Miscellaneous string constants */
-    // uncomment when DefinitelyTyped supports Typescript 2.4 (end of July 2017)
-    /*const enum Miscellaneous {
+    // tslint:disable-next-line no-const-enum
+    const enum Miscellaneous {
         wiaAnyDeviceID = '*',
-        wiaIDUnknown = '{00000000-0000-0000-0000-000000000000}'
-    }*/
+        wiaIDUnknown = '{00000000-0000-0000-0000-000000000000}',
+    }
 
     /**
      * The WiaDeviceType enumeration specifies the type of device attached to a user's computer. Use the Type property on the DeviceInfo object or the Device
-     *  object to obtain these values from the device.
+     * object to obtain these values from the device.
      */
+    // tslint:disable-next-line no-const-enum
     const enum WiaDeviceType {
         CameraDeviceType = 2,
         ScannerDeviceType = 1,
         UnspecifiedDeviceType = 0,
-        VideoDeviceType = 3
+        VideoDeviceType = 3,
     }
 
     /**
-     * A DeviceEvent's type is composed of bits from the WiaEventFlags enumeration. You can test a DeviceEvent's type by using the AND operation with DeviceEv
-     * ent.Type and a member from the WiaEventFlags enumeration.
+     * A DeviceEvent's type is composed of bits from the WiaEventFlags enumeration. You can test a DeviceEvent's type by using the AND operation with
+     * DeviceEvent.Type and a member from the WiaEventFlags enumeration.
      */
+    // tslint:disable-next-line no-const-enum
     const enum WiaEventFlag {
         ActionEvent = 2,
-        NotificationEvent = 1
+        NotificationEvent = 1,
     }
 
     /** The WiaImageBias enumeration helps specify what type of data the image is intended to represent. */
+    // tslint:disable-next-line no-const-enum
     const enum WiaImageBias {
         MaximizeQuality = 131072,
-        MinimizeSize = 65536
+        MinimizeSize = 65536,
     }
 
     /** The WiaImageIntent enumeration helps specify what type of data the image is intended to represent. */
+    // tslint:disable-next-line no-const-enum
     const enum WiaImageIntent {
         ColorIntent = 1,
         GrayscaleIntent = 2,
         TextIntent = 4,
-        UnspecifiedIntent = 0
+        UnspecifiedIntent = 0,
     }
 
     /**
-     * The WiaImagePropertyType enumeration specifies the type of the value of an image property. Image properties can be found in the Properties collection o
-     * f an ImageFile object.
+     * The WiaImagePropertyType enumeration specifies the type of the value of an image property. Image properties can be found in the Properties collection
+     * of an ImageFile object.
      */
+    // tslint:disable-next-line no-const-enum
     const enum WiaImagePropertyType {
         ByteImagePropertyType = 1001,
         LongImagePropertyType = 1004,
@@ -103,13 +108,14 @@ declare namespace WIA {
         VectorOfUndefinedImagePropertyType = 1100,
         VectorOfUnsignedIntegersImagePropertyType = 1102,
         VectorOfUnsignedLongsImagePropertyType = 1104,
-        VectorOfUnsignedRationalsImagePropertyType = 1106
+        VectorOfUnsignedRationalsImagePropertyType = 1106,
     }
 
     /**
-     * An Item's type is composed of bits from the WiaItemFlags enumeration. You can test an Item's type by using the AND operation with Item.Properties("Item
-     *  Flags") and a member from the WiaItemFlags enumeration.
+     * An Item's type is composed of bits from the WiaItemFlags enumeration. You can test an Item's type by using the AND operation with
+     * Item.Properties("Item Flags") and a member from the WiaItemFlags enumeration.
      */
+    // tslint:disable-next-line no-const-enum
     const enum WiaItemFlag {
         AnalyzeItemFlag = 16,
         AudioItemFlag = 32,
@@ -129,13 +135,14 @@ declare namespace WIA {
         StorageItemFlag = 4096,
         TransferItemFlag = 8192,
         VideoItemFlag = 65536,
-        VPanoramaItemFlag = 1024
+        VPanoramaItemFlag = 1024,
     }
 
     /**
-     * The WiaPropertyType enumeration specifies the type of the value of an item property. Item properties can be found in the Properties collection of a Dev
-     * ice or Item object.
+     * The WiaPropertyType enumeration specifies the type of the value of an item property. Item properties can be found in the Properties collection of a
+     * Device or Item object.
      */
+    // tslint:disable-next-line no-const-enum
     const enum WiaPropertyType {
         BooleanPropertyType = 1,
         BytePropertyType = 2,
@@ -173,28 +180,32 @@ declare namespace WIA {
         VectorOfUnsignedIntegersPropertyType = 104,
         VectorOfUnsignedLargeIntegersPropertyType = 109,
         VectorOfUnsignedLongsPropertyType = 106,
-        VectorOfVariantsPropertyType = 119
+        VectorOfVariantsPropertyType = 119,
     }
 
     /**
-     * The WiaSubType enumeration specifies more detail about the property value. Use the SubType property on the Property object to obtain these values for t
-     * he property.
+     * The WiaSubType enumeration specifies more detail about the property value. Use the SubType property on the Property object to obtain these values for
+     * the property.
      */
+    // tslint:disable-next-line no-const-enum
     const enum WiaSubType {
         FlagSubType = 3,
         ListSubType = 2,
         RangeSubType = 1,
-        UnspecifiedSubType = 0
+        UnspecifiedSubType = 0,
     }
 
     /**
      * The CommonDialog control is an invisible-at-runtime control that contains all the methods that display a User Interface. A CommonDialog control can be
-     *  created using "WIA.CommonDialog" in a call to CreateObject or by dropping a CommonDialog on a form.
+     * created using "WIA.CommonDialog" in a call to CreateObject or by dropping a CommonDialog on a form.
      */
-    interface CommonDialog {
+    class CommonDialog {
+        private constructor();
+        private 'WIA.CommonDialog_typekey': CommonDialog;
+
         /**
-         * Displays one or more dialog boxes that enable the user to acquire an image from a hardware device for image acquisition and returns an ImageFile object
-         *  on success, otherwise Nothing
+         * Displays one or more dialog boxes that enable the user to acquire an image from a hardware device for image acquisition and returns an ImageFile
+         * object on success, otherwise Nothing
          * @param WIA.WiaDeviceType [DeviceType=0]
          * @param WIA.WiaImageIntent [Intent=0]
          * @param WIA.WiaImageBias [Bias=131072]
@@ -203,11 +214,11 @@ declare namespace WIA {
          * @param boolean [UseCommonUI=true]
          * @param boolean [CancelError=false]
          */
-        ShowAcquireImage(
-            DeviceType?: WiaDeviceType, Intent?: WiaImageIntent, Bias?: WiaImageBias, FormatID?: string, AlwaysSelectDevice?: boolean, UseCommonUI?: boolean, CancelError?: boolean): ImageFile;
+        ShowAcquireImage(DeviceType?: WiaDeviceType, Intent?: WiaImageIntent, Bias?: WiaImageBias, FormatID?: string, AlwaysSelectDevice?: boolean, UseCommonUI?: boolean,
+            CancelError?: boolean): ImageFile | null;
 
         /** Launches the Windows Scanner and Camera Wizard and returns Nothing. Future versions may return a collection of ImageFile objects. */
-        ShowAcquisitionWizard(Device: Device): any;
+        ShowAcquisitionWizard(Device: Device): null;
 
         /**
          * Displays the properties dialog box for the specified Device
@@ -222,38 +233,41 @@ declare namespace WIA {
         ShowItemProperties(Item: Item, CancelError?: boolean): void;
 
         /** Launches the Photo Printing Wizard with the absolute path of a specific file or Vector of absolute paths to files */
-        ShowPhotoPrintingWizard(Files: any): void;
+        ShowPhotoPrintingWizard(Files: string | Vector<string>): void;
 
         /**
-         * Displays a dialog box that enables the user to select a hardware device for image acquisition. Returns the selected Device object on success, otherwise
-         *  Nothing
+         * Displays a dialog box that enables the user to select a hardware device for image acquisition. Returns the selected Device object on success,
+         * otherwise Nothing
          * @param WIA.WiaDeviceType [DeviceType=0]
          * @param boolean [AlwaysSelectDevice=false]
          * @param boolean [CancelError=false]
          */
-        ShowSelectDevice(DeviceType?: WiaDeviceType, AlwaysSelectDevice?: boolean, CancelError?: boolean): Device;
+        ShowSelectDevice(DeviceType?: WiaDeviceType, AlwaysSelectDevice?: boolean, CancelError?: boolean): Device | null;
 
         /**
-         * Displays a dialog box that enables the user to select an item for transfer from a hardware device for image acquisition. Returns the selection as an It
-         * ems collection on success, otherwise Nothing
+         * Displays a dialog box that enables the user to select an item for transfer from a hardware device for image acquisition. Returns the selection as an
+         * Items collection on success, otherwise Nothing
          * @param WIA.WiaImageIntent [Intent=0]
          * @param WIA.WiaImageBias [Bias=131072]
          * @param boolean [SingleSelect=true]
          * @param boolean [UseCommonUI=true]
          * @param boolean [CancelError=false]
          */
-        ShowSelectItems(Device: Device, Intent?: WiaImageIntent, Bias?: WiaImageBias, SingleSelect?: boolean, UseCommonUI?: boolean, CancelError?: boolean): Items;
+        ShowSelectItems(Device: Device, Intent?: WiaImageIntent, Bias?: WiaImageBias, SingleSelect?: boolean, UseCommonUI?: boolean, CancelError?: boolean): Items | null;
 
         /**
          * Displays a progress dialog box while transferring the specified Item to the local machine. See Item.Transfer for additional information.
          * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
          * @param boolean [CancelError=false]
          */
-        ShowTransfer(Item: Item, FormatID?: string, CancelError?: boolean): any;
+        ShowTransfer(Item: Item, FormatID?: string, CancelError?: boolean): ImageFile;
     }
 
     /** The Device object represents an active connection to an imaging device. */
-    interface Device {
+    class Device {
+        private constructor();
+        private 'WIA.Device_typekey': Device;
+
         /** A collection of all commands for this imaging device */
         readonly Commands: DeviceCommands;
 
@@ -264,8 +278,8 @@ declare namespace WIA {
         readonly Events: DeviceEvents;
 
         /**
-         * Issues the command specified by CommandID to the imaging device. CommandIDs are device dependent. Valid CommandIDs for this Device are contained in the
-         *  Commands collection.
+         * Issues the command specified by CommandID to the imaging device. CommandIDs are device dependent. Valid CommandIDs for this Device are contained in
+         * the Commands collection.
          */
         ExecuteCommand(CommandID: string): Item;
 
@@ -280,13 +294,13 @@ declare namespace WIA {
 
         /** Returns the Type of Device */
         readonly Type: WiaDeviceType;
-
-        /** Returns the underlying IWiaItem interface for this Device object */
-        readonly WiaItem: any;
     }
 
     /** The DeviceCommand object describes a CommandID that can be used when calling ExecuteCommand on a Device or Item object. */
-    interface DeviceCommand {
+    class DeviceCommand {
+        private constructor();
+        private 'WIA.DeviceCommand_typekey': DeviceCommand;
+
         /** Returns the commandID for this Command */
         readonly CommandID: string;
 
@@ -298,8 +312,8 @@ declare namespace WIA {
     }
 
     /**
-     * The DeviceCommands object is a collection of all the supported DeviceCommands for an imaging device. See the Commands property of a Device or Item obje
-     * ct for more details on determining the collection of supported device commands.
+     * The DeviceCommands object is a collection of all the supported DeviceCommands for an imaging device. See the Commands property of a Device or Item
+     * object for more details on determining the collection of supported device commands.
      */
     interface DeviceCommands {
         /** Returns the number of members in the collection */
@@ -307,10 +321,16 @@ declare namespace WIA {
 
         /** Returns the specified item in the collection by position */
         Item(Index: number): DeviceCommand;
+
+        /** Returns the specified item in the collection by position */
+        (Index: number): DeviceCommand;
     }
 
     /** The DeviceEvent object describes an EventID that can be used when calling RegisterEvent or RegisterPersistentEvent on a DeviceManager object. */
-    interface DeviceEvent {
+    class DeviceEvent {
+        private constructor();
+        private 'WIA.DeviceEvent_typekey': DeviceEvent;
+
         /** Returns the event Description */
         readonly Description: string;
 
@@ -325,8 +345,8 @@ declare namespace WIA {
     }
 
     /**
-     * The DeviceEvents object is a collection of all the supported DeviceEvent for an imaging device. See the Events property of a Device object for more det
-     * ails on determining the collection of supported device events.
+     * The DeviceEvents object is a collection of all the supported DeviceEvent for an imaging device. See the Events property of a Device object for more
+     * details on determining the collection of supported device events.
      */
     interface DeviceEvents {
         /** Returns the number of members in the collection */
@@ -334,13 +354,19 @@ declare namespace WIA {
 
         /** Returns the specified item in the collection by position */
         Item(Index: number): DeviceEvent;
+
+        /** Returns the specified item in the collection by position */
+        (Index: number): DeviceEvent;
     }
 
     /**
-     * The DeviceInfo object is a container that describes the unchanging (static) properties of an imaging device that is currently connected to the computer
-     * .
+     * The DeviceInfo object is a container that describes the unchanging (static) properties of an imaging device that is currently connected to the
+     * computer.
      */
-    interface DeviceInfo {
+    class DeviceInfo {
+        private constructor();
+        private 'WIA.DeviceInfo_typekey': DeviceInfo;
+
         /** Establish a connection with this device and return a Device object */
         Connect(): Device;
 
@@ -355,59 +381,68 @@ declare namespace WIA {
     }
 
     /**
-     * The DeviceInfos object is a collection of all the imaging devices currently connected to the computer. See the DeviceInfos property on the DeviceManage
-     * r object for detail on accessing the DeviceInfos object.
+     * The DeviceInfos object is a collection of all the imaging devices currently connected to the computer. See the DeviceInfos property on the
+     * DeviceManager object for detail on accessing the DeviceInfos object.
      */
     interface DeviceInfos {
         /** Returns the number of members in the collection */
         readonly Count: number;
 
         /** Returns the specified item in the collection either by position or Device ID */
-        Item(Index: any): DeviceInfo;
+        Item(Index: number | string): DeviceInfo;
+
+        /** Returns the specified item in the collection either by position or Device ID */
+        (Index: number | string): DeviceInfo;
     }
 
     /**
-     * The DeviceManager control is an invisible-at-runtime control that manages the imaging devices connected to the computer. A DeviceManager control can be
-     *  created using "WIA.DeviceManager" in a call to CreateObject or by dropping a DeviceManager on a form.
+     * The DeviceManager control is an invisible-at-runtime control that manages the imaging devices connected to the computer. A DeviceManager control can
+     * be created using "WIA.DeviceManager" in a call to CreateObject or by dropping a DeviceManager on a form.
      */
-    interface DeviceManager {
+    class DeviceManager {
+        private constructor();
+        private 'WIA.DeviceManager_typekey': DeviceManager;
+
         /** A collection of all imaging devices connected to this computer */
         readonly DeviceInfos: DeviceInfos;
 
         /**
          * Registers the specified EventID for the specified DeviceID. If DeviceID is "*" then OnEvent will be called whenever the event specified occurs for any
-         *  device. Otherwise, OnEvent will only be called if the event specified occurs on the device specified.
+         * device. Otherwise, OnEvent will only be called if the event specified occurs on the device specified.
          * @param string [DeviceID='*']
          */
         RegisterEvent(EventID: string, DeviceID?: string): void;
 
         /**
-         * Registers the specified Command to launch when the specified EventID for the specified DeviceID occurs. Command can be either a ClassID or the full pat
-         * h name and the appropriate command-line arguments needed to invoke the application.
+         * Registers the specified Command to launch when the specified EventID for the specified DeviceID occurs. Command can be either a ClassID or the full
+         * path name and the appropriate command-line arguments needed to invoke the application.
          * @param string [DeviceID='*']
          */
         RegisterPersistentEvent(Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string): void;
 
         /**
-         * Unregisters the specified EventID for the specified DeviceID. UnregisterEvent should only be called for EventID and DeviceID for which you called Regis
-         * terEvent.
+         * Unregisters the specified EventID for the specified DeviceID. UnregisterEvent should only be called for EventID and DeviceID for which you called
+         * RegisterEvent.
          * @param string [DeviceID='*']
          */
         UnregisterEvent(EventID: string, DeviceID?: string): void;
 
         /**
-         * Unregisters the specified Command for the specified EventID for the specified DeviceID. UnregisterPersistentEvent should only be called for the Command
-         * , Name, Description, Icon, EventID and DeviceID for which you called RegisterPersistentEvent.
+         * Unregisters the specified Command for the specified EventID for the specified DeviceID. UnregisterPersistentEvent should only be called for the
+         * Command, Name, Description, Icon, EventID and DeviceID for which you called RegisterPersistentEvent.
          * @param string [DeviceID='*']
          */
         UnregisterPersistentEvent(Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string): void;
     }
 
     /**
-     * The Filter object represents a unit of modification on an ImageFile. To use a Filter, add it to the Filters collection, then set the filter's propertie
-     * s and finally use the Apply method of the ImageProcess object to filter an ImageFile.
+     * The Filter object represents a unit of modification on an ImageFile. To use a Filter, add it to the Filters collection, then set the filter's
+     * properties and finally use the Apply method of the ImageProcess object to filter an ImageFile.
      */
-    interface Filter {
+    class Filter {
+        private constructor();
+        private 'WIA.Filter_typekey': Filter;
+
         /** Returns a Description of what the filter does */
         readonly Description: string;
 
@@ -422,10 +457,13 @@ declare namespace WIA {
     }
 
     /**
-     * The FilterInfo object is a container that describes a Filter object without requiring a Filter to be Added to the process chain. See the FilterInfos pr
-     * operty on the ImageProcess object for details on accessing FilterInfo objects.
+     * The FilterInfo object is a container that describes a Filter object without requiring a Filter to be Added to the process chain. See the FilterInfos
+     * property on the ImageProcess object for details on accessing FilterInfo objects.
      */
-    interface FilterInfo {
+    class FilterInfo {
+        private constructor();
+        private 'WIA.FilterInfo_typekey': FilterInfo;
+
         /** Returns a technical Description of what the filter does and how to use it in a filter chain */
         readonly Description: string;
 
@@ -437,15 +475,18 @@ declare namespace WIA {
     }
 
     /**
-     * The FilterInfos object is a collection of all the available FilterInfo objects. See the FilterInfos property on the ImageProcess object for detail on a
-     * ccessing the FilterInfos object.
+     * The FilterInfos object is a collection of all the available FilterInfo objects. See the FilterInfos property on the ImageProcess object for detail on
+     * accessing the FilterInfos object.
      */
     interface FilterInfos {
         /** Returns the number of members in the collection */
         readonly Count: number;
 
         /** Returns the specified item in the collection either by position or name */
-        Item(Index: any): FilterInfo;
+        Item(Index: number | string): FilterInfo;
+
+        /** Returns the specified item in the collection either by position or name */
+        (Index: number | string): FilterInfo;
     }
 
     /** The Filters object is a collection of the Filters that will be applied to an ImageFile when you call the Apply method on the ImageProcess object. */
@@ -464,11 +505,14 @@ declare namespace WIA {
 
         /** Removes the designated filter */
         Remove(Index: number): void;
+
+        /** Returns the specified item in the collection by position or FilterID */
+        (Index: number): Filter;
     }
 
     /**
-     * The Formats object is a collection of supported FormatIDs that you can use when calling Transfer on an Item object or ShowTransfer on a CommonDialog ob
-     * ject for this Item.
+     * The Formats object is a collection of supported FormatIDs that you can use when calling Transfer on an Item object or ShowTransfer on a CommonDialog
+     * object for this Item.
      */
     interface Formats {
         /** Returns the number of members in the collection */
@@ -476,13 +520,19 @@ declare namespace WIA {
 
         /** Returns the specified item in the collection by position */
         Item(Index: number): string;
+
+        /** Returns the specified item in the collection by position */
+        (Index: number): string;
     }
 
     /**
-     * The ImageFile object is a container for images transferred to your computer when you call Transfer or ShowTransfer. It also supports image files throug
-     * h LoadFile. An ImageFile object can be created using "WIA.ImageFile" in a call to CreateObject.
+     * The ImageFile object is a container for images transferred to your computer when you call Transfer or ShowTransfer. It also supports image files
+     * through LoadFile. An ImageFile object can be created using "WIA.ImageFile" in a call to CreateObject.
      */
-    interface ImageFile {
+    class ImageFile {
+        private constructor();
+        private 'WIA.ImageFile_typekey': ImageFile;
+
         /** Returns/Sets the current frame in the image */
         ActiveFrame: number;
 
@@ -539,7 +589,10 @@ declare namespace WIA {
     }
 
     /** The ImageProcess object manages the filter chain. An ImageProcess object can be created using "WIA.ImageProcess" in a call to CreateObject. */
-    interface ImageProcess {
+    class ImageProcess {
+        private constructor();
+        private 'WIA.ImageProcess_typekey': ImageProcess;
+
         /** Takes the specified ImageFile and returns the new ImageFile with all the filters applied on success */
         Apply(Source: ImageFile): ImageFile;
 
@@ -551,10 +604,13 @@ declare namespace WIA {
     }
 
     /**
-     * The Item object is a container for an item on an imaging device object. See the Items property on the Device or Item object for details on accessing It
-     * em objects.
+     * The Item object is a container for an item on an imaging device object. See the Items property on the Device or Item object for details on accessing
+     * Item objects.
      */
-    interface Item {
+    class Item {
+        private constructor();
+        private 'WIA.Item_typekey': Item;
+
         /** A collection of all commands for this item */
         readonly Commands: DeviceCommands;
 
@@ -574,17 +630,15 @@ declare namespace WIA {
         readonly Properties: Properties;
 
         /**
-         * Returns an ImageFile object, in this version, in the format specified in FormatID if supported, otherwise using the preferred format for this imaging d
-         * evice. Future versions may return a collection of ImageFile objects.
+         * Returns an ImageFile object, in this version, in the format specified in FormatID if supported, otherwise using the preferred format for this imaging
+         * device. Future versions may return a collection of ImageFile objects.
          * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
          */
-        Transfer(FormatID?: string): any;
-
-        /** Returns the underlying IWiaItem interface for this Item object */
-        readonly WiaItem: any;
+        Transfer(FormatID?: string): ImageFile;
     }
 
     /** The Items object contains a collection of Item objects. See the Items property on the Device or Item object for details on accessing the Items object. */
+    // tslint:disable-next-line interface-name
     interface Items {
         /** Adds a new Item with the specified Name and Flags. The Flags value is created by using the OR operation with members of the WiaItemFlags enumeration. */
         Add(Name: string, Flags: number): void;
@@ -597,28 +651,37 @@ declare namespace WIA {
 
         /** Removes the designated Item */
         Remove(Index: number): void;
+
+        /** Returns the specified item in the collection by position */
+        (Index: number): Item;
     }
 
     /**
-     * The Properties object is a collection of all the Property objects associated with a given Device, DeviceInfo, Filter, ImageFile or Item object. See the
-     *  Properties property on any of these objects for detail on accessing the Properties object.
+     * The Properties object is a collection of all the Property objects associated with a given Device, DeviceInfo, Filter, ImageFile or Item object. See
+     * the Properties property on any of these objects for detail on accessing the Properties object.
      */
     interface Properties {
         /** Returns the number of members in the collection */
         readonly Count: number;
 
         /** Indicates whether the specified Property exists in the collection */
-        Exists(Index: any): boolean;
+        Exists(Index: number | string): boolean;
 
         /** Returns the specified item in the collection either by position or name. */
-        Item(Index: any): Property;
+        Item(Index: number | string): Property;
+
+        /** Returns the specified item in the collection either by position or name. */
+        (Index: number | string): Property;
     }
 
     /**
-     * The Property object is a container for a property associated with a Device, DeviceInfo, Filter, ImageFile or Item object. See the Properties property o
-     * n any of these objects for details on accessing Property objects.
+     * The Property object is a container for a property associated with a Device, DeviceInfo, Filter, ImageFile or Item object. See the Properties property
+     * on any of these objects for details on accessing Property objects.
      */
-    interface Property {
+    class Property {
+        private constructor();
+        private 'WIA.Property_typekey': Property;
+
         /** Indicates whether the Property Value is read only */
         readonly IsReadOnly: boolean;
 
@@ -657,10 +720,13 @@ declare namespace WIA {
     }
 
     /**
-     * The Rational object is a container for the rational values found in Exif tags. It is a supported element type of the Vector object and may be created u
-     * sing "WIA.Rational" in a call to CreateObject.
+     * The Rational object is a container for the rational values found in Exif tags. It is a supported element type of the Vector object and may be created
+     * using "WIA.Rational" in a call to CreateObject.
      */
-    interface Rational {
+    class Rational {
+        private constructor();
+        private 'WIA.Rational_typekey': Rational;
+
         /** Returns/Sets the Rational Value Denominator */
         Denominator: number;
 
@@ -672,19 +738,19 @@ declare namespace WIA {
     }
 
     /**
-     * The Vector object is a collection of values of the same type. It is used throughout the library in many different ways. The Vector object may be create
-     * d using "WIA.Vector" in a call to CreateObject.
+     * The Vector object is a collection of values of the same type. It is used throughout the library in many different ways. The Vector object may be
+     * created using "WIA.Vector" in a call to CreateObject.
      */
-    interface Vector {
+    interface Vector<TItem = any> {
         /**
-         * If Index is not zero, Inserts a new element into the Vector collection before the specified Index. If Index is zero, Appends a new element to the Vecto
-         * r collection.
+         * If Index is not zero, Inserts a new element into the Vector collection before the specified Index. If Index is zero, Appends a new element to the
+         * Vector collection.
          * @param number [Index=0]
          */
-        Add(Value: any, Index?: number): void;
+        Add(Value: TItem, Index?: number): void;
 
         /** Returns/Sets the Vector of Bytes as an array of bytes */
-        BinaryData: any;
+        BinaryData: SafeArray;
 
         /** Removes all elements. */
         Clear(): void;
@@ -696,30 +762,30 @@ declare namespace WIA {
         Date: VarDate;
 
         /**
-         * Used to get the Thumbnail property of an ImageFile which is an image file, The thumbnail property of an Item which is RGB data, or creating an ImageFil
-         * e from raw ARGB data. Returns an ImageFile object on success. See the Picture method for more details.
+         * Used to get the Thumbnail property of an ImageFile which is an image file, The thumbnail property of an Item which is RGB data, or creating an
+         * ImageFile from raw ARGB data. Returns an ImageFile object on success. See the Picture method for more details.
          * @param number [Width=0]
          * @param number [Height=0]
          */
         ImageFile(Width?: number, Height?: number): ImageFile;
 
-        /** Returns/Sets the specified item in the vector by position */
-        Item(Index: number): any;
+        /** Returns the specified item in the vector by position */
+        Item(Index: number): TItem;
 
         /**
-         * If the Vector of Bytes contains an image file, then Width and Height are ignored. Otherwise a Vector of Bytes must be RGB data and a Vector of Longs mu
-         * st be ARGB data. Returns a Picture object on success. See the ImageFile method for more details.
+         * If the Vector of Bytes contains an image file, then Width and Height are ignored. Otherwise a Vector of Bytes must be RGB data and a Vector of Longs
+         * must be ARGB data. Returns a Picture object on success. See the ImageFile method for more details.
          * @param number [Width=0]
          * @param number [Height=0]
          */
         Picture(Width?: number, Height?: number): any;
 
         /** Removes the designated element and returns it if successful */
-        Remove(Index: number): any;
+        Remove(Index: number): TItem | null;
 
         /**
-         * Stores the string Value into the Vector of Bytes including the NULL terminator. Value may be truncated unless Resizable is True. The string will be sto
-         * red as an ANSI string unless Unicode is True, in which case it will be stored as a Unicode string.
+         * Stores the string Value into the Vector of Bytes including the NULL terminator. Value may be truncated unless Resizable is True. The string will be
+         * stored as an ANSI string unless Unicode is True, in which case it will be stored as a Unicode string.
          * @param boolean [Resizable=true]
          * @param boolean [Unicode=true]
          */
@@ -730,30 +796,24 @@ declare namespace WIA {
          * @param boolean [Unicode=true]
          */
         String(Unicode?: boolean): string;
+
+        /** Returns the specified item in the vector by position */
+        (Index: number): TItem;
     }
 }
 
 interface ActiveXObject {
+    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
     on(obj: WIA.DeviceManager, event: 'OnEvent', argNames: ['EventID', 'DeviceID', 'ItemID'], handler: (
-        this: WIA.DeviceManager, parameter: {
-        EventID: string, DeviceID: string, ItemID: string}) => void): void;
-    set(obj: WIA.Vector, propertyName: 'Item', parameterTypes: [number], newValue: any): void;
-    new(progid: 'WIA.CommonDialog'): WIA.CommonDialog;
-    new(progid: 'WIA.DeviceManager'): WIA.DeviceManager;
-    new(progid: 'WIA.ImageFile'): WIA.ImageFile;
-    new(progid: 'WIA.ImageProcess'): WIA.ImageProcess;
-    new(progid: 'WIA.Rational'): WIA.Rational;
-    new(progid: 'WIA.Vector'): WIA.Vector;
+        this: WIA.DeviceManager, parameter: { readonly EventID: string, readonly DeviceID: string, readonly ItemID: string }) => void): void;
+    set<TItem>(obj: WIA.Vector<TItem>, propertyName: 'Item', parameterTypes: [number], newValue: TItem): void;
 }
 
-interface EnumeratorConstructor {
-    new(col: WIA.DeviceCommands): WIA.DeviceCommand;
-    new(col: WIA.DeviceEvents): WIA.DeviceEvent;
-    new(col: WIA.DeviceInfos): WIA.DeviceInfo;
-    new(col: WIA.FilterInfos): WIA.FilterInfo;
-    new(col: WIA.Filters): WIA.Filter;
-    new(col: WIA.Formats): string;
-    new(col: WIA.Items): WIA.Item;
-    new(col: WIA.Properties): WIA.Property;
-    new(col: WIA.Vector): any;
+interface ActiveXObjectNameMap {
+    'WIA.CommonDialog': WIA.CommonDialog;
+    'WIA.DeviceManager': WIA.DeviceManager;
+    'WIA.ImageFile': WIA.ImageFile;
+    'WIA.ImageProcess': WIA.ImageProcess;
+    'WIA.Rational': WIA.Rational;
+    'WIA.Vector': WIA.Vector;
 }
diff --git a/types/activex-wia/tslint.json b/types/activex-wia/tslint.json
index 3224b40b8b..f93cf8562a 100644
--- a/types/activex-wia/tslint.json
+++ b/types/activex-wia/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-const-enum": false
-    }
+    "extends": "dtslint/dt.json"
 }

From 2dace74657d9141276b7199ae3bf1a13002d89e9 Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Sat, 10 Feb 2018 19:28:26 -0700
Subject: [PATCH 031/388] Ember Data: merge latest.

---
 types/ember-data/index.d.ts               | 545 ++++++++++++----------
 types/ember-data/test/adapter.ts          |  12 +
 types/ember-data/test/belongs-to.ts       |  10 +-
 types/ember-data/test/has-many.ts         |  45 +-
 types/ember-data/test/injections.ts       |   8 +
 types/ember-data/test/record-reference.ts |   8 +-
 types/ember-data/test/relationships.ts    |  13 +-
 types/ember-data/test/serializer.ts       |   3 +-
 types/ember-data/test/store.ts            |  80 +++-
 types/ember-data/tsconfig.json            |   9 +-
 types/ember-data/tslint.json              |   1 +
 11 files changed, 430 insertions(+), 304 deletions(-)

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index e485edff21..9531372a87 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -2,12 +2,18 @@
 // Project: https://github.com/emberjs/data
 // Definitions by: Derek Wickern <https://github.com/dwickern>
 //                 Mike North <https://github.com/mike-north>
+//                 Chris Krycho <https://github.com/chriskrycho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-declare module "ember-data" {
-    import Ember from "ember";
+declare module 'ember-data' {
+    import Ember from 'ember';
     import RSVP from 'rsvp';
+
+    export interface ModelRegistry {}
+    export interface AdapterRegistry {}
+    export interface SerializerRegistry {}
+
     namespace DS {
         /**
          * Convert an hash of errors into an array with errors in JSON-API format.
@@ -21,47 +27,47 @@ declare module "ember-data" {
          * `DS.belongsTo` is used to define One-To-One and One-To-Many
          * relationships on a [DS.Model](/api/data/classes/DS.Model.html).
          */
-        function belongsTo<T extends Model>(
-            modelName: string,
+        function belongsTo<K extends keyof ModelRegistry>(
+            modelName: K,
             options: {
                 async: false;
                 inverse?: string | null;
                 polymorphic?: boolean;
             }
-        ): Ember.ComputedProperty<T>;
-        function belongsTo<T extends Model>(
-            modelName: string,
+        ): Ember.ComputedProperty<ModelRegistry[K]>;
+        function belongsTo<K extends keyof ModelRegistry>(
+            modelName: K,
             options?: {
                 async?: true;
                 inverse?: string | null;
                 polymorphic?: boolean;
             }
-        ): Ember.ComputedProperty<T & PromiseObject<T>>;
+        ): Ember.ComputedProperty<ModelRegistry[K] & PromiseObject<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).
          */
-        function hasMany<T extends Model>(
-            type: string,
+        function hasMany<K extends keyof ModelRegistry>(
+            type: K,
             options: {
                 async: false;
                 inverse?: string | null;
                 polymorphic?: boolean;
             }
-        ): Ember.ComputedProperty<ManyArray<T>>;
-        function hasMany<T extends Model>(
-            type: string,
+        ): Ember.ComputedProperty<ManyArray<ModelRegistry[K]>>;
+        function hasMany<K extends keyof ModelRegistry>(
+            type: K,
             options?: {
                 async?: true;
                 inverse?: string | null;
                 polymorphic?: boolean;
             }
-        ): Ember.ComputedProperty<PromiseManyArray<T>>;
+        ): Ember.ComputedProperty<PromiseManyArray<ModelRegistry[K]>>;
         /**
          * This method normalizes a modelName into the format Ember Data uses
          * internally.
          */
-        function normalizeModelName(modelName: string): string;
+        function normalizeModelName<K extends keyof ModelRegistry>(modelName: K): string;
         const VERSION: string;
 
         interface AttrOptions<T = any> {
@@ -77,19 +83,19 @@ declare module "ember-data" {
          * [DS.Transform](/api/data/classes/DS.Transform.html).
          */
         function attr(
-            type: "string",
+            type: 'string',
             options?: AttrOptions<string>
         ): Ember.ComputedProperty<string>;
         function attr(
-            type: "boolean",
+            type: 'boolean',
             options?: AttrOptions<boolean>
         ): Ember.ComputedProperty<boolean>;
         function attr(
-            type: "number",
+            type: 'number',
             options?: AttrOptions<number>
         ): Ember.ComputedProperty<number>;
         function attr(
-            type: "date",
+            type: 'date',
             options?: AttrOptions<Date>
         ): Ember.ComputedProperty<Date>;
         function attr<T>(
@@ -118,89 +124,89 @@ declare module "ember-data" {
             /**
              * Builds a URL for a given type and optional ID.
              */
-            buildURL(
-                modelName?: string,
+            buildURL<K extends keyof ModelRegistry>(
+                modelName?: K,
                 id?: string | any[] | {} | null,
-                snapshot?: Snapshot | any[] | null,
+                snapshot?: Snapshot<K> | any[] | null,
                 requestType?: string,
                 query?: {}
             ): string;
             /**
              * Builds a URL for a `store.findRecord(type, id)` call.
              */
-            urlForFindRecord(
+            urlForFindRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `store.findAll(type)` call.
              */
-            urlForFindAll(
-                modelName: string,
-                snapshot: SnapshotRecordArray
+            urlForFindAll<K extends keyof ModelRegistry>(
+                modelName: K,
+                snapshot: SnapshotRecordArray<K>
             ): string;
             /**
              * Builds a URL for a `store.query(type, query)` call.
              */
-            urlForQuery(query: {}, modelName: string): string;
+            urlForQuery<K extends keyof ModelRegistry>(query: {}, modelName: K): string;
             /**
              * Builds a URL for a `store.queryRecord(type, query)` call.
              */
-            urlForQueryRecord(query: {}, modelName: string): string;
+            urlForQueryRecord<K extends keyof ModelRegistry>(query: {}, modelName: K): string;
             /**
              * Builds a URL for coalesceing multiple `store.findRecord(type, id)`
              * records into 1 request when the adapter's `coalesceFindRequests`
              * property is true.
              */
-            urlForFindMany(
+            urlForFindMany<K extends keyof ModelRegistry>(
                 ids: any[],
-                modelName: string,
+                modelName: K,
                 snapshots: any[]
             ): string;
             /**
              * Builds a URL for fetching a async hasMany relationship when a url
              * is not provided by the server.
              */
-            urlForFindHasMany(
+            urlForFindHasMany<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for fetching a async belongsTo relationship when a url
              * is not provided by the server.
              */
-            urlForFindBelongsTo(
+            urlForFindBelongsTo<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `record.save()` call when the record was created
              * locally using `store.createRecord()`.
              */
-            urlForCreateRecord(modelName: string, snapshot: Snapshot): string;
+            urlForCreateRecord<K extends keyof ModelRegistry>(modelName: K, snapshot: Snapshot<K>): string;
             /**
              * Builds a URL for a `record.save()` call when the record has been update locally.
              */
-            urlForUpdateRecord(
+            urlForUpdateRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `record.save()` call when the record has been deleted locally.
              */
-            urlForDeleteRecord(
+            urlForDeleteRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Determines the pathname for a given type.
              */
-            pathForType(modelName: string): string;
+            pathForType<K extends keyof ModelRegistry>(modelName: K): string;
         }
         /**
          * A `DS.AdapterError` is used by an adapter to signal that an error occurred
@@ -502,11 +508,11 @@ declare module "ember-data" {
             /**
              * Get the reference for the specified belongsTo relationship.
              */
-            belongsTo(name: string): BelongsToReference;
+            belongsTo(name: keyof ModelRegistry): BelongsToReference;
             /**
              * Get the reference for the specified hasMany relationship.
              */
-            hasMany(name: string): HasManyReference<any>;
+            hasMany(name: keyof ModelRegistry): 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
@@ -517,15 +523,15 @@ declare module "ember-data" {
              * Represents the model's class name as a string. This can be used to look up the model's class name through
              * `DS.Store`'s modelFor method.
              */
-            static modelName: string;
+            static modelName: keyof ModelRegistry;
             /**
              * For a given relationship name, returns the model type of the relationship.
              */
-            static typeForRelationship(name: string, store: Store): Model;
+            static typeForRelationship<K extends keyof ModelRegistry>(name: K, store: Store): ModelRegistry[K];
             /**
              * Find the relationship which is the inverse of the one asked for.
              */
-            static inverseFor(name: string, store: Store): {};
+            static inverseFor<K extends keyof ModelRegistry>(name: K, store: Store): {};
             /**
              * The model's relationships as a map, keyed on the type of the
              * relationship. The value of each entry is an array containing a descriptor
@@ -885,7 +891,7 @@ declare module "ember-data" {
              */
             createRecord(inputProperties?: {}): T;
         }
-        class SnapshotRecordArray {
+        class SnapshotRecordArray<K extends keyof ModelRegistry> {
             /**
              * Number of records in the array
              */
@@ -905,18 +911,18 @@ declare module "ember-data" {
             /**
              * The type of the underlying records for the snapshots in the array, as a DS.Model
              */
-            type: Model;
+            type: ModelRegistry[K];
             /**
              * Get snapshots of the underlying record array
              */
             snapshots(): any[];
         }
-        class Snapshot {
+        class Snapshot<K extends keyof ModelRegistry = any> {
             /**
              * The underlying record for this snapshot. Can be used to access methods and
              * properties defined on the record.
              */
-            record: Model;
+            record: ModelRegistry[K];
             /**
              * The id of the snapshot's underlying record
              */
@@ -928,15 +934,15 @@ declare module "ember-data" {
             /**
              * The name of the type of the underlying record for this snapshot, as a string.
              */
-            modelName: string;
+            modelName: K;
             /**
              * The type of the underlying record for this snapshot, as a DS.Model.
              */
-            type: Model;
+            type: ModelRegistry[K];
             /**
              * Returns the value of an attribute.
              */
-            attr(keyName: string): {};
+            attr<L extends keyof ModelRegistry[K]>(keyName: L): {};
             /**
              * Returns all attributes and their corresponding values.
              */
@@ -948,14 +954,14 @@ declare module "ember-data" {
             /**
              * Returns the current value of a belongsTo relationship.
              */
-            belongsTo(
-                keyName: string,
+            belongsTo<L extends keyof ModelRegistry[K]>(
+                keyName: L,
                 options?: {}
-            ): Snapshot | string | null | undefined;
+            ): Snapshot<K> | string | null | undefined;
             /**
              * Returns the current value of a hasMany relationship.
              */
-            hasMany(keyName: string, options?: {}): any[] | undefined;
+            hasMany<L extends keyof ModelRegistry[K]>(keyName: L, options?: {}): any[] | undefined;
             /**
              * Iterates through all the attributes of the model, calling the passed
              * function on each attribute.
@@ -971,6 +977,7 @@ declare module "ember-data" {
              */
             serialize(options: {}): {};
         }
+
         /**
          * The store contains all of the data for records loaded from the server.
          * It is also responsible for creating instances of `DS.Model` that wrap
@@ -988,10 +995,10 @@ declare module "ember-data" {
              * Create a new record in the current store. The properties passed
              * to this method are set on the newly created record.
              */
-            createRecord<T extends Model>(
-                modelName: string,
+            createRecord<K extends keyof ModelRegistry>(
+                modelName: K,
                 inputProperties?: {}
-            ): T;
+            ): ModelRegistry[K];
             /**
              * For symmetry, a record can be deleted via the store.
              */
@@ -1004,83 +1011,86 @@ declare module "ember-data" {
             /**
              * This method returns a record for a given type and id combination.
              */
-            findRecord<T extends Model>(
-                modelName: string,
+            findRecord<K extends keyof ModelRegistry>(
+                modelName: K,
                 id: string | number,
                 options?: {}
-            ): PromiseObject<T> & T;
+            ): PromiseObject<ModelRegistry[K]> & ModelRegistry[K];
             /**
              * Get the reference for the specified record.
              */
-            getReference<T extends Model>(
-                modelName: string,
+            getReference<K extends keyof ModelRegistry>(
+                modelName: K,
                 id: string | number
-            ): RecordReference<T>;
+            ): RecordReference<ModelRegistry[K]>;
             /**
              * Get a record by a given type and ID without triggering a fetch.
              */
-            peekRecord<T extends Model>(
-                modelName: string,
+            peekRecord<K extends keyof ModelRegistry>(
+                modelName: K,
                 id: string | number
-            ): T | null;
+            ): ModelRegistry[K] | null;
             /**
              * This method returns true if a record for a given modelName and id is already
              * loaded in the store. Use this function to know beforehand if a findRecord()
              * will result in a request or that it will be a cache hit.
              */
-            hasRecordForId(modelName: string, id: string | number): boolean;
+            hasRecordForId<K extends keyof ModelRegistry>(
+                modelName: K,
+                id: string | number
+            ): boolean;
             /**
              * This method delegates a query to the adapter. This is the one place where
              * adapter-level semantics are exposed to the application.
              */
-            query<T extends Model>(
-                modelName: string,
+            query<K extends keyof ModelRegistry>(
+                modelName: K,
                 query: any
-            ): AdapterPopulatedRecordArray<T> & PromiseArray<T>;
+            ): AdapterPopulatedRecordArray<ModelRegistry[K]> & PromiseArray<ModelRegistry[K]>;
             /**
              * This method makes a request for one record, where the `id` is not known
              * beforehand (if the `id` is known, use [`findRecord`](#method_findRecord)
              * instead).
              */
-            queryRecord<T extends Model>(
-                modelName: string,
+            queryRecord<K extends keyof ModelRegistry>(
+                modelName: K,
                 query: any
-            ): RSVP.Promise<T>;
+            ): RSVP.Promise<ModelRegistry[K]>;
             /**
              * `findAll` asks the adapter's `findAll` method to find the records for the
              * given type, and returns a promise which will resolve with all records of
              * this type present in the store, even if the adapter only returns a subset
              * of them.
              */
-            findAll<T extends Model>(
-                modelName: string,
+            findAll<K extends keyof ModelRegistry>(
+                modelName: K,
                 options?: {
                     reload?: boolean;
                     backgroundReload?: boolean;
                     include?: string;
                     adapterOptions?: any;
                 }
-            ): PromiseArray<T>;
+            ): PromiseArray<ModelRegistry[K]>;
             /**
              * This method returns a filtered array that contains all of the
              * known records for a given type in the store.
              */
-            peekAll<T extends Model>(modelName: string): RecordArray<T>;
+            peekAll<K extends keyof ModelRegistry>(modelName: K): RecordArray<ModelRegistry[K]>;
             /**
              * This method unloads all records in the store.
              * It schedules unloading to happen during the next run loop.
              */
-            unloadAll(modelName: string): void;
+            unloadAll<K extends keyof ModelRegistry>(modelName: K): void;
             /**
              * DEPRECATED:
              * This method has been deprecated and is an alias for store.hasRecordForId, which should
              * be used instead.
              */
-            recordIsLoaded(modelName: string, id: string): boolean;
+            recordIsLoaded<K extends keyof ModelRegistry>(modelName: K, id: string): boolean;
             /**
              * Returns the model class for the particular `modelName`.
              */
-            modelFor<M extends Model>(modelName: string): M;
+            modelFor<K extends keyof ModelRegistry>(modelName: K): ModelRegistry[K];
             /**
              * Push some data for a given type into the store.
              */
@@ -1088,25 +1098,25 @@ declare module "ember-data" {
             /**
              * Push some raw data into the store.
              */
-            pushPayload(modelName: string, inputPayload: {}): any;
+            pushPayload<K extends keyof ModelRegistry>(modelName: K, inputPayload: {}): any;
             pushPayload(inputPayload: {}): any;
             /**
              * `normalize` converts a json payload into the normalized form that
              * [push](#method_push) expects.
              */
-            normalize(modelName: string, payload: {}): {};
+            normalize<K extends keyof ModelRegistry>(modelName: K, payload: {}): {};
             /**
              * Returns an instance of the adapter for a given type. For
              * example, `adapterFor('person')` will return an instance of
              * `App.PersonAdapter`.
              */
-            adapterFor<A extends Adapter>(modelName: string): A;
+            adapterFor<K extends keyof AdapterRegistry>(modelName: K): AdapterRegistry[K];
             /**
              * Returns an instance of the serializer for a given type. For
              * example, `serializerFor('person')` will return an instance of
              * `App.PersonSerializer`.
              */
-            serializerFor<S extends Serializer>(modelName: string): S;
+            serializerFor<K extends keyof SerializerRegistry>(modelName: K): SerializerRegistry[K];
         }
         /**
          * The `JSONAPIAdapter` is the default adapter used by Ember Data. It
@@ -1132,7 +1142,11 @@ declare module "ember-data" {
             /**
              * Takes a URL, an HTTP method and a hash of data, and makes an HTTP request.
              */
-            ajax(url: string, type: string, options?: object): RSVP.Promise<any>;
+            ajax(
+                url: string,
+                type: string,
+                options?: object
+            ): RSVP.Promise<any>;
             /**
              * Generate ajax options
              */
@@ -1170,38 +1184,42 @@ declare module "ember-data" {
              * Called by the store in order to fetch the JSON for a given
              * type and ID.
              */
-            findRecord(
+            findRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 id: string,
-                snapshot: Snapshot
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Called by the store in order to fetch a JSON array for all
              * of the records for a given type.
              */
-            findAll(
+            findAll<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 sinceToken: string,
-                snapshotRecordArray: SnapshotRecordArray
+                snapshotRecordArray: SnapshotRecordArray<K>
             ): RSVP.Promise<any>;
             /**
              * Called by the store in order to fetch a JSON array for
              * the records that match a particular query.
              */
-            query(store: Store, type: Model, query: {}): RSVP.Promise<any>;
+            query<K extends keyof ModelRegistry>(store: Store, type: ModelRegistry[K], query: {}): RSVP.Promise<any>;
             /**
              * Called by the store in order to fetch a JSON object for
              * the record that matches a particular query.
              */
-            queryRecord(store: Store, type: Model, query: {}): RSVP.Promise<any>;
+            queryRecord<K extends keyof ModelRegistry>(
+                store: Store,
+                type: ModelRegistry[K],
+                query: {}
+            ): RSVP.Promise<any>;
             /**
              * Called by the store in order to fetch several records together if `coalesceFindRequests` is true
              */
-            findMany(
+            findMany<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 ids: any[],
                 snapshots: any[]
             ): RSVP.Promise<any>;
@@ -1210,9 +1228,9 @@ declare module "ember-data" {
              * the unloaded records in a has-many relationship that were originally
              * specified as a URL (inside of `links`).
              */
-            findHasMany(
+            findHasMany<K extends keyof ModelRegistry>(
                 store: Store,
-                snapshot: Snapshot,
+                snapshot: Snapshot<K>,
                 url: string,
                 relationship: {}
             ): RSVP.Promise<any>;
@@ -1221,36 +1239,36 @@ declare module "ember-data" {
              * belongs-to relationship that was originally specified as a URL (inside of
              * `links`).
              */
-            findBelongsTo(
+            findBelongsTo<K extends keyof ModelRegistry>(
                 store: Store,
-                snapshot: Snapshot,
+                snapshot: Snapshot<K>,
                 url: string
             ): RSVP.Promise<any>;
             /**
              * Called by the store when a newly created record is
              * saved via the `save` method on a model record instance.
              */
-            createRecord(
+            createRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Called by the store when an existing record is saved
              * via the `save` method on a model record instance.
              */
-            updateRecord(
+            updateRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Called by the store when a record is deleted.
              */
-            deleteRecord(
+            deleteRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Organize records into groups, each of which is to be passed to separate
@@ -1295,89 +1313,89 @@ declare module "ember-data" {
             /**
              * Builds a URL for a given type and optional ID.
              */
-            buildURL(
-                modelName?: string,
+            buildURL<K extends keyof ModelRegistry>(
+                modelName?: K,
                 id?: string | any[] | {} | null,
-                snapshot?: Snapshot | any[] | null,
+                snapshot?: Snapshot<K> | any[] | null,
                 requestType?: string,
                 query?: {}
             ): string;
             /**
              * Builds a URL for a `store.findRecord(type, id)` call.
              */
-            urlForFindRecord(
+            urlForFindRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `store.findAll(type)` call.
              */
-            urlForFindAll(
-                modelName: string,
-                snapshot: SnapshotRecordArray
+            urlForFindAll<K extends keyof ModelRegistry>(
+                modelName: K,
+                snapshot: SnapshotRecordArray<K>
             ): string;
             /**
              * Builds a URL for a `store.query(type, query)` call.
              */
-            urlForQuery(query: {}, modelName: string): string;
+            urlForQuery<K extends keyof ModelRegistry>(query: {}, modelName: K): string;
             /**
              * Builds a URL for a `store.queryRecord(type, query)` call.
              */
-            urlForQueryRecord(query: {}, modelName: string): string;
+            urlForQueryRecord<K extends keyof ModelRegistry>(query: {}, modelName: K): string;
             /**
              * Builds a URL for coalesceing multiple `store.findRecord(type, id)`
              * records into 1 request when the adapter's `coalesceFindRequests`
              * property is true.
              */
-            urlForFindMany(
+            urlForFindMany<K extends keyof ModelRegistry>(
                 ids: any[],
-                modelName: string,
+                modelName: K,
                 snapshots: any[]
             ): string;
             /**
              * Builds a URL for fetching a async hasMany relationship when a url
              * is not provided by the server.
              */
-            urlForFindHasMany(
+            urlForFindHasMany<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for fetching a async belongsTo relationship when a url
              * is not provided by the server.
              */
-            urlForFindBelongsTo(
+            urlForFindBelongsTo<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `record.save()` call when the record was created
              * locally using `store.createRecord()`.
              */
-            urlForCreateRecord(modelName: string, snapshot: Snapshot): string;
+            urlForCreateRecord<K extends keyof ModelRegistry>(modelName: K, snapshot: Snapshot<K>): string;
             /**
              * Builds a URL for a `record.save()` call when the record has been update locally.
              */
-            urlForUpdateRecord(
+            urlForUpdateRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Builds a URL for a `record.save()` call when the record has been deleted locally.
              */
-            urlForDeleteRecord(
+            urlForDeleteRecord<K extends keyof ModelRegistry>(
                 id: string,
-                modelName: string,
-                snapshot: Snapshot
+                modelName: K,
+                snapshot: Snapshot<K>
             ): string;
             /**
              * Determines the pathname for a given type.
              */
-            pathForType(modelName: string): string;
+            pathForType<K extends keyof ModelRegistry>(modelName: K): string;
         }
         /**
          * ## Using Embedded Records
@@ -1391,16 +1409,16 @@ declare module "ember-data" {
             /**
              * Serialize `belongsTo` relationship when it is configured as an embedded object.
              */
-            serializeBelongsTo(
-                snapshot: Snapshot,
+            serializeBelongsTo<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
             /**
              * Serializes `hasMany` relationships when it is configured as embedded objects.
              */
-            serializeHasMany(
-                snapshot: Snapshot,
+            serializeHasMany<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
@@ -1408,9 +1426,9 @@ declare module "ember-data" {
              * When serializing an embedded record, modify the property (in the json payload)
              * that refers to the parent record (foreign key for relationship).
              */
-            removeEmbeddedForeignKey(
-                snapshot: Snapshot,
-                embeddedSnapshot: Snapshot,
+            removeEmbeddedForeignKey<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
+                embeddedSnapshot: Snapshot<K>,
                 relationship: {},
                 json: {}
             ): any;
@@ -1428,7 +1446,7 @@ declare module "ember-data" {
             /**
              * Converts the model name to a pluralized version of the model name.
              */
-            payloadKeyFromModelName(modelName: string): string;
+            payloadKeyFromModelName<K extends keyof ModelRegistry>(modelName: K): string;
             /**
              * `keyForAttribute` can be used to define rules for how to convert an
              * attribute name in your model to a key in your JSON.
@@ -1458,7 +1476,7 @@ declare module "ember-data" {
              * `payloadTypeFromModelName` can be used to change the mapping for the type in
              * the payload, taken from the model name.
              */
-            payloadTypeFromModelName(modelname: string): string;
+            payloadTypeFromModelName<K extends keyof ModelRegistry>(modelName: K): string;
         }
         /**
          * Ember Data 2.0 Serializer:
@@ -1620,8 +1638,8 @@ declare module "ember-data" {
             /**
              * Check if the given hasMany relationship should be serialized
              */
-            shouldSerializeHasMany(
-                snapshot: Snapshot,
+            shouldSerializeHasMany<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 key: string,
                 relationshipType: string
             ): boolean;
@@ -1629,7 +1647,7 @@ declare module "ember-data" {
              * Called when a record is saved in order to convert the
              * record into JSON.
              */
-            serialize(snapshot: Snapshot, options: {}): {};
+            serialize<K extends keyof ModelRegistry>(snapshot: Snapshot<K>, options: {}): {};
             /**
              * You can use this method to customize how a serialized record is added to the complete
              * JSON hash to be sent to the server. By default the JSON Serializer does not namespace
@@ -1638,18 +1656,18 @@ declare module "ember-data" {
              * Otherwise you can override this method to customize how the record is added to the hash.
              * The hash property should be modified by reference.
              */
-            serializeIntoHash(
+            serializeIntoHash<K extends keyof ModelRegistry>(
                 hash: {},
-                typeClass: Model,
-                snapshot: Snapshot,
+                typeClass: ModelRegistry[K],
+                snapshot: Snapshot<K>,
                 options?: {}
             ): any;
             /**
              * `serializeAttribute` can be used to customize how `DS.attr`
              * properties are serialized
              */
-            serializeAttribute(
-                snapshot: Snapshot,
+            serializeAttribute<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 key: string,
                 attribute: {}
@@ -1658,8 +1676,8 @@ declare module "ember-data" {
              * `serializeBelongsTo` can be used to customize how `DS.belongsTo`
              * properties are serialized.
              */
-            serializeBelongsTo(
-                snapshot: Snapshot,
+            serializeBelongsTo<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
@@ -1667,8 +1685,8 @@ declare module "ember-data" {
              * `serializeHasMany` can be used to customize how `DS.hasMany`
              * properties are serialized.
              */
-            serializeHasMany(
-                snapshot: Snapshot,
+            serializeHasMany<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
@@ -1678,8 +1696,8 @@ declare module "ember-data" {
              * `{ polymorphic: true }` is pass as the second argument to the
              * `DS.belongsTo` function.
              */
-            serializePolymorphicType(
-                snapshot: Snapshot,
+            serializePolymorphicType<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
@@ -1726,7 +1744,7 @@ declare module "ember-data" {
              * serializeId can be used to customize how id is serialized
              * For example, your server may expect integer datatype of id
              */
-            serializeId(snapshot: Snapshot, json: {}, primaryKey: string): any;
+            serializeId<K extends keyof ModelRegistry>(snapshot: Snapshot<K>, json: {}, primaryKey: string): any;
         }
         /**
          * Normally, applications will use the `RESTSerializer` by implementing
@@ -1764,17 +1782,17 @@ declare module "ember-data" {
              * Called when a record is saved in order to convert the
              * record into JSON.
              */
-            serialize(snapshot: Snapshot, options: {}): {};
+            serialize<K extends keyof ModelRegistry>(snapshot: Snapshot<K>, options: {}): {};
             /**
              * You can use this method to customize the root keys serialized into the JSON.
              * The hash property should be modified by reference (possibly using something like _.extend)
              * By default the REST Serializer sends the modelName of a model, which is a camelized
              * version of the name.
              */
-            serializeIntoHash(
+            serializeIntoHash<K extends keyof ModelRegistry>(
                 hash: {},
                 typeClass: Model,
-                snapshot: Snapshot,
+                snapshot: Snapshot<K>,
                 options?: {}
             ): any;
             /**
@@ -1782,14 +1800,14 @@ declare module "ember-data" {
              * request. By default, the RESTSerializer returns a camelized version of the
              * model's name.
              */
-            payloadKeyFromModelName(modelName: string): string;
+            payloadKeyFromModelName<K extends keyof ModelRegistry>(modelName: K): string;
             /**
              * You can use this method to customize how polymorphic objects are serialized.
              * By default the REST Serializer creates the key by appending `Type` to
              * the attribute and value from the model's camelcased model name.
              */
-            serializePolymorphicType(
-                snapshot: Snapshot,
+            serializePolymorphicType<K extends keyof ModelRegistry>(
+                snapshot: Snapshot<K>,
                 json: {},
                 relationship: {}
             ): any;
@@ -1811,7 +1829,7 @@ declare module "ember-data" {
              * `payloadTypeFromModelName` can be used to change the mapping for the type in
              * the payload, taken from the model name.
              */
-            payloadTypeFromModelName(modelName: string): string;
+            payloadTypeFromModelName<K extends keyof ModelRegistry>(modelName: K): string;
         }
         /**
          * The `DS.BooleanTransform` class is used to serialize and deserialize
@@ -1883,27 +1901,27 @@ declare module "ember-data" {
              * method should return a promise that will resolve to a JavaScript object that will be
              * normalized by the serializer.
              */
-            findRecord(
+            findRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 id: string,
-                snapshot: Snapshot
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * The `findAll()` method is used to retrieve all records for a given type.
              */
-            findAll(
+            findAll<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 sinceToken: string,
-                snapshotRecordArray: SnapshotRecordArray
+                snapshotRecordArray: SnapshotRecordArray<K>
             ): RSVP.Promise<any>;
             /**
              * This method is called when you call `query` on the store.
              */
-            query(
+            query<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 query: {},
                 recordArray: AdapterPopulatedRecordArray<any>
             ): RSVP.Promise<any>;
@@ -1911,48 +1929,52 @@ declare module "ember-data" {
              * The `queryRecord()` method is invoked when the store is asked for a single
              * record through a query object.
              */
-            queryRecord(store: Store, type: Model, query: {}): RSVP.Promise<any>;
+            queryRecord<K extends keyof ModelRegistry>(
+                store: Store,
+                type: ModelRegistry[K],
+                query: {}
+            ): RSVP.Promise<any>;
             /**
              * If the globally unique IDs for your records should be generated on the client,
              * implement the `generateIdForRecord()` method. This method will be invoked
              * each time you create a new record, and the value returned from it will be
              * assigned to the record's `primaryKey`.
              */
-            generateIdForRecord(
+            generateIdForRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 inputProperties: {}
             ): string | number;
             /**
              * Proxies to the serializer's `serialize` method.
              */
-            serialize(snapshot: Snapshot, options: {}): {};
+            serialize<K extends keyof ModelRegistry>(snapshot: Snapshot<K>, options: {}): {};
             /**
              * Implement this method in a subclass to handle the creation of
              * new records.
              */
-            createRecord(
+            createRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Implement this method in a subclass to handle the updating of
              * a record.
              */
-            updateRecord(
+            updateRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * Implement this method in a subclass to handle the deletion of
              * a record.
              */
-            deleteRecord(
+            deleteRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
-                snapshot: Snapshot
+                type: ModelRegistry[K],
+                snapshot: Snapshot<K>
             ): RSVP.Promise<any>;
             /**
              * By default the store will try to coalesce all `fetchRecord` calls within the same runloop
@@ -1966,9 +1988,9 @@ declare module "ember-data" {
              * requests to find multiple records at once if coalesceFindRequests
              * is true.
              */
-            findMany(
+            findMany<K extends keyof ModelRegistry>(
                 store: Store,
-                type: Model,
+                type: ModelRegistry[K],
                 ids: any[],
                 snapshots: any[]
             ): RSVP.Promise<any>;
@@ -1982,33 +2004,33 @@ declare module "ember-data" {
              * reload a record from the adapter when a record is requested by
              * `store.findRecord`.
              */
-            shouldReloadRecord(store: Store, snapshot: Snapshot): boolean;
+            shouldReloadRecord<K extends keyof ModelRegistry>(store: Store, snapshot: Snapshot<K>): boolean;
             /**
              * This method is used by the store to determine if the store should
              * reload all records from the adapter when records are requested by
              * `store.findAll`.
              */
-            shouldReloadAll(
+            shouldReloadAll<K extends keyof ModelRegistry>(
                 store: Store,
-                snapshotRecordArray: SnapshotRecordArray
+                snapshotRecordArray: SnapshotRecordArray<K>
             ): boolean;
             /**
              * This method is used by the store to determine if the store should
              * reload a record after the `store.findRecord` method resolves a
              * cached record.
              */
-            shouldBackgroundReloadRecord(
+            shouldBackgroundReloadRecord<K extends keyof ModelRegistry>(
                 store: Store,
-                snapshot: Snapshot
+                snapshot: Snapshot<K>
             ): boolean;
             /**
              * This method is used by the store to determine if the store should
              * reload a record array after the `store.findAll` method resolves
              * with a cached record array.
              */
-            shouldBackgroundReloadAll(
+            shouldBackgroundReloadAll<K extends keyof ModelRegistry>(
                 store: Store,
-                snapshotRecordArray: SnapshotRecordArray
+                snapshotRecordArray: SnapshotRecordArray<K>
             ): boolean;
         }
         /**
@@ -2038,7 +2060,7 @@ declare module "ember-data" {
              * The `serialize` method is used when a record is saved in order to convert
              * the record into the form that your external data source expects.
              */
-            serialize(snapshot: Snapshot, options: {}): {};
+            serialize<K extends keyof ModelRegistry>(snapshot: Snapshot<K>, options: {}): {};
             /**
              * The `normalize` method is used to convert a payload received from your
              * external data source into the normalized form `store.push()` expects. You
@@ -2048,11 +2070,12 @@ declare module "ember-data" {
             normalize(typeClass: Model, hash: {}): {};
         }
     }
+
     export default DS;
 }
 
-declare module "ember" {
-    import DS from "ember-data";
+declare module 'ember' {
+    import DS from 'ember-data';
     namespace Ember {
         /*
 		* The store is automatically injected into these objects
@@ -2069,91 +2092,101 @@ declare module "ember" {
             store: DS.Store;
         }
     }
+
+    // It is also available to inject anywhere
+    module '@ember/service' {
+        interface Registry {
+            'store': DS.Store;
+        }
+    }
 }
 declare module 'ember-data/adapter' {
-	import DS from 'ember-data';
-	export default DS.Adapter;
+    import DS from 'ember-data';
+    export default DS.Adapter;
+    export { AdapterRegistry } from 'ember-data';
 }
 declare module 'ember-data/adapters/errors' {
-	import DS from 'ember-data';
-	const AdapterError: typeof DS.AdapterError;
-	const InvalidError: typeof DS.InvalidError;
-	const UnauthorizedError: typeof DS.UnauthorizedError;
-	const ForbiddenError: typeof DS.ForbiddenError;
-	const NotFoundError: typeof DS.NotFoundError;
-	const ConflictError: typeof DS.ConflictError;
-	const ServerError: typeof DS.ServerError;
-	const TimeoutError: typeof DS.TimeoutError;
-	const AbortError: typeof DS.AbortError;
-	const errorsHashToArray: typeof DS.errorsHashToArray;
-	const errorsArrayToHash: typeof DS.errorsArrayToHash;
+    import DS from 'ember-data';
+    const AdapterError: typeof DS.AdapterError;
+    const InvalidError: typeof DS.InvalidError;
+    const UnauthorizedError: typeof DS.UnauthorizedError;
+    const ForbiddenError: typeof DS.ForbiddenError;
+    const NotFoundError: typeof DS.NotFoundError;
+    const ConflictError: typeof DS.ConflictError;
+    const ServerError: typeof DS.ServerError;
+    const TimeoutError: typeof DS.TimeoutError;
+    const AbortError: typeof DS.AbortError;
+    const errorsHashToArray: typeof DS.errorsHashToArray;
+    const errorsArrayToHash: typeof DS.errorsArrayToHash;
 }
 declare module 'ember-data/adapters/json-api' {
-	import DS from 'ember-data';
-	export default DS.JSONAPIAdapter;
+    import DS from 'ember-data';
+    export default DS.JSONAPIAdapter;
 }
 declare module 'ember-data/adapters/rest' {
-	import DS from 'ember-data';
-	export default DS.RESTAdapter;
+    import DS from 'ember-data';
+    export default DS.RESTAdapter;
 }
 declare module 'ember-data/attr' {
-	import DS from 'ember-data';
-	export default DS.attr;
+    import DS from 'ember-data';
+    export default DS.attr;
 }
 declare module 'ember-data/model' {
-	import DS from 'ember-data';
-	export default DS.Model;
+    import DS from 'ember-data';
+    export default DS.Model;
+    export { ModelRegistry } from 'ember-data';
 }
 declare module 'ember-data/relationships' {
-	import DS from 'ember-data';
-	const hasMany: typeof DS.hasMany;
-	const belongsTo: typeof DS.belongsTo;
+    import DS from 'ember-data';
+    const hasMany: typeof DS.hasMany;
+    const belongsTo: typeof DS.belongsTo;
 }
 declare module 'ember-data/serializer' {
-	import DS from 'ember-data';
-	export default DS.Serializer;
+    import DS from 'ember-data';
+    export default DS.Serializer;
+    export { SerializerRegistry } from 'ember-data';
 }
 declare module 'ember-data/serializers/embedded-records-mixin' {
-	import DS from 'ember-data';
-	export default DS.EmbeddedRecordsMixin;
+    import DS from 'ember-data';
+    export default DS.EmbeddedRecordsMixin;
 }
 declare module 'ember-data/serializers/json-api' {
-	import DS from 'ember-data';
-	export default DS.JSONAPISerializer;
+    import DS from 'ember-data';
+    export default DS.JSONAPISerializer;
 }
 declare module 'ember-data/serializers/json' {
-	import DS from 'ember-data';
-	export default DS.JSONSerializer;
+    import DS from 'ember-data';
+    export default DS.JSONSerializer;
 }
 declare module 'ember-data/serializers/rest' {
-	import DS from 'ember-data';
-	export default DS.RESTSerializer;
+    import DS from 'ember-data';
+    export default DS.RESTSerializer;
 }
-declare module "ember-data/store" {
-    import DS from "ember-data";
+declare module 'ember-data/store' {
+    import DS from 'ember-data';
     export default DS.Store;
 }
-declare module "ember-data/transform" {
-    import DS from "ember-data";
+declare module 'ember-data/transform' {
+    import DS from 'ember-data';
     export default DS.Transform;
 }
-declare module "ember-data/transforms/boolean" {
-    import DS from "ember-data";
+declare module 'ember-data/transforms/boolean' {
+    import DS from 'ember-data';
     export default DS.BooleanTransform;
 }
-declare module "ember-data/transforms/date" {
-    import DS from "ember-data";
+declare module 'ember-data/transforms/date' {
+    import DS from 'ember-data';
     export default DS.DateTransform;
 }
-declare module "ember-data/transforms/number" {
-    import DS from "ember-data";
+declare module 'ember-data/transforms/number' {
+    import DS from 'ember-data';
     export default DS.NumberTransform;
 }
-declare module "ember-data/transforms/string" {
-    import DS from "ember-data";
+declare module 'ember-data/transforms/string' {
+    import DS from 'ember-data';
     export default DS.StringTransform;
 }
-declare module "ember-data/transforms/transform" {
-    import DS from "ember-data";
+declare module 'ember-data/transforms/transform' {
+    import DS from 'ember-data';
     export default DS.Transform;
 }
diff --git a/types/ember-data/test/adapter.ts b/types/ember-data/test/adapter.ts
index 17f69bcd9c..101ac3e42f 100644
--- a/types/ember-data/test/adapter.ts
+++ b/types/ember-data/test/adapter.ts
@@ -1,6 +1,11 @@
 import Ember from 'ember';
 import DS from 'ember-data';
 
+class Session extends Ember.Service {}
+declare module '@ember/service' {
+    interface Registry { 'session': Session; }
+}
+
 const JsonApi = DS.JSONAPIAdapter.extend({
     // Application specific overrides go here
 });
@@ -55,6 +60,13 @@ const UseAjaxOptionsWithOptionalThirdParams = DS.JSONAPIAdapter.extend({
     }
 });
 
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'rootModel': any;
+        'super-user': any;
+    }
+}
+
 // https://github.com/emberjs/data/blob/c9d8212c857ca78218ad98d11621819b38dba98f/tests/unit/adapters/build-url-mixin/build-url-test.js
 const BuildURLAdapter = DS.RESTAdapter.extend({
     worksWithOnlyModelNameAndId() {
diff --git a/types/ember-data/test/belongs-to.ts b/types/ember-data/test/belongs-to.ts
index 9e59aa6128..bd1037a65e 100644
--- a/types/ember-data/test/belongs-to.ts
+++ b/types/ember-data/test/belongs-to.ts
@@ -3,8 +3,14 @@ import { assertType } from './lib/assert';
 
 class Folder extends DS.Model {
     name = DS.attr('string');
-    children = DS.hasMany<Folder>('folder', { inverse: 'parent' });
-    parent = DS.belongsTo<Folder>('folder', { inverse: 'children' });
+    children = DS.hasMany('folder', { inverse: 'parent' });
+    parent = DS.belongsTo('folder', { inverse: 'children' });
+}
+
+declare module 'ember-data' {
+    interface ModelRegistry {
+        folder: Folder;
+    }
 }
 
 const folder = Folder.create();
diff --git a/types/ember-data/test/has-many.ts b/types/ember-data/test/has-many.ts
index 7fb586ff4a..e24fb1b814 100644
--- a/types/ember-data/test/has-many.ts
+++ b/types/ember-data/test/has-many.ts
@@ -1,43 +1,56 @@
 import DS from 'ember-data';
 import { assertType } from './lib/assert';
 
-class Comment extends DS.Model {
+class BlogComment extends DS.Model {
     text = DS.attr('string');
 }
 
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'blog-comment': BlogComment;
+    }
+}
+
 class BlogPost extends DS.Model {
     title = DS.attr('string');
-    commentsAsync = DS.hasMany<Comment>('comment');
-    commentsSync = DS.hasMany<Comment>('comment', { async: false });
+    commentsAsync = DS.hasMany('blog-comment');
+    commentsSync = DS.hasMany('blog-comment', { async: false });
 }
 
-const post = BlogPost.create();
+const blogPost = BlogPost.create();
 
-assertType<DS.PromiseArray<Comment>>(post.get('commentsSync').reload());
-assertType<Comment>(post.get('commentsSync').createRecord());
+assertType<DS.PromiseArray<BlogComment>>(blogPost.get('commentsSync').reload());
+assertType<BlogComment>(blogPost.get('commentsSync').createRecord());
 
-const comment = post.get('commentsSync').get('firstObject');
-assertType<Comment | undefined>(comment);
+const comment = blogPost.get('commentsSync').get('firstObject');
+assertType<BlogComment | undefined>(comment);
 if (comment) {
     assertType<string>(comment.get('text'));
 }
 
-assertType<DS.PromiseArray<Comment>>(post.get('commentsAsync').reload());
-assertType<Comment>(post.get('commentsAsync').createRecord());
-assertType<Comment | undefined>(post.get('commentsAsync').get('firstObject'));
+assertType<DS.PromiseArray<BlogComment>>(blogPost.get('commentsAsync').reload());
+assertType<BlogComment>(blogPost.get('commentsAsync').createRecord());
+assertType<BlogComment | undefined>(blogPost.get('commentsAsync').get('firstObject'));
 
-const commentAsync = post.get('commentsAsync').get('firstObject');
-assertType<Comment | undefined>(commentAsync);
+const commentAsync = blogPost.get('commentsAsync').get('firstObject');
+assertType<BlogComment | undefined>(commentAsync);
 if (commentAsync) {
     assertType<string>(commentAsync.get('text'));
 }
-assertType<boolean>(post.get('commentsAsync').get('isFulfilled'));
+assertType<boolean>(blogPost.get('commentsAsync').get('isFulfilled'));
 
-post.get('commentsAsync').then(comments => {
-    assertType<Comment | undefined>(comments.get('firstObject'));
+blogPost.get('commentsAsync').then(comments => {
+    assertType<BlogComment | undefined>(comments.get('firstObject'));
     assertType<string>(comments.get('firstObject')!.get('text'));
 });
 
+class PaymentMethod extends DS.Model {}
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'payment-method': PaymentMethod;
+    }
+}
+
 class Polymorphic extends DS.Model {
     paymentMethods = DS.hasMany('payment-method', { polymorphic: true });
 }
diff --git a/types/ember-data/test/injections.ts b/types/ember-data/test/injections.ts
index 4c0a6e4e6b..3e32a2b805 100644
--- a/types/ember-data/test/injections.ts
+++ b/types/ember-data/test/injections.ts
@@ -1,6 +1,14 @@
 import Ember from 'ember';
 import DS from 'ember-data';
 
+class MyModel extends DS.Model {}
+
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'my-model': MyModel;
+    }
+}
+
 Ember.Route.extend({
     model(): any {
         return this.store.findAll('my-model');
diff --git a/types/ember-data/test/record-reference.ts b/types/ember-data/test/record-reference.ts
index bb4fda42d4..f5bf973402 100644
--- a/types/ember-data/test/record-reference.ts
+++ b/types/ember-data/test/record-reference.ts
@@ -7,7 +7,13 @@ class User extends DS.Model {
     username = DS.attr('string');
 }
 
-let userRef = store.getReference<User>('user', 1);
+declare module 'ember-data' {
+    interface ModelRegistry {
+        user: User;
+    }
+}
+
+let userRef = store.getReference('user', 1);
 
 // get the record of the reference (null if not yet available)
 let user = userRef.value();
diff --git a/types/ember-data/test/relationships.ts b/types/ember-data/test/relationships.ts
index a878428bc4..fb89d4410c 100644
--- a/types/ember-data/test/relationships.ts
+++ b/types/ember-data/test/relationships.ts
@@ -16,14 +16,21 @@ class Comment extends DS.Model {
     author = DS.attr('string');
 }
 
-class BlogPost extends DS.Model {
+class RelationalPost extends DS.Model {
     title = DS.attr('string');
     tag = DS.attr('string');
-    comments = DS.hasMany<Comment>('comment', { async: true });
+    comments = DS.hasMany('comment', { async: true });
     relatedPosts = DS.hasMany('post');
 }
 
-let blogPost = store.peekRecord<BlogPost>('blog-post', 1);
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'relational-post': RelationalPost;
+        comment: Comment;
+    }
+}
+
+let blogPost = store.peekRecord('relational-post', 1);
 blogPost!.get('comments').then((comments) => {
     // now we can work with the comments
     let author: string = comments.get('firstObject')!.get('author');
diff --git a/types/ember-data/test/serializer.ts b/types/ember-data/test/serializer.ts
index 986020144f..baaa65ae9e 100644
--- a/types/ember-data/test/serializer.ts
+++ b/types/ember-data/test/serializer.ts
@@ -4,7 +4,8 @@ import DS from 'ember-data';
 const JsonApi = DS.JSONAPISerializer.extend({});
 
 const Customized = DS.JSONAPISerializer.extend({
-    serialize(snapshot: DS.Snapshot, options: {}) {
+    serialize(snapshot: DS.Snapshot<'user'>, options: {}) {
+        const lookup = snapshot.belongsTo('username');
         let json: any = this._super(...Array.from(arguments));
 
         json.data.attributes.cost = {
diff --git a/types/ember-data/test/store.ts b/types/ember-data/test/store.ts
index a651cd23db..892242be99 100644
--- a/types/ember-data/test/store.ts
+++ b/types/ember-data/test/store.ts
@@ -4,13 +4,20 @@ import { assertType } from "./lib/assert";
 
 declare const store: DS.Store;
 
-class Comment extends DS.Model {}
+class PostComment extends DS.Model {}
 class Post extends DS.Model {
   title = DS.attr('string');
-  comments = DS.hasMany<Comment>('comment');
+  comments = DS.hasMany('comment');
 }
 
-let post = store.createRecord<Post>('post', {
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'post': Post;
+        'post-comment': PostComment;
+    }
+}
+
+let post = store.createRecord('post', {
     title: 'Rails is Omakase',
     body: 'Lorem ipsum'
 });
@@ -20,7 +27,7 @@ post.save().then((saved) => {
     assertType<Post>(saved);
 });
 
-store.findRecord<Post>('post', 1).then(function(post) {
+store.findRecord('post', 1).then(function(post) {
     post.get('title'); // => "Rails is Omakase"
     post.set('title', 'A new post');
     post.save(); // => PATCH to '/posts/1'
@@ -30,21 +37,30 @@ class User extends DS.Model {
     username = DS.attr('string');
 }
 
-store.queryRecord<User>('user', {}).then(function(user) {
+class Author extends User {}
+
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'user': User;
+        'author': Author;
+    }
+}
+
+store.queryRecord('user', {}).then(function(user) {
     let username = user.get('username');
     console.log(`Currently logged in as ${username}`);
 });
 
-store.findAll('blog-post'); // => GET /blog-posts
+store.findAll('post'); // => GET /posts
 store.findAll('author', { reload: true }).then(function(authors) {
     authors.getEach('id'); // ['first', 'second']
 });
 store.findAll('post', {
-    adapterOptions: { subscribe: false }
+    adapterOptions: { subscribe: false },
 });
 store.findAll('post', { include: 'comments,comments.author' });
 
-store.peekAll('blog-post'); // => no network request
+store.peekAll('post'); // => no network request
 
 if (store.hasRecordForId('post', 1)) {
     let maybePost = store.peekRecord('post', 1);
@@ -57,13 +73,19 @@ class Message extends DS.Model {
   hasBeenSeen = DS.attr('boolean');
 }
 
-const messages = store.peekAll<Message>('message');
+declare module 'ember-data' {
+    interface ModelRegistry {
+        message: Message;
+    }
+}
+
+const messages = store.peekAll('message');
 messages.forEach(function(message) {
     message.set('hasBeenSeen', true);
 });
 messages.save();
 
-const people = store.peekAll('person');
+const people = store.peekAll('user');
 people.get('isUpdating'); // false
 people.update().then(function() {
     people.get('isUpdating'); // false
@@ -79,27 +101,27 @@ const MyRoute = Ember.Route.extend({
 const MyRouteAsync = Ember.Route.extend({
     async beforeModel(): Promise<Ember.Array<DS.Model>> {
         const store = Ember.get(this, 'store');
-        return await store.findAll('someStoreRecord');
+        return await store.findAll('post-comment');
     },
     async model(): Promise<DS.Model> {
         const store = this.get('store');
-        return await store.findRecord('someStoreRecord', 1);
+        return await store.findRecord('post-comment', 1);
     },
-    async afterModel(): Promise<Ember.Array<Comment>> {
-        const post = await this.get('store').findRecord<Post>('post', 1);
+    async afterModel(): Promise<Ember.Array<PostComment>> {
+        const post = await this.get('store').findRecord('post', 1);
         return await post.get('comments');
     }
 });
 
 class MyRouteAsyncES6 extends Ember.Route {
     async beforeModel(): Promise<Ember.Array<DS.Model>> {
-        return await this.store.findAll('someStoreRecord');
+        return await this.store.findAll('post-comment');
     }
     async model(): Promise<DS.Model> {
-        return await this.store.findRecord('someStoreRecord', 1);
+        return await this.store.findRecord('post-comment', 1);
     }
-    async afterModel(): Promise<Ember.Array<Comment>> {
-        const post = await this.store.findRecord<Post>('post', 1);
+    async afterModel(): Promise<Ember.Array<PostComment>> {
+        const post = await this.store.findRecord('post', 1);
         return await post.get('comments');
     }
 }
@@ -145,8 +167,22 @@ store.push({
     }]
 });
 
-class UserAdapter extends DS.Adapter { }
-class UserSerializer extends DS.Serializer { }
+class UserAdapter extends DS.Adapter {
+    thisAdapterOnlyMethod(): void {}
+}
+class UserSerializer extends DS.Serializer {
+    thisSerializerOnlyMethod(): void {}
+}
 
-assertType<UserAdapter>(store.adapterFor<UserAdapter>('user'));
-assertType<UserSerializer>(store.serializerFor<UserSerializer>('user'));
+declare module 'ember-data' {
+    interface AdapterRegistry {
+        user: UserAdapter;
+    }
+
+    interface SerializerRegistry {
+        user: UserSerializer;
+    }
+}
+
+assertType<UserAdapter>(store.adapterFor('user'));
+assertType<UserSerializer>(store.serializerFor('user'));
diff --git a/types/ember-data/tsconfig.json b/types/ember-data/tsconfig.json
index 15f77391aa..0845f9e795 100644
--- a/types/ember-data/tsconfig.json
+++ b/types/ember-data/tsconfig.json
@@ -10,10 +10,13 @@
         "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",
@@ -31,4 +34,4 @@
         "test/injections.ts",
         "test/error.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/ember-data/tslint.json b/types/ember-data/tslint.json
index bd25c193fd..70eef4d46e 100644
--- a/types/ember-data/tslint.json
+++ b/types/ember-data/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
+        "strict-export-declare-modifiers": false,
         // Heavy use of Function type in this older package.
         "ban-types": false,
         "jsdoc-format": false,

From 4332ab9682e82eba77ffe4f09b78278d5269e9a2 Mon Sep 17 00:00:00 2001
From: Rahul Kashyap <kashyaprahul94@gmail.com>
Date: Sun, 11 Feb 2018 11:24:51 +0530
Subject: [PATCH 032/388] Update index.d.ts

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

diff --git a/types/johnny-five/index.d.ts b/types/johnny-five/index.d.ts
index 689a78050a..f394d67c56 100644
--- a/types/johnny-five/index.d.ts
+++ b/types/johnny-five/index.d.ts
@@ -510,10 +510,10 @@ export declare module Led {
 
         on(): void;
         off(): void;
-        color(value: string): void;
+        color(value: string): void; // color method expects string.
         toggle(): void;
         strobe(ms: number): void;
-        intensity(value: number): void;
+        intensity(value: number): void;  // intensity is the correct method here instead of brightness.        
         fadeIn(ms: number): void;
         fadeOut(ms: number): void;
         pulse(ms: number): void;

From 9f67193677312cdd96848a1b7c4372dd6989f9b4 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sun, 11 Feb 2018 13:03:40 +0100
Subject: [PATCH 033/388] [filesize] Update to 3.6.0

---
 types/filesize/filesize-tests.ts | 31 +++++++++++--------
 types/filesize/index.d.ts        | 52 +++++++++++++++++++++-----------
 2 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/types/filesize/filesize-tests.ts b/types/filesize/filesize-tests.ts
index 135a0f9baa..0cb3b911ed 100644
--- a/types/filesize/filesize-tests.ts
+++ b/types/filesize/filesize-tests.ts
@@ -1,15 +1,20 @@
-
-
 import filesize = require("filesize");
 
-filesize(500);                        // "500 B" 
-filesize(500, { bits: true });          // "4 Kb" 
-filesize(265318, { base: 10 });         // "265.32 kB" 
-filesize(265318);                     // "259.1 KB" 
-filesize(265318, { round: 0 });         // "259 KB" 
-filesize(265318, { output: "array" });  // [259.1, "KB"] 
-filesize(265318, { output: "object" }); // {value: 259.1, suffix: "KB", symbol: "KB"} 
-filesize(1, { symbols: { B: "Б" } });    // "1 Б" 
-filesize(1024);                       // "1 KB" 
-filesize(1024, { exponent: 0 });        // "1024 B" 
-filesize(1024, { output: "exponent" }); // 1 
+filesize(500);                        // "500 B"
+filesize(500, {bits: true});          // "4 Kb"
+filesize(265318, {base: 10});         // "265.32 kB"
+filesize(265318);                     // "259.1 KB"
+filesize(265318, {round: 0});         // "259 KB"
+filesize(265318, {output: "array"});  // [259.1, "KB"]
+filesize(265318, {output: "object"}); // {value: 259.1, suffix: "KB", symbol: "KB"}
+filesize(1, {symbols: {B: "Б"}});     // "1 Б"
+filesize(1024);                       // "1 KB"
+filesize(1024, {exponent: 0});        // "1024 B"
+filesize(1024, {output: "exponent"}); // 1
+filesize(265318, {standard: "iec"});  // "259.1 KiB"
+filesize(265318, {standard: "iec", fullform: true}); // "259.1 kibibytes"
+filesize(12, {fullform: true, fullforms: ["байтов"]});  // "12 байтов"
+filesize(265318, {separator: ","});   // "259,1 KB"
+
+const size = filesize.partial({standard: "iec"});
+size(265318)
\ No newline at end of file
diff --git a/types/filesize/index.d.ts b/types/filesize/index.d.ts
index 374db62ec8..056eba92ec 100644
--- a/types/filesize/index.d.ts
+++ b/types/filesize/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for filesize 3.2.1
+// Type definitions for filesize 3.6.0
 // Project: https://github.com/avoidwork/filesize.js
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+//                 Renaud Chaput <https://github.com/renchap>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare var fileSize: Filesize.IFilesize;
@@ -36,47 +37,64 @@ declare namespace Filesize {
     type SiJedec = SiJedecBits & SiJedecBytes & { [name: string]: string };
 
     export interface Options {
+        /**
+        * Number base, default is 2
+        */
+        base?: number;
         /**
         * Enables bit sizes, default is false
         */
         bits?: boolean;
         /**
-        * Number base, default is 2
+        * Specifies the SI suffix via exponent, e.g. 2 is MB for bytes, default is -1
         */
-        base?: number;
+        exponent?: number;
+        /**
+        * Enables full form of unit of measure, default is false
+        */
+        fullform?: boolean;
+        /**
+        * Array of full form overrides, default is []
+        */
+        fullforms?: string[];
+        /**
+        * Output of function (array, exponent, object, or string), default is string
+        */
+        output?: "array" | "exponent" | "object" | "string";
         /**
         * Decimal place, default is 2
         */
         round?: number;
         /**
-        * Output of function (array, exponent, object, or string), default is string
+        * Decimal separator character, default is .
         */
-        output?: string;
+        separator?: string;
+        /**
+        * Character between the result and suffix, default is " "
+        */
+        spacer?: string;
+        /*
+        * Standard unit of measure, can be iec or jedec, default is jedec; can be overruled by base
+        */
+        standard?: "iec" | "jedec"
+        /**
+        * Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found
+        */
+        symbols?: SiJedec;
         /**
         * Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found
         * @deprecated: use 'symbols'
         */
         suffixes?: SiJedec;
         /**
-        * Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found
-        */
-        symbols?: SiJedec;
-        /**
-        * Specifies the SI suffix via exponent, e.g. 2 is MB for bytes, default is -1
-        */
-        exponent?: number;
-        /**
         *  Enables unix style human readable output, e.g ls -lh, default is false
         */
         unix?: boolean;
-        /**
-        * Character between the result and suffix, default is " "
-        */
-        spacer?: string;
     }
 
     export interface IFilesize {
         (bytes: number): string;
         (bytes: number, options: Options): string;
+        partial: (options: Options) => ((bytes: number) => string)
     }
 }

From 185f38ea6a215227f29879ca7270ca66ac8844ca Mon Sep 17 00:00:00 2001
From: Ben Stevens <ben@nebstone.co.uk>
Date: Sun, 11 Feb 2018 17:41:29 +0000
Subject: [PATCH 034/388] Add 3D Secure and Payment Request types to stripe-v3

---
 types/stripe-v3/index.d.ts         | 167 ++++++++++++++++++++++++++---
 types/stripe-v3/stripe-v3-tests.ts |  86 +++++++++++++++
 2 files changed, 236 insertions(+), 17 deletions(-)

diff --git a/types/stripe-v3/index.d.ts b/types/stripe-v3/index.d.ts
index 76666e747a..c2a6f8a550 100644
--- a/types/stripe-v3/index.d.ts
+++ b/types/stripe-v3/index.d.ts
@@ -12,18 +12,23 @@ declare var Stripe: stripe.StripeStatic;
 
 declare namespace stripe {
     interface StripeStatic {
-        (publicKey: string): Stripe;
+        (publicKey: string, options?: StripeOptions): Stripe;
         version: number;
     }
 
     interface Stripe {
         elements(options?: elements.ElementsCreateOptions): elements.Elements;
         createToken(element: elements.Element, options?: TokenOptions): Promise<TokenResponse>;
+        createToken(name: 'bank_account', options: BankAccountTokenOptions): Promise<TokenResponse>;
+        createToken(name: 'pii', options: PiiTokenOptions): Promise<TokenResponse>;
+        createSource(element: elements.Element, options?: {owner?: OwnerInfo}): Promise<SourceResponse>;
         createSource(options: SourceOptions): Promise<SourceResponse>;
+        retrieveSource(options: RetrieveSourceOptions): Promise<SourceResponse>;
+        paymentRequest(options: paymentRequest.StripePaymentRequestOptions): paymentRequest.StripePaymentRequest;
     }
 
     interface StripeOptions {
-      stripeAccount: string;
+      stripeAccount?: string;
     }
 
     interface TokenOptions {
@@ -37,6 +42,33 @@ declare namespace stripe {
         currency?: string;
     }
 
+    interface BankAccountTokenOptions {
+        country: string;
+        currency: string;
+        routing_number: string;
+        account_number: string;
+        account_holder_name: string;
+        account_holder_type: string;
+    }
+
+    interface PiiTokenOptions {
+        personal_id_number: string;
+    }
+
+    interface OwnerInfo {
+        address?: {
+            city?: string;
+            country?: string;
+            line1?: string;
+            line2?: string;
+            postal_code?: string;
+            state?: string;
+        };
+        name?: string;
+        email?: string;
+        phone?: string;
+    }
+
     interface SourceOptions {
         type: string;
         flow?: 'redirect' | 'receiver' | 'code_verification' | 'none';
@@ -45,19 +77,7 @@ declare namespace stripe {
         };
         currency?: string;
         amount?: number;
-        owner?: {
-            address?: {
-                city?: string;
-                country?: string;
-                line1?: string;
-                line2?: string;
-                postal_code?: string;
-                state?: string;
-            };
-            name?: string;
-            email?: string;
-            phone?: string;
-        };
+        owner?: OwnerInfo;
         metadata?: {};
         statement_descriptor?: string;
         redirect?: {
@@ -65,6 +85,9 @@ declare namespace stripe {
         };
         token?: string;
         usage?: 'reusable' | 'single_use';
+        three_d_secure?: {
+            card: string;
+        };
     }
 
     interface Token {
@@ -106,6 +129,15 @@ declare namespace stripe {
             last4: string;
             mandate_reference: string;
         };
+        card?: Card;
+        status?: string;
+        redirect?: {
+            status: string;
+            url: string;
+        };
+        three_d_secure?: {
+            authenticated: boolean;
+        };
     }
 
     interface SourceResponse {
@@ -165,6 +197,94 @@ declare namespace stripe {
         metadata: any;
         name?: string;
         tokenization_method?: tokenizationType;
+        three_d_secure?: 'required' | 'recommended' | 'optional' | 'not_supported';
+    }
+
+    interface RetrieveSourceOptions {
+        id: string;
+        client_secret: string;
+    }
+
+    // Container for all payment request related types
+    namespace paymentRequest {
+        interface StripePaymentRequestUpdateOptions {
+            currency: string;
+            total: {
+                amount: number;
+                label: string;
+                pending?: boolean;
+            };
+            displayItems?: Array<{
+                amount: number;
+                label: string;
+                pending?: boolean;
+            }>;
+            shippingOptions?: ShippingOption[];
+        }
+
+        interface StripePaymentRequestOptions extends StripePaymentRequestUpdateOptions {
+            country: string;
+            requestPayerName?: boolean;
+            requestPayerEmail?: boolean;
+            requestPayerPhone?: boolean;
+            requestShipping?: boolean;
+        }
+
+        interface UpdateDetails {
+            status: 'success' | 'fail' | 'invalid_shipping_address';
+            total?: {
+                amount: number;
+                label: string;
+                pending?: boolean;
+            };
+            displayItems?: Array<{
+                amount: number;
+                label: string;
+                pending?: boolean;
+            }>;
+            shippingOptions?: ShippingOption[];
+        }
+
+        interface ShippingOption {
+            id: string;
+            label: string;
+            detail?: string;
+            amount: number;
+        }
+
+        interface ShippingAddress {
+            country: string;
+            addressLine: string[];
+            region: string;
+            city: string;
+            postalCode: string;
+            recipient: string;
+            phone: string;
+            sortingCode?: string;
+            dependentLocality?: string;
+        }
+
+        interface StripePaymentResponse {
+            token?: Token;
+            source?: Source;
+            complete: (status: string) => void;
+            payerName?: string;
+            payerEmail?: string;
+            payerPhone?: string;
+            shippingAddress?: ShippingAddress;
+            shippingOption?: ShippingOption;
+            methodName: string;
+        }
+
+        interface StripePaymentRequest {
+            canMakePayment(): Promise<{applePay?: boolean} | null>;
+            show(): void;
+            update(options: StripePaymentRequestUpdateOptions): void;
+            on(event: 'token' | 'source', handler: (response: StripePaymentResponse) => void): void;
+            on(event: 'cancel', handler: () => void): void;
+            on(event: 'shippingaddresschange', handler: (response: {updateWith: (options: UpdateDetails) => void, shippingAddress: ShippingAddress}) => void): void;
+            on(event: 'shippingoptionchange', handler: (response: {updateWith: (options: UpdateDetails) => void, shippingOption: ShippingOption}) => void): void;
+        }
     }
 
     // Container for all elements related types
@@ -181,6 +301,7 @@ declare namespace stripe {
             // Cannot find name 'HTMLElement'
             mount(domElement: any): void;
             on(event: eventTypes, handler: handler): void;
+            on(event: 'click', handler: (response: {preventDefault: () => void}) => void): void;
             focus(): void;
             blur(): void;
             clear(): void;
@@ -202,9 +323,9 @@ declare namespace stripe {
             locale?: string;
         }
 
-        type elementsType = 'card' | 'cardNumber' | 'cardExpiry' | 'cardCvc' | 'postalCode';
+        type elementsType = 'card' | 'cardNumber' | 'cardExpiry' | 'cardCvc' | 'postalCode' | 'paymentRequestButton';
         interface Elements {
-            create(type: elementsType, options: ElementsOptions): Element;
+            create(type: elementsType, options?: ElementsOptions): Element;
         }
 
         interface ElementsOptions {
@@ -219,13 +340,16 @@ declare namespace stripe {
             hidePostalCode?: boolean;
             hideIcon?: boolean;
             iconStyle?: 'solid' | 'default';
+            placeholder?: string;
             style?: {
                 base?: Style;
                 complete?: Style;
                 empty?: Style;
                 invalid?: Style;
+                paymentRequestButton?: PaymentRequestButtonStyleOptions;
             };
             value?: string | { [objectKey: string]: string; };
+            paymentRequest?: paymentRequest.StripePaymentRequest;
         }
 
         interface Style extends StyleOptions {
@@ -234,11 +358,13 @@ declare namespace stripe {
             '::placeholder'?: StyleOptions;
             '::selection'?: StyleOptions;
             ':-webkit-autofill'?: StyleOptions;
+            '::-ms-clear'?: StyleOptions;
         }
 
         interface Font {
             family?: string;
             src?: string;
+            display?: string;
             style?: string;
             unicodeRange?: string;
             weight?: string;
@@ -255,9 +381,16 @@ declare namespace stripe {
             iconColor?: string;
             lineHeight?: string;
             letterSpacing?: string;
+            textAlign?: string;
             textDecoration?: string;
             textShadow?: string;
             textTransform?: string;
         }
+
+        interface PaymentRequestButtonStyleOptions {
+            type?: 'default' | 'donate' | 'buy';
+            theme: 'dark' | 'light' | 'light-outline';
+            height: string;
+        }
     }
 }
diff --git a/types/stripe-v3/stripe-v3-tests.ts b/types/stripe-v3/stripe-v3-tests.ts
index ccf86e5215..6e8740c5b2 100644
--- a/types/stripe-v3/stripe-v3-tests.ts
+++ b/types/stripe-v3/stripe-v3-tests.ts
@@ -42,7 +42,93 @@ describe("Stripe", () => {
             (error: stripe.Error) => {
                 console.error(error);
             });
+        // test 3D secure
+        const threeDSecureFrame = <HTMLIFrameElement> document.getElementById('3d-secure-frame');
+        const ownerInfo = {
+            name: 'Jimmy',
+            address: {
+                line1: '1 High Street',
+                postal_code: 'XYZ'
+            }
+        };
+        stripe.createSource(card, { owner: ownerInfo }).then(result => {
+            if (result.error) {
+                console.log(result.error.message);
+                return Promise.resolve(null);
+            }
+            if (!result.source) {
+                console.log('error');
+                return Promise.resolve(null);
+            }
+            if (!result.source.card || result.source.card.three_d_secure === 'not_supported') {
+                // make regular payment...
+                return Promise.resolve(null);
+            }
+            return stripe.createSource({
+                type: 'three_d_secure',
+                amount: 100,
+                currency: 'usd',
+                three_d_secure: {
+                    card: result.source.id
+                },
+                redirect: {
+                    return_url: location.origin + '/3d-secure-processing-page'
+                }
+            });
+        }).then(threeDSource => {
+            if (!threeDSource) {
+                return Promise.resolve(null);
+            }
+            if (threeDSource.error) {
+                if (threeDSource.error.code === 'payment_method_not_available') {
+                    // make regular payment...
+                    return Promise.resolve(null);
+                }
+                console.log('error');
+                return Promise.resolve(null);
+            }
+            if (!threeDSource.source || threeDSource.source.status === 'failed' || !threeDSource.source.redirect) {
+                // make regular payment...
+                return Promise.resolve(null);
+            }
+            if (threeDSource.source.redirect.status === 'succeeded') {
+                // make charge...
+                return Promise.resolve(null);
+            }
+            threeDSecureFrame.setAttribute('src', threeDSource.source.redirect.url);
+            // now wait until chargeable then make the charge
+            return Promise.resolve(null);
+        });
         card.destroy();
+        // test payment request
+        const paymentRequest = stripe.paymentRequest({
+            country: 'US',
+            currency: 'usd',
+            total: {
+                label: 'Demo total',
+                amount: 1000,
+            }
+        });
+        const prButton = elements.create('paymentRequestButton', { paymentRequest });
+        paymentRequest.canMakePayment().then(result => {
+            if (result) {
+                prButton.mount('#payment-request-button');
+            } else {
+                document.getElementById('payment-request-button')!.style.display = 'none';
+            }
+        });
+        paymentRequest.on('token', ev => {
+            const body = JSON.stringify({token: ev.token!.id});
+            // post to server...
+            Promise.resolve({ok: true})
+            .then(response => {
+                if (response.ok) {
+                    ev.complete('success');
+                } else {
+                    ev.complete('fail');
+                }
+            });
+        });
     });
 });
 

From 7f68bf98d706393dff02b0c80011f08518d54dd0 Mon Sep 17 00:00:00 2001
From: Ben Stevens <ben@nebstone.co.uk>
Date: Sun, 11 Feb 2018 20:55:56 +0000
Subject: [PATCH 035/388] fix react-stripe-elements compatibility with updated
 stripe-v3

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

diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index 72dea90475..6ef00684ca 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -45,8 +45,6 @@ export namespace ReactStripeElements {
 	interface ElementProps extends ElementsOptions {
 		className?: string;
 
-		paymentRequest?: object;
-
 		elementRef?(): void;
 
 		onChange?(event: ElementChangeResponse): void;

From 616d63a78efd09211d7401c560e5362f9f6a34fb Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Sun, 11 Feb 2018 16:24:17 -0800
Subject: [PATCH 036/388] 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 11f5627ecaff2d45908431c6c79fdfbfbd382131 Mon Sep 17 00:00:00 2001
From: mtgto <hogerappa@gmail.com>
Date: Mon, 12 Feb 2018 14:36:17 +0900
Subject: [PATCH 037/388] [copy-webpack-plugin] Upgrade to v4.4.1 from v4.0.1

---
 .../copy-webpack-plugin-tests.ts                  | 15 +++++++++++++++
 types/copy-webpack-plugin/index.d.ts              | 10 +++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/types/copy-webpack-plugin/copy-webpack-plugin-tests.ts b/types/copy-webpack-plugin/copy-webpack-plugin-tests.ts
index b58b242fc2..9a1331a502 100644
--- a/types/copy-webpack-plugin/copy-webpack-plugin-tests.ts
+++ b/types/copy-webpack-plugin/copy-webpack-plugin-tests.ts
@@ -51,6 +51,21 @@ const c: Configuration = {
 				to: 'directory/with/extension.ext',
 				toType: 'dir'
 			},
+
+			// transform and cache (cache is always used with transform option).
+			{
+				from: 'src/*.png',
+				to: 'dest/',
+				transform: (content, path) => content,
+				cache: true
+			},
+
+			// Copy glob results (without dot files) to {output}/to/directory/
+			{
+				from: '**/*.png',
+				fromArgs: { dot: false },
+				to: 'to/directory'
+			},
 		], {
 			ignore: [
 				// Doesn't copy any files with a txt extension
diff --git a/types/copy-webpack-plugin/index.d.ts b/types/copy-webpack-plugin/index.d.ts
index 8bfae1e0ed..35150a5e72 100644
--- a/types/copy-webpack-plugin/index.d.ts
+++ b/types/copy-webpack-plugin/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for copy-webpack-plugin v4.0.0
+// Type definitions for copy-webpack-plugin v4.4.1
 // Project: https://github.com/kevlened/copy-webpack-plugin
 // Definitions by: flying-sheep <https://github.com/flying-sheep>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,9 +10,15 @@ interface MiniMatchGlob extends IOptions {
 	glob: string
 }
 
+interface MiniMatchOptions extends IOptions {
+	cwd?: string
+}
+
 interface CopyPattern {
 	/** File source path or glob */
 	from: string | MiniMatchGlob
+	/** See the `node-glob` options in addition to the ones below. (default: `{ cwd: context }`) */
+	fromArgs?: MiniMatchOptions
 	/**
 	 * Path or webpack file-loader patterns. defaults:
 	 * output root if `from` is file or dir.
@@ -38,6 +44,8 @@ interface CopyPattern {
 	ignore?: Array<string | MiniMatchGlob>
 	/** Function that modifies file contents before writing to webpack. (default: `(content, path) => content`) */
 	transform?: (content: string, path: string) => string
+	/** Enable transform caching. You can use `{ cache: { key: 'my-cache-key' } }` to invalidate the cache. (default: `false`) */
+	cache?: boolean | { key: string }
 	/** Overwrites files already in `compilation.assets` (usually added by other plugins; default: `false`) */
 	force?: boolean
 }

From f0e9ea8b77f8843670601d058105c2b60603382a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kostrzyn=CC=81ski?= <michal@kostrzynski.pl>
Date: Mon, 12 Feb 2018 12:06:51 +0100
Subject: [PATCH 038/388] update(react-faux-dom): Update types to reflect new
 library version.

---
 types/react-faux-dom/index.d.ts               | 15 +++++++--------
 types/react-faux-dom/react-faux-dom-tests.tsx |  9 +++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/types/react-faux-dom/index.d.ts b/types/react-faux-dom/index.d.ts
index 59c771527d..9f79ce9ca1 100644
--- a/types/react-faux-dom/index.d.ts
+++ b/types/react-faux-dom/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for react-faux-dom 3.2
+// Type definitions for react-faux-dom 4.1
 // Project: https://github.com/Olical/react-faux-dom
 // Definitions by: Ali Taheri Moghaddar <https://github.com/alitaheri>
 //                 Cleve Littlefield <https://github.com/cleverguy25>
+//                 Michał Kostrzyński <https://github.com/deviousm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -19,11 +20,6 @@ export const defaultView: {
     getComputedStyle(node: Element): { getPropertyValue(name: string): string };
 };
 
-export namespace mixins {
-    const core: any;
-    const anim: any;
-}
-
 export function createElement(nodeName: string): Element;
 
 export function createElementNS(namespace: string, nodeName: string): Element;
@@ -31,8 +27,11 @@ export function createElementNS(namespace: string, nodeName: string): Element;
 export function compareDocumentPosition(): number;
 
 export interface ReactFauxDomProps {
-    connectFauxDOM?(node: string, name: string, discardNode?: any): Element;
-    animateFauxDOM?(duration: number): void;
+    connectFauxDOM(node: string, name: string, discardNode?: any): Element;
+    drawFauxDOM(): void;
+    animateFauxDOM(duration: number): void;
+    stopAnimatingFauxDOM(): void;
+    isAnimatingFauxDOM(): boolean;
 }
 
 export function withFauxDOM<P>(WrappedComponent: any): React.ClassicComponentClass<P & ReactFauxDomProps>;
diff --git a/types/react-faux-dom/react-faux-dom-tests.tsx b/types/react-faux-dom/react-faux-dom-tests.tsx
index 2d864744bc..8bdd06a1e8 100644
--- a/types/react-faux-dom/react-faux-dom-tests.tsx
+++ b/types/react-faux-dom/react-faux-dom-tests.tsx
@@ -34,9 +34,18 @@ class MyReactComponent extends React.Component<ChartProps> {
         .append('div')
         .html('Hello World!');
       this.props.animateFauxDOM(800);
+      console.log(this.props.isAnimatingFauxDOM());
     }
   }
 
+  componentDidUpdate() {
+    this.props.drawFauxDOM();
+  }
+
+  componentWillUnmount() {
+    this.props.stopAnimatingFauxDOM();
+  }
+
   render() {
     return <div>
       <h2>Here is some fancy data:</h2>

From 96f06c794b06f2cbf997c36f28d07996fa4c933d Mon Sep 17 00:00:00 2001
From: Pierre Marchand <pierremarc07@gmail.com>
Date: Mon, 12 Feb 2018 16:09:52 +0100
Subject: [PATCH 039/388] openlayers - added renderMode to layer.VectorOptions

https://openlayers.org/en/latest/apidoc/ol.layer.Vector.html
---
 types/openlayers/index.d.ts | 51 ++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index f9593fcb09..9dbecea094 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -7,6 +7,7 @@
 //                 Chad Johnston <https://github.com/iamthechad>
 //                 Dan Manastireanu <https://github.com/danmana>
 //                 Yair Tawil <https://github.com/yairtawil>
+//                 Pierre Marchand <https://github.com/pierremarc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Definitions partially generated using tsd-jsdoc (https://github.com/englercj/tsd-jsdoc)
 
@@ -2797,7 +2798,7 @@ declare module ol {
              * @returns {!ol.format.filter.EqualTo} `<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): ol.format.filter.EqualTo;
 
             /**
              * Creates a `<PropertyIsNotEqualTo>` comparison operator.
@@ -2808,7 +2809,7 @@ declare module ol {
              * @returns {!ol.format.filter.NotEqualTo} `<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): ol.format.filter.NotEqualTo;
 
             /**
              * Creates a `<PropertyIsLessThan>` comparison operator.
@@ -3028,7 +3029,7 @@ declare module ol {
              * 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 {}
+            class LogicalNary extends ol.format.filter.Filter { }
 
             /**
              * @classdesc
@@ -3062,16 +3063,16 @@ declare module ol {
              * @api
              */
             class Or extends ol.format.filter.LogicalNary {
-              /**
-               * @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[]);
+                /**
+                 * @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[]);
             }
 
             /**
@@ -3139,7 +3140,7 @@ declare module ol {
                  * @extends {ol.format.filter.Comparison}
                  * @api
                  */
-                constructor(tagName: string, propertyName: string, expression: string|number, opt_matchCase?: boolean);
+                constructor(tagName: string, propertyName: string, expression: string | number, opt_matchCase?: boolean);
             }
 
             /**
@@ -3165,7 +3166,7 @@ declare module ol {
                  * @extends {ol.format.filter.ComparisonBinary}
                  * @api
                  */
-                constructor(propertyName: string, expression: string|number, opt_matchCase?: boolean);
+                constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
             }
 
             /**
@@ -3287,7 +3288,7 @@ declare module ol {
                  * @extends {ol.format.filter.ComparisonBinary}
                  * @api
                  */
-                constructor(propertyName: string, expression: string|number, opt_matchCase?: boolean);
+                constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
             }
 
             /**
@@ -7414,7 +7415,7 @@ declare module ol {
         getFeaturesAtPixel(
             pixel: ol.Pixel,
             opt_options?: olx.AtPixelOptions
-        ): (Array<ol.Feature|ol.render.Feature>|null);
+        ): (Array<ol.Feature | ol.render.Feature> | null);
 
         /**
          * Detect layers that have a color value at a pixel on the viewport, and
@@ -13566,6 +13567,21 @@ 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
+         *    scaled during zoom animations.
+         *  * `'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),
@@ -13581,6 +13597,7 @@ declare module olx {
          *     zIndex: (number|undefined)}}
          */
         interface VectorOptions {
+            renderMode?: (olx.layer.VectorRenderType | string);
             renderOrder?: (feature1: ol.Feature, feature2: ol.Feature) => number;
             map?: ol.Map;
             extent?: ol.Extent;

From a5f3f63ac069ccca3438b869a521eb18930e1757 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Mon, 12 Feb 2018 09:24:31 -0800
Subject: [PATCH 040/388] 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 4dbac0b15ca7648009fb310d72187aa1a163d625 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Mon, 12 Feb 2018 09:41:26 -0800
Subject: [PATCH 041/388] 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 5dfadbe70482f41dfff839eeed45edcefb8c0356 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Mon, 12 Feb 2018 09:44:36 -0800
Subject: [PATCH 042/388] 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 c75ee379eb78e44d3c7a04d0ab4f10ed93625c1d Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Mon, 12 Feb 2018 13:14:32 -0500
Subject: [PATCH 043/388] Separate user definition to allow extending types

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

diff --git a/types/passport/index.d.ts b/types/passport/index.d.ts
index 0e612810d4..2b520df48f 100644
--- a/types/passport/index.d.ts
+++ b/types/passport/index.d.ts
@@ -11,7 +11,7 @@ declare global {
     namespace Express {
         interface Request {
             authInfo?: any;
-            user?: any;
+            user?: User;
 
             // These declarations are merged into express's Request type
             login(user: any, done: (err: any) => void): void;
@@ -25,6 +25,8 @@ declare global {
             isAuthenticated(): boolean;
             isUnauthenticated(): boolean;
         }
+        interface User {
+        }
     }
 }
 

From 9d3100b8ea35790c81bc19d1ad544631feab6f56 Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Mon, 12 Feb 2018 13:38:23 -0500
Subject: [PATCH 044/388] Update index.d.ts

---
 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 2b520df48f..8adc4584d4 100644
--- a/types/passport/index.d.ts
+++ b/types/passport/index.d.ts
@@ -25,6 +25,7 @@ declare global {
             isAuthenticated(): boolean;
             isUnauthenticated(): boolean;
         }
+        // tslint:disable-next-line:no-empty-interface
         interface User {
         }
     }

From 4359c578e731cec83a038865c2572bc50072c23f Mon Sep 17 00:00:00 2001
From: Ben Stevens <ben@nebstone.co.uk>
Date: Mon, 12 Feb 2018 21:25:23 +0000
Subject: [PATCH 045/388] make requested changes

---
 types/stripe-v3/index.d.ts         | 40 ++++++++++++++----------------
 types/stripe-v3/stripe-v3-tests.ts | 22 ++++++++--------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/types/stripe-v3/index.d.ts b/types/stripe-v3/index.d.ts
index c2a6f8a550..ea4fa9e05e 100644
--- a/types/stripe-v3/index.d.ts
+++ b/types/stripe-v3/index.d.ts
@@ -173,6 +173,9 @@ declare namespace stripe {
     type checkType = 'pass' | 'fail' | 'unavailable' | 'unchecked';
     type fundingType = 'credit' | 'debit' | 'prepaid' | 'unknown';
     type tokenizationType = 'apple_pay' | 'android_pay';
+    enum ThreeDSecureSupport {
+        Required = 'required', Recommended = 'recommended', Optional = 'optional', NotSupported = 'not_supported'
+    }
     interface Card {
         id: string;
         object: string;
@@ -197,7 +200,7 @@ declare namespace stripe {
         metadata: any;
         name?: string;
         tokenization_method?: tokenizationType;
-        three_d_secure?: 'required' | 'recommended' | 'optional' | 'not_supported';
+        three_d_secure?: ThreeDSecureSupport;
     }
 
     interface RetrieveSourceOptions {
@@ -207,18 +210,16 @@ declare namespace stripe {
 
     // Container for all payment request related types
     namespace paymentRequest {
+        interface DisplayItem {
+            amount: number;
+            label: string;
+            pending?: boolean;
+        }
+
         interface StripePaymentRequestUpdateOptions {
             currency: string;
-            total: {
-                amount: number;
-                label: string;
-                pending?: boolean;
-            };
-            displayItems?: Array<{
-                amount: number;
-                label: string;
-                pending?: boolean;
-            }>;
+            total: DisplayItem;
+            displayItems?: Array<DisplayItem>;
             shippingOptions?: ShippingOption[];
         }
 
@@ -230,18 +231,13 @@ declare namespace stripe {
             requestShipping?: boolean;
         }
 
+        enum UpdateDetailsStatus {
+            Success = 'success', Fail = 'fail', InvalidShippingAddress = 'invalid_shipping_address'
+        }
         interface UpdateDetails {
-            status: 'success' | 'fail' | 'invalid_shipping_address';
-            total?: {
-                amount: number;
-                label: string;
-                pending?: boolean;
-            };
-            displayItems?: Array<{
-                amount: number;
-                label: string;
-                pending?: boolean;
-            }>;
+            status: UpdateDetailsStatus;
+            total?: DisplayItem;
+            displayItems?: Array<DisplayItem>;
             shippingOptions?: ShippingOption[];
         }
 
diff --git a/types/stripe-v3/stripe-v3-tests.ts b/types/stripe-v3/stripe-v3-tests.ts
index 6e8740c5b2..c3d696fceb 100644
--- a/types/stripe-v3/stripe-v3-tests.ts
+++ b/types/stripe-v3/stripe-v3-tests.ts
@@ -5,8 +5,8 @@ declare function it(desc: string, fn: () => void): void;
 
 describe("Stripe", () => {
     it("should excercise all Stripe API", () => {
-        const stripe = Stripe('public-key');
-        const elements = stripe.elements();
+        const stripeInstance = Stripe('public-key');
+        const elements = stripeInstance.elements();
         const style = {
             base: {
                 color: '#32325d',
@@ -31,7 +31,7 @@ describe("Stripe", () => {
         card.on('change', (resp: stripe.elements.ElementChangeResponse) => {
             console.log(resp.brand);
         });
-        stripe.createToken(card, {
+        stripeInstance.createToken(card, {
             name: 'Jimmy',
             address_city: 'Toronto',
             address_country: 'Canada'
@@ -51,20 +51,20 @@ describe("Stripe", () => {
                 postal_code: 'XYZ'
             }
         };
-        stripe.createSource(card, { owner: ownerInfo }).then(result => {
+        stripeInstance.createSource(card, { owner: ownerInfo }).then(result => {
             if (result.error) {
-                console.log(result.error.message);
+                // handle error
                 return Promise.resolve(null);
             }
             if (!result.source) {
-                console.log('error');
+                // handle error
                 return Promise.resolve(null);
             }
-            if (!result.source.card || result.source.card.three_d_secure === 'not_supported') {
+            if (!result.source.card || result.source.card.three_d_secure === stripe.ThreeDSecureSupport.NotSupported) {
                 // make regular payment...
                 return Promise.resolve(null);
             }
-            return stripe.createSource({
+            return stripeInstance.createSource({
                 type: 'three_d_secure',
                 amount: 100,
                 currency: 'usd',
@@ -84,14 +84,14 @@ describe("Stripe", () => {
                     // make regular payment...
                     return Promise.resolve(null);
                 }
-                console.log('error');
+                // handle error
                 return Promise.resolve(null);
             }
             if (!threeDSource.source || threeDSource.source.status === 'failed' || !threeDSource.source.redirect) {
                 // make regular payment...
                 return Promise.resolve(null);
             }
-            if (threeDSource.source.redirect.status === 'succeeded') {
+            if (threeDSource.source.status === 'chargeable') {
                 // make charge...
                 return Promise.resolve(null);
             }
@@ -101,7 +101,7 @@ describe("Stripe", () => {
         });
         card.destroy();
         // test payment request
-        const paymentRequest = stripe.paymentRequest({
+        const paymentRequest = stripeInstance.paymentRequest({
             country: 'US',
             currency: 'usd',
             total: {

From 6be187477440f5b655bee0cbbdd676bbb1a3ce54 Mon Sep 17 00:00:00 2001
From: Ben Stevens <ben@nebstone.co.uk>
Date: Mon, 12 Feb 2018 21:39:34 +0000
Subject: [PATCH 046/388] revert enums and change Arra<t> to T[]

---
 types/stripe-v3/index.d.ts         | 14 ++++----------
 types/stripe-v3/stripe-v3-tests.ts | 14 +++++++-------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/types/stripe-v3/index.d.ts b/types/stripe-v3/index.d.ts
index ea4fa9e05e..55cc5962df 100644
--- a/types/stripe-v3/index.d.ts
+++ b/types/stripe-v3/index.d.ts
@@ -173,9 +173,6 @@ declare namespace stripe {
     type checkType = 'pass' | 'fail' | 'unavailable' | 'unchecked';
     type fundingType = 'credit' | 'debit' | 'prepaid' | 'unknown';
     type tokenizationType = 'apple_pay' | 'android_pay';
-    enum ThreeDSecureSupport {
-        Required = 'required', Recommended = 'recommended', Optional = 'optional', NotSupported = 'not_supported'
-    }
     interface Card {
         id: string;
         object: string;
@@ -200,7 +197,7 @@ declare namespace stripe {
         metadata: any;
         name?: string;
         tokenization_method?: tokenizationType;
-        three_d_secure?: ThreeDSecureSupport;
+        three_d_secure?: 'required' | 'recommended' | 'optional' | 'not_supported';
     }
 
     interface RetrieveSourceOptions {
@@ -219,7 +216,7 @@ declare namespace stripe {
         interface StripePaymentRequestUpdateOptions {
             currency: string;
             total: DisplayItem;
-            displayItems?: Array<DisplayItem>;
+            displayItems?: DisplayItem[];
             shippingOptions?: ShippingOption[];
         }
 
@@ -231,13 +228,10 @@ declare namespace stripe {
             requestShipping?: boolean;
         }
 
-        enum UpdateDetailsStatus {
-            Success = 'success', Fail = 'fail', InvalidShippingAddress = 'invalid_shipping_address'
-        }
         interface UpdateDetails {
-            status: UpdateDetailsStatus;
+            status: 'success' | 'fail' | 'invalid_shipping_address';
             total?: DisplayItem;
-            displayItems?: Array<DisplayItem>;
+            displayItems?: DisplayItem[];
             shippingOptions?: ShippingOption[];
         }
 
diff --git a/types/stripe-v3/stripe-v3-tests.ts b/types/stripe-v3/stripe-v3-tests.ts
index c3d696fceb..201bad8678 100644
--- a/types/stripe-v3/stripe-v3-tests.ts
+++ b/types/stripe-v3/stripe-v3-tests.ts
@@ -5,8 +5,8 @@ declare function it(desc: string, fn: () => void): void;
 
 describe("Stripe", () => {
     it("should excercise all Stripe API", () => {
-        const stripeInstance = Stripe('public-key');
-        const elements = stripeInstance.elements();
+        const stripe = Stripe('public-key');
+        const elements = stripe.elements();
         const style = {
             base: {
                 color: '#32325d',
@@ -31,7 +31,7 @@ describe("Stripe", () => {
         card.on('change', (resp: stripe.elements.ElementChangeResponse) => {
             console.log(resp.brand);
         });
-        stripeInstance.createToken(card, {
+        stripe.createToken(card, {
             name: 'Jimmy',
             address_city: 'Toronto',
             address_country: 'Canada'
@@ -51,7 +51,7 @@ describe("Stripe", () => {
                 postal_code: 'XYZ'
             }
         };
-        stripeInstance.createSource(card, { owner: ownerInfo }).then(result => {
+        stripe.createSource(card, { owner: ownerInfo }).then(result => {
             if (result.error) {
                 // handle error
                 return Promise.resolve(null);
@@ -60,11 +60,11 @@ describe("Stripe", () => {
                 // handle error
                 return Promise.resolve(null);
             }
-            if (!result.source.card || result.source.card.three_d_secure === stripe.ThreeDSecureSupport.NotSupported) {
+            if (!result.source.card || result.source.card.three_d_secure === 'not_supported') {
                 // make regular payment...
                 return Promise.resolve(null);
             }
-            return stripeInstance.createSource({
+            return stripe.createSource({
                 type: 'three_d_secure',
                 amount: 100,
                 currency: 'usd',
@@ -101,7 +101,7 @@ describe("Stripe", () => {
         });
         card.destroy();
         // test payment request
-        const paymentRequest = stripeInstance.paymentRequest({
+        const paymentRequest = stripe.paymentRequest({
             country: 'US',
             currency: 'usd',
             total: {

From 32035394c2762b09476261b666738154c562cfee Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Mon, 12 Feb 2018 20:03:38 -0700
Subject: [PATCH 047/388] Ember Data: fix `Snapshot.belongsTo`.

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

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index 3a44b2905e..c23c8cb59f 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -954,10 +954,10 @@ declare module 'ember-data' {
             /**
              * Returns the current value of a belongsTo relationship.
              */
-            belongsTo<L extends keyof ModelRegistry[K]>(
+            belongsTo<L extends keyof ModelRegistry & keyof ModelRegistry[K]>(
                 keyName: L,
                 options?: {}
-            ): Snapshot<K> | string | null | undefined;
+            ): Snapshot<L> | string | null | undefined;
             /**
              * Returns the current value of a hasMany relationship.
              */

From 4ae79aa5e8cbc90081a7f644e1305ca8b3ca3672 Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Mon, 12 Feb 2018 20:30:08 -0700
Subject: [PATCH 048/388] Ember Data: further fix `Snapshot.belongsTo`,
 `Snapshot.attr`.

# Conflicts:
#	types/ember-data/index.d.ts
---
 types/ember-data/index.d.ts    | 4 ++--
 types/ember-data/tsconfig.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index c23c8cb59f..a2ad80faff 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -942,7 +942,7 @@ declare module 'ember-data' {
             /**
              * Returns the value of an attribute.
              */
-            attr<L extends keyof ModelRegistry[K]>(keyName: L): {};
+            attr<L extends keyof ModelRegistry[K]>(keyName: L): ModelRegistry[K][L];
             /**
              * Returns all attributes and their corresponding values.
              */
@@ -957,7 +957,7 @@ declare module 'ember-data' {
             belongsTo<L extends keyof ModelRegistry & keyof ModelRegistry[K]>(
                 keyName: L,
                 options?: {}
-            ): Snapshot<L> | string | null | undefined;
+            ): Snapshot<K>['record'][L] | string | null | undefined;
             /**
              * Returns the current value of a hasMany relationship.
              */
diff --git a/types/ember-data/tsconfig.json b/types/ember-data/tsconfig.json
index 0845f9e795..399268d6b2 100644
--- a/types/ember-data/tsconfig.json
+++ b/types/ember-data/tsconfig.json
@@ -34,4 +34,4 @@
         "test/injections.ts",
         "test/error.ts"
     ]
-}
\ No newline at end of file
+}

From 144c2bc8c1e0e752e10044e3cf15778df50f91c9 Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Mon, 12 Feb 2018 20:39:05 -0700
Subject: [PATCH 049/388] Ember Data: more Snapshot improvements.

---
 types/ember-data/index.d.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index a2ad80faff..2fcf1c8ed2 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -946,22 +946,29 @@ declare module 'ember-data' {
             /**
              * Returns all attributes and their corresponding values.
              */
-            attributes(): {};
+            attributes(): { [L in keyof ModelRegistry[K]]: ModelRegistry[K][L] };
             /**
              * Returns all changed attributes and their old and new values.
              */
-            changedAttributes(): {};
+            changedAttributes(): Partial<{ [L in keyof ModelRegistry[K]]: ModelRegistry[K][L] }>;
             /**
              * Returns the current value of a belongsTo relationship.
              */
-            belongsTo<L extends keyof ModelRegistry & keyof ModelRegistry[K]>(
+            belongsTo<L extends keyof ModelRegistry[K]>(
                 keyName: L,
                 options?: {}
             ): Snapshot<K>['record'][L] | string | null | undefined;
             /**
              * Returns the current value of a hasMany relationship.
              */
-            hasMany<L extends keyof ModelRegistry[K]>(keyName: L, options?: {}): any[] | undefined;
+            hasMany<L extends keyof ModelRegistry[K]>(
+                keyName: L,
+                options?: { ids: false }
+            ): Array<Snapshot<K>['record'][L]> | undefined;
+            hasMany<L extends keyof ModelRegistry[K]>(
+                keyName: L,
+                options: { ids: true }
+            ): Array<string> | undefined;
             /**
              * Iterates through all the attributes of the model, calling the passed
              * function on each attribute.

From 4a213ee1742a13a2d0d0f58988198f0b6c4590b4 Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Mon, 12 Feb 2018 21:04:26 -0700
Subject: [PATCH 050/388] Ember Data: fix lint errors.

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

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index 2fcf1c8ed2..4f93abd63f 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -964,11 +964,11 @@ declare module 'ember-data' {
             hasMany<L extends keyof ModelRegistry[K]>(
                 keyName: L,
                 options?: { ids: false }
-            ): Array<Snapshot<K>['record'][L]> | undefined;
+            ): Snapshot<K>['record'][L][] | undefined;
             hasMany<L extends keyof ModelRegistry[K]>(
                 keyName: L,
                 options: { ids: true }
-            ): Array<string> | undefined;
+            ): string[] | undefined;
             /**
              * Iterates through all the attributes of the model, calling the passed
              * function on each attribute.

From 7e6d2ba3285850e4232844e2d55cc7b96f49c089 Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Mon, 12 Feb 2018 21:32:58 -0700
Subject: [PATCH 051/388] Ember Data: fix further lint errors.

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

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index 4f93abd63f..e3917b1a8b 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -964,7 +964,7 @@ declare module 'ember-data' {
             hasMany<L extends keyof ModelRegistry[K]>(
                 keyName: L,
                 options?: { ids: false }
-            ): Snapshot<K>['record'][L][] | undefined;
+            ): Array<Snapshot<K>['record'][L]> | undefined;
             hasMany<L extends keyof ModelRegistry[K]>(
                 keyName: L,
                 options: { ids: true }

From 22a5e13ab2fe81a4f1fe868281e6c97911789ba7 Mon Sep 17 00:00:00 2001
From: Pierre Marchand <pierremarc07@gmail.com>
Date: Tue, 13 Feb 2018 08:17:20 +0100
Subject: [PATCH 052/388] updated version to 4.6.0

---
 types/openlayers/index.d.ts          |  3 ++-
 types/openlayers/openlayers-tests.ts | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 9dbecea094..467d2badfd 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for OpenLayers v4.3.4
+// Type definitions for OpenLayers v4.6.0
 // Project: http://openlayers.org/
 // Definitions by: Olivier Sechet <https://github.com/osechet>
 //                 Bin Wang <https://github.com/wb14123>
@@ -13606,6 +13606,7 @@ declare module olx {
             opacity?: number;
             renderBuffer?: number;
             source: ol.source.Vector;
+            declutter?: boolean;
             style?: (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
             updateWhileAnimating?: boolean;
             updateWhileInteracting?: boolean;
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index 1981e50847..a3d3433c96 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -19,8 +19,8 @@ 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]);
+drawGeometryFunction([0, 0], new ol.geom.Point([0, 0]));
+drawGeometryFunction([0, 0]);
 
 // Type variables for OpenLayers
 let attribution: ol.Attribution;
@@ -418,8 +418,8 @@ view = new ol.View({
 
 voidValue = view.animate();
 voidValue = view.animate({});
-voidValue = view.animate({zoom: view.getZoom() + 1});
-voidValue = view.animate({zoom: 10}, {center: [0, 0]});
+voidValue = view.animate({ zoom: view.getZoom() + 1 });
+voidValue = view.animate({ zoom: 10 }, { center: [0, 0] });
 voidValue = view.animate({
     center: coordinate,
     zoom: numberValue,
@@ -446,8 +446,8 @@ 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, { callback: () => { } });
+voidValue = view.fit(extent, { callback: (animationCompleted: boolean) => { } });
 voidValue = view.fit(extent, {
     size: size,
     padding: [numberValue, numberValue, numberValue, numberValue],
@@ -457,7 +457,7 @@ voidValue = view.fit(extent, {
     maxZoom: numberValue,
     duration: numberValue,
     easing: easingFunction,
-    callback: (animationCompleted: boolean) => {}
+    callback: (animationCompleted: boolean) => { }
 });
 booleanValue = view.getAnimating();
 coordinate = view.getCenter();
@@ -537,6 +537,7 @@ let tileLayer: ol.layer.Tile = new ol.layer.Tile({
 // ol.layer.Vector
 //
 let vectorLayer: ol.layer.Vector = new ol.layer.Vector({
+    renderMode: 'image',
     source: new ol.source.Vector(),
     zIndex: -1
 });

From 14a405a1ae908aec5340d45b3e97bef5593a9c14 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Tue, 13 Feb 2018 09:17:34 +0200
Subject: [PATCH 053/388] Fixes after running code

---
 types/activex-wia/activex-wia-tests.ts | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/types/activex-wia/activex-wia-tests.ts b/types/activex-wia/activex-wia-tests.ts
index a5babea924..1375dceb27 100644
--- a/types/activex-wia/activex-wia-tests.ts
+++ b/types/activex-wia/activex-wia-tests.ts
@@ -1,3 +1,10 @@
+// tslint:disable-next-line:no-bad-reference
+/// <reference path="node_modules/es5-shim/es5-shim.js" />
+// tslint:disable-next-line:no-bad-reference
+/// <reference path="node_modules/activex-helpers/activex-js-helpers.js"" />
+
+// Note -- running these tests under cscript requires polyfills for some array methods, like forEach
+
 const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
     const results: T[] = [];
     const enumerator = new Enumerator<T>(col);
@@ -155,7 +162,16 @@ const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
     {
         const v: WIA.Vector<number> = new ActiveXObject('WIA.Vector');
         v.SetFromString('This is a test', true, false);
-        collectionToArray(v).forEach(chr => WScript.Echo(String.fromCharCode(chr)));
+
+        // when iterated using Enumerator / collectionToArray, each item comes back as an Automation Byte
+        // https://stackoverflow.com/questions/48757982/wia-vector-returns-something-which-is-not-a-number
+        // so the following falls, because fromCharCode is expecting a number
+        // collectionToArray(v).forEach(item => WScript.Echo(String.fromCharCode(item)));
+
+        // Instead, use the Vector's Item method, or the Vector's default property:
+        for (let i = 1; i <= v.Count; i++) {
+            WScript.Echo(String.fromCharCode(v(i)));
+        }
     }
 
     // Display detailed image information
@@ -367,13 +383,14 @@ Frame count = ${img.FrameCount}}
 
     // Create an imagefile object that contains a blank page
     {
-        const c = 0xFF0000FF;
+        // This fails with the error: `The Vector's Type is not compatible with this operation`
+        /*const c = 0xFF0000FF;
         const v: WIA.Vector<number> = new ActiveXObject('WIA.Vector');
         for (let i = 0; i < 4; i++) {
             v.Add(c);
         }
         const img = v.ImageFile(2, 2);
-        img.SaveFile('C:\\test.' + img.FileExtension);
+        img.SaveFile('C:\\test.' + img.FileExtension);*/
     }
 
     interface WshArgumentsBase<TKey = number | string> {

From d198c2ff9a5b976a4992701612ac49f539509128 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Tue, 13 Feb 2018 11:23:51 +0200
Subject: [PATCH 054/388] Fixes after test run

---
 types/activex-wia/activex-wia-tests.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/types/activex-wia/activex-wia-tests.ts b/types/activex-wia/activex-wia-tests.ts
index 1375dceb27..c33385af14 100644
--- a/types/activex-wia/activex-wia-tests.ts
+++ b/types/activex-wia/activex-wia-tests.ts
@@ -1,9 +1,4 @@
-// tslint:disable-next-line:no-bad-reference
-/// <reference path="node_modules/es5-shim/es5-shim.js" />
-// tslint:disable-next-line:no-bad-reference
-/// <reference path="node_modules/activex-helpers/activex-js-helpers.js"" />
-
-// Note -- running these tests under cscript requires polyfills for some array methods, like forEach
+// Note -- running these tests under cscript requires some ES5 polyfills
 
 const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
     const results: T[] = [];

From b7d2e66ca0db2c6540c30b108081b848759c1549 Mon Sep 17 00:00:00 2001
From: Edgar Simson <edgar.simson@orangelv.com>
Date: Tue, 13 Feb 2018 13:33:07 +0200
Subject: [PATCH 055/388] opentype.js: update to 0.7.3, add more tests

---
 types/opentype.js/index.d.ts           | 426 +++++++++++++++++--------
 types/opentype.js/opentype.js-tests.ts |  86 ++++-
 2 files changed, 363 insertions(+), 149 deletions(-)

diff --git a/types/opentype.js/index.d.ts b/types/opentype.js/index.d.ts
index 24df752461..8dff7e3135 100644
--- a/types/opentype.js/index.d.ts
+++ b/types/opentype.js/index.d.ts
@@ -1,65 +1,153 @@
-// Type definitions for opentype.js
+// Type definitions for opentype.js 0.7.3
 // Project: https://github.com/nodebox/opentype.js
 // Definitions by: Dan Marshall <https://github.com/danmarshall>
+//                 Edgar Simson <https://github.com/edzis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 export as namespace opentype;
 
-interface Contour extends Array<Point> {
-}
-
-export class Encoding {
-    charset: string;
-    charToGlyphIndex(c: string): number;
-    font: Font;
-}
-
-interface Field {
-    name: string;
-    type: string;
-    value: any;
-}
+/******************************************
+ * FONT
+ ******************************************/
 
 export class Font {
-    private nametoGlyphIndex;
-    private supported;
-    constructor(options: FontOptions);
+    names: FontNames;
+    unitsPerEm: number;
     ascender: number;
-    cffEncoding: Encoding;
+    descender: number;
+    createdTimestamp: number;
+    tables: { [tableName: string]: Table };
+    supported: boolean;
+    glyphs: GlyphSet;
+    encoding: Encoding;
+    substitution: Substitution;
+
+    readonly defaultRenderOptions: RenderOptions;
+
+    constructor(options: FontConstructorOptions);
+
     charToGlyph(c: string): Glyph;
     charToGlyphIndex(s: string): number;
-    descender: number;
-    download(): void;
-    draw(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
-    drawMetrics(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
-    drawPoints(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
-    encoding: Encoding;
-    forEachGlyph(text: string, x: number, y: number, fontSize: number, options: RenderOptions, callback: { (glyph: Glyph, x: number, y: number, fontSize: number, options?: RenderOptions): void; }): void;
+    download(fileName?: string): void;
+    draw(
+        ctx: CanvasRenderingContext2D,
+        text: string,
+        x?: number,
+        y?: number,
+        fontSize?: number,
+        options?: RenderOptions
+    ): void;
+    drawMetrics(
+        ctx: CanvasRenderingContext2D,
+        text: string,
+        x?: number,
+        y?: number,
+        fontSize?: number,
+        options?: RenderOptions
+    ): void;
+    drawPoints(
+        ctx: CanvasRenderingContext2D,
+        text: string,
+        x?: number,
+        y?: number,
+        fontSize?: number,
+        options?: RenderOptions
+    ): void;
+    forEachGlyph(
+        text: string,
+        x: number | undefined,
+        y: number | undefined,
+        fontSize: number | undefined,
+        options: RenderOptions | undefined,
+        callback: {
+            (
+                glyph: Glyph,
+                x: number,
+                y: number,
+                fontSize: number,
+                options?: RenderOptions
+            ): void;
+        }
+    ): number;
+    getAdvanceWidth(
+        text: string,
+        fontSize?: number,
+        options?: RenderOptions
+    ): number;
     getEnglishName(name: string): string;
-    getGposKerningValue: { (leftGlyph: Glyph | number, rightGlyph: Glyph | number): number; };
-    getKerningValue(leftGlyph: Glyph | number, rightGlyph: Glyph | number): number;
-    getPath(text: string, x: number, y: number, fontSize: number, options?: RenderOptions): Path;
-    getPaths(text: string, x: number, y: number, fontSize: number, options?: RenderOptions): Path[];
-    glyphs: GlyphSet;
+    getKerningValue(
+        leftGlyph: Glyph | number,
+        rightGlyph: Glyph | number
+    ): number;
+    getPath(
+        text: string,
+        x: number,
+        y: number,
+        fontSize: number,
+        options?: RenderOptions
+    ): Path;
+    getPaths(
+        text: string,
+        x: number,
+        y: number,
+        fontSize: number,
+        options?: RenderOptions
+    ): Path[];
     glyphIndexToName(gid: number): string;
     glyphNames: GlyphNames;
     hasChar(c: string): boolean;
     kerningPairs: KerningPairs;
-    names: FontNames;
     nameToGlyph(name: string): Glyph;
     nameToGlyphIndex(name: string): number;
     numberOfHMetrics: number;
     numGlyphs: number;
     outlinesFormat: string;
     stringToGlyphs(s: string): Glyph[];
-    tables: { [tableName: string]: Table; };
     toArrayBuffer(): ArrayBuffer;
     toBuffer(): ArrayBuffer;
     toTables(): Table;
-    unitsPerEm: number;
     validate(): void;
 }
 
+export type FontConstructorOptions = FontConstructorOptionsBase &
+    Partial<FontOptions> & {
+        glyphs: Glyph[];
+    };
+
+interface FontOptions {
+    empty?: boolean;
+    familyName: string;
+    styleName: string;
+    fullName?: string;
+    postScriptName?: string;
+    designer?: string;
+    designerURL?: string;
+    manufacturer?: string;
+    manufacturerURL?: string;
+    license?: string;
+    licenseURL?: string;
+    version?: string;
+    description?: string;
+    copyright?: string;
+    trademark?: string;
+    unitsPerEm: number;
+    ascender: number;
+    descender: number;
+    createdTimestamp: number;
+    weightClass?: string;
+    widthClass?: string;
+    fsSelection?: string;
+}
+
+interface FontConstructorOptionsBase {
+    familyName: string;
+    styleName: string;
+    unitsPerEm: number;
+    ascender: number;
+    descender: number;
+}
+
 interface FontNames {
     copyright: LocalizedName;
     description: LocalizedName;
@@ -77,28 +165,33 @@ interface FontNames {
     version: LocalizedName;
 }
 
-interface FontOptions {
-    copyright?: string;
-    ascender?: number;
-    descender?: number;
-    description?: string;
-    designer?: string;
-    designerURL?: string;
-    empty?: boolean;
-    familyName?: string;
-    fullName?: string;
-    glyphs?: Glyph[] | GlyphSet;
-    license?: string;
-    licenseURL?: string;
-    manufacturer?: string;
-    manufacturerURL?: string;
-    postScriptName?: string;
-    styleName?: string;
-    unitsPerEm?: number;
-    trademark?: string;
-    version?: string;
+interface Table {
+    [propName: string]: any;
+    encode(): number[];
+    fields: Field[];
+    sizeOf(): number;
+    tables: Table[];
+    tableName: string;
 }
 
+interface KerningPairs {
+    [pair: string]: number;
+}
+
+interface LocalizedName {
+    [lang: string]: string;
+}
+
+interface Field {
+    name: string;
+    type: string;
+    value: any;
+}
+
+/******************************************
+ * GLYPH
+ ******************************************/
+
 export class Glyph {
     private index;
     private xMin;
@@ -106,22 +199,49 @@ export class Glyph {
     private yMin;
     private yMax;
     private points;
-    constructor(options: GlyphOptions);
-    addUnicode(unicode: number): void;
-    advanceWidth: number;
-    bindConstructorValues(options: GlyphOptions): void;
-    draw(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
-    drawMetrics(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
-    drawPoints(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
-    getContours(): Contour[];
-    getMetrics(): Metrics;
-    getPath(x: number, y: number, fontSize: number): Path;
+
     name: string;
-    path: Path | { (): Path; };
+    path: Path | { (): Path };
     unicode: number;
     unicodes: number[];
-}
+    advanceWidth: number;
 
+    constructor(options: GlyphOptions);
+
+    addUnicode(unicode: number): void;
+    bindConstructorValues(options: GlyphOptions): void;
+    draw(
+        ctx: CanvasRenderingContext2D,
+        x?: number,
+        y?: number,
+        fontSize?: number,
+        options?: RenderOptions
+    ): void;
+    drawMetrics(
+        ctx: CanvasRenderingContext2D,
+        x?: number,
+        y?: number,
+        fontSize?: number,
+        options?: RenderOptions
+    ): void;
+    drawPoints(
+        ctx: CanvasRenderingContext2D,
+        x?: number,
+        y?: number,
+        fontSize?: number,
+        options?: RenderOptions
+    ): void;
+    getBoundingBox(): BoundingBox;
+    getContours(): Contour;
+    getMetrics(): Metrics;
+    getPath(
+        x?: number,
+        y?: number,
+        fontSize?: number,
+        options?: RenderOptions,
+        font?: Font
+    ): Path;
+}
 interface GlyphOptions {
     advanceWidth?: number;
     index?: number;
@@ -146,68 +266,10 @@ export class GlyphNames {
 export class GlyphSet {
     private font;
     private glyphs;
-    constructor(font: Font, glyphs: Glyph[] | { (): Glyph; }[]);
+    constructor(font: Font, glyphs: Glyph[] | { (): Glyph }[]);
     get(index: number): Glyph;
     length: number;
-    push(index: number, loader: { (): Glyph; }): void;
-}
-
-interface KerningPairs {
-    [pair: string]: number;
-}
-
-export function load(url: string, callback: { (error: any, font?: Font): void; }): void;
-
-export function loadSync(url: string): Font;
-
-interface LocalizedName {
-    [lang: string]: string;
-}
-
-interface Metrics {
-    leftSideBearing: number;
-    rightSideBearing?: number;
-    xMax: number;
-    xMin: number;
-    yMax: number;
-    yMin: number;
-}
-
-export function parse(buffer: any): Font;
-
-export class Path {
-    private fill;
-    private stroke;
-    private strokeWidth;
-    constructor();
-    bezierCurveTo(x1: number, y1: number, x2: number, y2: number, x: number, y: number): void;
-    close: () => void;
-    closePath(): void;
-    commands: PathCommand[];
-    curveTo: (x1: number, y1: number, x2: number, y2: number, x: number, y: number) => void;
-    draw(ctx: CanvasRenderingContext2D): void;
-    extend(pathOrCommands: Path | PathCommand[]): void;
-    lineTo(x: number, y: number): void;
-    moveTo(x: number, y: number): void;
-    quadraticCurveTo(x1: number, y1: number, x: number, y: number): void;
-    quadTo: (x1: number, y1: number, x: number, y: number) => void;
-    toPathData(decimalPlaces: number): string;
-    toSVG(decimalPlaces: number): string;
-    unitsPerEm: number;
-}
-
-interface PathCommand {
-    type: string;
-    x?: number;
-    y?: number;
-    x1?: number;
-    y1?: number;
-    x2?: number;
-    y2?: number;
-}
-
-interface Point {
-    lastPointOfContour?: boolean;
+    push(index: number, loader: { (): Glyph }): void;
 }
 
 interface Post {
@@ -227,14 +289,110 @@ interface Post {
 }
 
 interface RenderOptions {
-    kerning: boolean;
+    script?: string;
+    language?: string;
+    kerning?: boolean;
+    xScale?: number;
+    yScale?: number;
+    features?: {
+        [key: string]: boolean;
+    };
 }
 
-interface Table {
-    [propName: string]: any;
-    encode(): number[];
-    fields: Field[];
-    sizeOf(): number;
-    tables: Table[];
-    tableName: string;
+export interface Metrics {
+    leftSideBearing: number;
+    rightSideBearing?: number;
+    xMax: number;
+    xMin: number;
+    yMax: number;
+    yMin: number;
 }
+
+export interface Contour extends Array<Point> {}
+
+interface Point {
+    lastPointOfContour?: boolean;
+}
+
+/******************************************
+ * PATH
+ ******************************************/
+
+export class Path {
+    private fill;
+    private stroke;
+    private strokeWidth;
+    constructor();
+    bezierCurveTo(
+        x1: number,
+        y1: number,
+        x2: number,
+        y2: number,
+        x: number,
+        y: number
+    ): void;
+    close: () => void;
+    closePath(): void;
+    commands: PathCommand[];
+    curveTo: (
+        x1: number,
+        y1: number,
+        x2: number,
+        y2: number,
+        x: number,
+        y: number
+    ) => void;
+    draw(ctx: CanvasRenderingContext2D): void;
+    extend(pathOrCommands: Path | PathCommand[] | BoundingBox): void;
+    getBoundingBox(): BoundingBox;
+    lineTo(x: number, y: number): void;
+    moveTo(x: number, y: number): void;
+    quadraticCurveTo(x1: number, y1: number, x: number, y: number): void;
+    quadTo: (x1: number, y1: number, x: number, y: number) => void;
+    toDOMElement(decimalPlaces: number): SVGPathElement;
+    toPathData(decimalPlaces: number): string;
+    toSVG(decimalPlaces: number): string;
+    unitsPerEm: number;
+}
+
+interface PathCommand {
+    type: string;
+    x?: number;
+    y?: number;
+    x1?: number;
+    y1?: number;
+    x2?: number;
+    y2?: number;
+}
+
+/******************************************
+ * UTIL CLASSES
+ ******************************************/
+
+export class BoundingBox {
+    // TODO add methods
+}
+
+export class Encoding {
+    charset: string;
+    charToGlyphIndex(c: string): number;
+    font: Font;
+}
+
+export class Substitution {
+    constructor(font: Font);
+    // TODO add methods
+}
+
+/******************************************
+ * STATIC
+ ******************************************/
+
+export function load(
+    url: string,
+    callback: { (error: any, font?: Font): void }
+): void;
+
+export function loadSync(url: string): Font;
+
+export function parse(buffer: any): Font;
diff --git a/types/opentype.js/opentype.js-tests.ts b/types/opentype.js/opentype.js-tests.ts
index e4b9942bd9..6e1639a1b0 100644
--- a/types/opentype.js/opentype.js-tests.ts
+++ b/types/opentype.js/opentype.js-tests.ts
@@ -5,7 +5,7 @@ var ctx: CanvasRenderingContext2D;
 
 opentype.load('fonts/Roboto-Black.ttf', function(err, font) {
     if (err) {
-         alert('Font could not be loaded: ' + err);
+        alert('Font could not be loaded: ' + err);
     } else {
         var path = font.getPath('Hello, World!', 0, 150, 72);
         // If you just want to draw the text you can also use font.draw(ctx, text, x, y, fontSize).
@@ -25,8 +25,6 @@ var notdefGlyph = new opentype.Glyph({
 });
 
 var aPath = new opentype.Path();
-aPath.moveTo(100, 0);
-aPath.lineTo(100, 700);
 // more drawing instructions...
 var aGlyph = new opentype.Glyph({
     name: 'A',
@@ -42,22 +40,80 @@ var font = new opentype.Font({
     unitsPerEm: 1000,
     ascender: 800,
     descender: -200,
-    glyphs: glyphs});
+
+    glyphs: glyphs
+});
 font.download();
 
-font.getPath('text', x, y, fontSize);
-font.draw(ctx, 'text', x, y, fontSize);
-font.drawPoints(ctx, 'text', x, y, fontSize);
-font.drawMetrics(ctx, 'text', x, y, fontSize);
-font.stringToGlyphs('string');
-font.charToGlyph('c');
-font.getKerningValue(notdefGlyph, aGlyph);
+var hasChar: boolean = font.hasChar('a');
+var charIndex: number = font.charToGlyphIndex('a');
+var charGlyph: opentype.Glyph = font.charToGlyph('a');
+var charGlyphs: opentype.Glyph[] = font.stringToGlyphs('abc');
+var nameIndex: number = font.nameToGlyphIndex('a');
+var nameGlyph: opentype.Glyph = font.nameToGlyph('a');
+var indexName: string = font.glyphIndexToName(1);
+var kerning: number = font.getKerningValue(notdefGlyph, aGlyph);
+font.defaultRenderOptions.kerning = false;
+var forEachWidth: number = font.forEachGlyph(
+    'text',
+    x,
+    y,
+    fontSize,
+    {
+        kerning: true
+    },
+    (glyph: opentype.Glyph, x: number, y: number, fontSize: number) => {
+        console.log({
+            glyph,
+            x,
+            y,
+            fontSize
+        });
+    }
+);
+var fontPath: opentype.Path = font.getPath('text', x, y, fontSize, {});
+var fontPaths: opentype.Path[] = font.getPaths('text', x, y, fontSize, {});
+var fontWidth: number = font.getAdvanceWidth('text', fontSize, { yScale: 0.5 });
+font.draw(ctx, 'text');
+font.drawPoints(ctx, 'text', x, y, fontSize, { yScale: 0.5 });
+font.drawMetrics(ctx, 'text', x, y, fontSize, { xScale: 1.1, yScale: 0.5 });
+var engName: string = font.getEnglishName('a');
+font.validate();
+var tables: opentype.Table = font.toTables();
+var ab: ArrayBuffer = font.toArrayBuffer();
+font.download();
+font.download('fileName.ttf');
 
-aGlyph.getPath(x, y, fontSize);
-aGlyph.draw(ctx, x, y, fontSize);
+aGlyph.bindConstructorValues({ advanceWidth: 1 });
+aGlyph.addUnicode(42);
+var glyphBBox: opentype.BoundingBox = aGlyph.getBoundingBox();
+var glyphPathBasic: opentype.Path = aGlyph.getPath();
+var glyphPathFull: opentype.Path = aGlyph.getPath(
+    x,
+    y,
+    fontSize,
+    { xScale: 1, yScale: 2 },
+    font
+);
+var glyphContours: opentype.Contour = aGlyph.getContours();
+var glyphMetrics: opentype.Metrics = aGlyph.getMetrics();
+aGlyph.draw(ctx, x, y, fontSize, {});
 aGlyph.drawPoints(ctx, x, y, fontSize);
 aGlyph.drawMetrics(ctx, x, y, fontSize);
 
+aPath.moveTo(100, 0);
+aPath.lineTo(100, 700);
+aPath.curveTo(100, 700, 200, 800, 150, 750);
+aPath.bezierCurveTo(100, 700, 200, 800, 150, 750);
+aPath.quadTo(100, 700, 200, 800);
+aPath.quadraticCurveTo(100, 700, 200, 800);
+aPath.close();
+aPath.closePath();
+aPath.extend(aPath);
+aPath.extend(aPath.commands);
+aPath.extend(aPath.getBoundingBox());
+var pathBBox: opentype.BoundingBox = aPath.getBoundingBox();
 aPath.draw(ctx);
-aPath.toPathData(7);
-aPath.toSVG(7);
+var pathData: string = aPath.toPathData(7);
+var pathSvg: string = aPath.toSVG(7);
+var pathDom: SVGPathElement = aPath.toDOMElement(7);

From 8ede6478dd989e27a0de8008e74f6b0001fc9900 Mon Sep 17 00:00:00 2001
From: Manuel Guilbault <manuel.guilbault@gmail.com>
Date: Tue, 13 Feb 2018 13:37:12 +0100
Subject: [PATCH 056/388] bootstrap-datepicker: add enableOnReadonly option

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

diff --git a/types/bootstrap-datepicker/index.d.ts b/types/bootstrap-datepicker/index.d.ts
index a1beefa467..dfe358854e 100644
--- a/types/bootstrap-datepicker/index.d.ts
+++ b/types/bootstrap-datepicker/index.d.ts
@@ -58,6 +58,7 @@ interface DatepickerOptions {
     daysOfWeekHighlighted?:string|number[];
     defaultViewDate?:Date|string|DatepickerViewDate;
     updateViewDate?:boolean;
+    enableOnReadonly?: boolean;
 }
 
 interface DatepickerViewDate {

From 4d5c4c7a970b2ccfdc337c805d78711a74e72b9f Mon Sep 17 00:00:00 2001
From: Ethan <ethan.resnick@gmail.com>
Date: Tue, 13 Feb 2018 18:03:14 -0500
Subject: [PATCH 057/388] mongoose: fix Model.baseModelName

---
 types/mongoose/index.d.ts           | 10 ++++++++--
 types/mongoose/mongoose-tests.ts    |  2 +-
 types/mongoose/v4/index.d.ts        |  2 +-
 types/mongoose/v4/mongoose-tests.ts |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index cb8ca38408..5994c15d2f 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1,6 +1,12 @@
 // Type definitions for Mongoose 5.0.1
 // Project: http://mongoosejs.com/
-// Definitions by: simonxca <https://github.com/simonxca>, horiuchi <https://github.com/horiuchi>, sindrenm <https://github.com/sindrenm>, lukasz-zak <https://github.com/lukasz-zak>, Alorel <https://github.com/Alorel>, jendrikw <https://github.com/jendrikw>
+// Definitions by: simonxca <https://github.com/simonxca>
+//                 horiuchi <https://github.com/horiuchi>
+//                 sindrenm <https://github.com/sindrenm>
+//                 lukasz-zak <https://github.com/lukasz-zak>
+//                 Alorel <https://github.com/Alorel>
+//                 jendrikw <https://github.com/jendrikw>
+//                 Ethan Resnick <https://github.com/ethanresnick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -2712,7 +2718,7 @@ declare module "mongoose" {
      * If this is a discriminator model, baseModelName is the
      * name of the base model.
      */
-    baseModelName: String;
+    baseModelName: string | undefined;
 
     /** Collection the model uses. */
     collection: Collection;
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index 80050dad33..bf2f61f4a3 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -1479,7 +1479,7 @@ MongoModel.update({ name: 'Tobi' }, { ferret: true }, { multi: true }, cb);
 MongoModel.where('age').gte(21).lte(65).exec(cb);
 MongoModel.where('age').gte(21).lte(65).where('name', /^b/i);
 new (mongoModel.base.model(''))();
-mongoModel.baseModelName.toLowerCase();
+mongoModel.baseModelName && mongoModel.baseModelName.toLowerCase();
 mongoModel.collection.$format(99);
 mongoModel.collection.initializeOrderedBulkOp;
 mongoModel.collection.findOne;
diff --git a/types/mongoose/v4/index.d.ts b/types/mongoose/v4/index.d.ts
index 5f416b513a..4a4b7d224e 100644
--- a/types/mongoose/v4/index.d.ts
+++ b/types/mongoose/v4/index.d.ts
@@ -2730,7 +2730,7 @@ declare module "mongoose" {
      * If this is a discriminator model, baseModelName is the
      * name of the base model.
      */
-    baseModelName: String;
+    baseModelName: string | undefined;
 
     /** Collection the model uses. */
     collection: Collection;
diff --git a/types/mongoose/v4/mongoose-tests.ts b/types/mongoose/v4/mongoose-tests.ts
index 92adb61d83..64214fe983 100644
--- a/types/mongoose/v4/mongoose-tests.ts
+++ b/types/mongoose/v4/mongoose-tests.ts
@@ -1471,7 +1471,7 @@ MongoModel.update({ name: 'Tobi' }, { ferret: true }, { multi: true }, cb);
 MongoModel.where('age').gte(21).lte(65).exec(cb);
 MongoModel.where('age').gte(21).lte(65).where('name', /^b/i);
 new (mongoModel.base.model(''))();
-mongoModel.baseModelName.toLowerCase();
+mongoModel.baseModelName && mongoModel.baseModelName.toLowerCase();
 mongoModel.collection.$format(99);
 mongoModel.collection.initializeOrderedBulkOp;
 mongoModel.collection.findOne;

From 80aba5492ea5d7f663f1f018b1fb7481ac28eafd Mon Sep 17 00:00:00 2001
From: believer <rickard.laurin@gmail.com>
Date: Wed, 14 Feb 2018 04:54:45 +0100
Subject: [PATCH 058/388] Fix linting errors

---
 types/bytes/index.d.ts  | 37 ++++---------------
 types/bytes/tslint.json | 78 +----------------------------------------
 2 files changed, 8 insertions(+), 107 deletions(-)

diff --git a/types/bytes/index.d.ts b/types/bytes/index.d.ts
index 565ee3f175..68a45413c9 100644
--- a/types/bytes/index.d.ts
+++ b/types/bytes/index.d.ts
@@ -1,31 +1,24 @@
-// Type definitions for bytes v3.0.0
+// Type definitions for bytes 3.0
 // Project: https://github.com/visionmedia/bytes.js
 // Definitions by: Zhiyuan Wang <https://github.com/danny8002>
 //                 Rickard Laurin <https://github.com/believer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface BytesOptions {
-    decimalPlaces?: number,
-    thousandsSeparator?: string,
-    unitSeparator?: string,
-    fixedDecimals?: boolean,
-    unit?: string
+    decimalPlaces?: number;
+    thousandsSeparator?: string;
+    unitSeparator?: string;
+    fixedDecimals?: boolean;
+    unit?: string;
 }
 
 /**
  * Convert the given value in bytes into a string.
- *
- * @param {number} value
- * @param {BytesFormatOptions} [options]
- * @returns {string}
  */
 declare function bytes(value: number, options?: BytesOptions): string;
 
 /**
  * Parse string to an integer in bytes.
- *
- * @param {string} value
- * @returns {number}
  */
 declare function bytes(value: string): number;
 
@@ -35,31 +28,15 @@ declare namespace bytes {
      *
      * If the value is negative, it is kept as such.
      * If it is a float, it is rounded.
-     *
-     * @param {number} value
-     * @param {BytesFormatOptions} [options]
-     * @returns {string}
      */
-
     function format(value: number, options?: BytesOptions): string;
 
-    /**
-     * Just return the input number value.
-     *
-     * @param {number} value
-     * @returns {number}
-     */
-    function parse(value: number): number;
-
     /**
      * Parse the string value into an integer in bytes.
      *
      * If no unit is given, it is assumed the value is in bytes.
-     *
-     * @param {string} value
-     * @returns {number}
      */
-    function parse(value: string): number;
+    function parse(value: string | number): number;
 }
 
 export = bytes;
diff --git a/types/bytes/tslint.json b/types/bytes/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/bytes/tslint.json
+++ b/types/bytes/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 aad50d511435b1fb84fd7b52e5f881095adfdad0 Mon Sep 17 00:00:00 2001
From: Eric Roos <dev3@cargoguide.com>
Date: Wed, 14 Feb 2018 09:13:28 +0100
Subject: [PATCH 059/388] added isEmpty()

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

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 3cd759b2d0..a51172daec 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mapbox GL JS v0.43.0
+// Type definitions for Mapbox GL JS v0.44.1
 // Project: https://github.com/mapbox/mapbox-gl-js
 // Definitions by: Dominik Bruderer <https://github.com/dobrud>, Patrick Reames <https://github.com/patrickr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -689,6 +689,9 @@ declare namespace mapboxgl {
         /** Return a LngLatBounds as a string */
         toString(): string;
 
+        /** Returns a boolean */
+        isEmpty(): boolean
+
         /** Convert an array to a LngLatBounds object, or return an existing LngLatBounds object unchanged. */
         static convert(input: LngLatBoundsLike): mapboxgl.LngLatBounds;
     }
diff --git a/types/mapbox-gl/mapbox-gl-tests.ts b/types/mapbox-gl/mapbox-gl-tests.ts
index 10768549ca..9029d59c8a 100644
--- a/types/mapbox-gl/mapbox-gl-tests.ts
+++ b/types/mapbox-gl/mapbox-gl-tests.ts
@@ -370,3 +370,6 @@ let marker = new mapboxgl.Marker(undefined, {offset: [10, 0]})
 	.addTo(map);
 
 marker.remove();
+let bool:boolean
+let bounds = new mapboxgl.LngLatBounds()
+bool = bounds.isEmpty()
\ No newline at end of file

From 05d66b21297c1c20df7c290da141dca47a0e68af Mon Sep 17 00:00:00 2001
From: Eric Roos <dev3@cargoguide.com>
Date: Wed, 14 Feb 2018 09:15:15 +0100
Subject: [PATCH 060/388] something about newline at end of file

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

diff --git a/types/mapbox-gl/mapbox-gl-tests.ts b/types/mapbox-gl/mapbox-gl-tests.ts
index 9029d59c8a..422cb3913d 100644
--- a/types/mapbox-gl/mapbox-gl-tests.ts
+++ b/types/mapbox-gl/mapbox-gl-tests.ts
@@ -372,4 +372,4 @@ let marker = new mapboxgl.Marker(undefined, {offset: [10, 0]})
 marker.remove();
 let bool:boolean
 let bounds = new mapboxgl.LngLatBounds()
-bool = bounds.isEmpty()
\ No newline at end of file
+bool = bounds.isEmpty()

From 0029f3b0923c6dd844f7e52ae8090a9c477a81dc Mon Sep 17 00:00:00 2001
From: Netanel Draiman <Nexxado@users.noreply.github.com>
Date: Wed, 14 Feb 2018 10:25:24 +0200
Subject: [PATCH 061/388] Updated angular-translate with missing function

Updated angular-translate ITranslateService type with a missing `getAvailableLanguageKeys()` function.
---
 types/angular-translate/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/angular-translate/index.d.ts b/types/angular-translate/index.d.ts
index 55c74629a8..69b1f63d72 100644
--- a/types/angular-translate/index.d.ts
+++ b/types/angular-translate/index.d.ts
@@ -71,6 +71,7 @@ declare module 'angular' {
             isReady(): boolean;
             onReady(): angular.IPromise<void>;
             resolveClientLocale(): string;
+            getAvailableLanguageKeys(): string[];
         }
 
         interface ITranslateProvider extends angular.IServiceProvider {

From ecfbd369d771e6a4e1664012b099c01edd5ef1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=BCmay=20=C3=87eber?= <tumayceber@gmail.com>
Date: Wed, 14 Feb 2018 16:19:04 +0300
Subject: [PATCH 062/388] usage: Model.aggregate().match(), error: Expected 1-2
 arguments, but got 0.

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

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index cb8ca38408..da4714d59f 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -2435,6 +2435,7 @@ declare module "mongoose" {
      * If a callback is not passed, the aggregate itself is returned.
      * @param aggregations pipeline operator(s) or operator array
      */
+    aggregate(): Aggregate<any[]>;
     aggregate(aggregations: any[]): Aggregate<any[]>;
     aggregate(aggregations: any[], cb: Function): Promise<any[]>;
 

From 47aea3938e8682e2a4e8ca81f1649b58f9b0e847 Mon Sep 17 00:00:00 2001
From: Pierre Marchand <pierremarc07@gmail.com>
Date: Wed, 14 Feb 2018 16:02:23 +0100
Subject: [PATCH 063/388] updated to v4.6.0

Updated according to what could be found in changelogs from 4.4.0 to 4.6.0
---
 types/openlayers/index.d.ts          | 24 +++++++++++++++++++++++-
 types/openlayers/openlayers-tests.ts |  3 ++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 467d2badfd..8ed1a2ffbd 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -14412,11 +14412,24 @@ declare module olx {
             width?: number;
         }
 
+        /**
+         * Text placement. One of `'point'`, `'line'`. Default is `'point'`. Note that
+         * `'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),
@@ -14424,12 +14437,18 @@ declare module olx {
          *     textAlign: (string|undefined),
          *     textBaseline: (string|undefined),
          *     fill: (ol.style.Fill|undefined),
-         *     stroke: (ol.style.Stroke|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;
             offsetX?: number;
             offsetY?: number;
+            overflow?: boolean;
+            placement?: olx.style.TextPlacement,
             scale?: number;
             rotateWithView?: boolean;
             rotation?: number;
@@ -14438,6 +14457,9 @@ declare module olx {
             textBaseline?: string;
             fill?: ol.style.Fill;
             stroke?: ol.style.Stroke;
+            backgroundFill?: ol.style.Fill;
+            backgroundStroke?: ol.style.Stroke;
+            padding?: number[];
         }
 
 
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index a3d3433c96..d2d708c168 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -536,8 +536,9 @@ let tileLayer: ol.layer.Tile = new ol.layer.Tile({
 //
 // ol.layer.Vector
 //
+let vectorLayerRenderMode: olx.layer.VectorRenderType = 'image';
 let vectorLayer: ol.layer.Vector = new ol.layer.Vector({
-    renderMode: 'image',
+    renderMode: vectorLayerRenderMode,
     source: new ol.source.Vector(),
     zIndex: -1
 });

From ac3f611624e74cec386b8b6a21748390e2c7263a Mon Sep 17 00:00:00 2001
From: Mateusz Lewandowski <mateusz_lewandowski@epam.com>
Date: Thu, 15 Feb 2018 11:10:57 +0100
Subject: [PATCH 064/388] Update react-syntax-highlighter styles to version
 7.0.0

---
 types/react-syntax-highlighter/index.d.ts     | 467 ++++++++++++------
 .../react-syntax-highlighter-tests.tsx        |  17 +-
 2 files changed, 320 insertions(+), 164 deletions(-)

diff --git a/types/react-syntax-highlighter/index.d.ts b/types/react-syntax-highlighter/index.d.ts
index 9650d2ba20..b751e75bf1 100644
--- a/types/react-syntax-highlighter/index.d.ts
+++ b/types/react-syntax-highlighter/index.d.ts
@@ -5,11 +5,11 @@
 // TypeScript Version: 2.6
 
 declare module 'react-syntax-highlighter' {
-    import SyntaxHighlighter from 'react-syntax-highlighter/dist/light';
+    import SyntaxHighlighter from 'react-syntax-highlighter/light';
     export default SyntaxHighlighter;
 }
 
-declare module 'react-syntax-highlighter/dist/light' {
+declare module 'react-syntax-highlighter/light' {
     import * as React from 'react';
 
     export function registerLanguage(name: string, func: any): void;
@@ -31,473 +31,626 @@ declare module 'react-syntax-highlighter/dist/light' {
     }
 }
 
-declare module 'react-syntax-highlighter/dist/styles' {
-    export { default as agate } from 'react-syntax-highlighter/dist/styles/agate';
-    export { default as androidstudio } from 'react-syntax-highlighter/dist/styles/androidstudio';
-    export { default as arduinoLight } from 'react-syntax-highlighter/dist/styles/arduino-light';
-    export { default as arta } from 'react-syntax-highlighter/dist/styles/arta';
-    export { default as ascetic } from 'react-syntax-highlighter/dist/styles/ascetic';
-    export { default as atelierCaveDark } from 'react-syntax-highlighter/dist/styles/atelier-cave-dark';
-    export { default as atelierCaveLight } from 'react-syntax-highlighter/dist/styles/atelier-cave-light';
-    export { default as atelierDuneDark } from 'react-syntax-highlighter/dist/styles/atelier-dune-dark';
-    export { default as atelierDuneLight } from 'react-syntax-highlighter/dist/styles/atelier-dune-light';
-    export { default as atelierEstuaryDark } from 'react-syntax-highlighter/dist/styles/atelier-estuary-dark';
-    export { default as atelierEstuaryLight } from 'react-syntax-highlighter/dist/styles/atelier-estuary-light';
-    export { default as atelierForestDark } from 'react-syntax-highlighter/dist/styles/atelier-forest-dark';
-    export { default as atelierForestLight } from 'react-syntax-highlighter/dist/styles/atelier-forest-light';
-    export { default as atelierHeathDark } from 'react-syntax-highlighter/dist/styles/atelier-heath-dark';
-    export { default as atelierHeathLight } from 'react-syntax-highlighter/dist/styles/atelier-heath-light';
-    export { default as atelierLakesideDark } from 'react-syntax-highlighter/dist/styles/atelier-lakeside-dark';
-    export { default as atelierLakesideLight } from 'react-syntax-highlighter/dist/styles/atelier-lakeside-light';
-    export { default as atelierPlateauDark } from 'react-syntax-highlighter/dist/styles/atelier-plateau-dark';
-    export { default as atelierPlateauLight } from 'react-syntax-highlighter/dist/styles/atelier-plateau-light';
-    export { default as atelierSavannaDark } from 'react-syntax-highlighter/dist/styles/atelier-savanna-dark';
-    export { default as atelierSavannaLight } from 'react-syntax-highlighter/dist/styles/atelier-savanna-light';
-    export { default as atelierSeasideDark } from 'react-syntax-highlighter/dist/styles/atelier-seaside-dark';
-    export { default as atelierSeasideLight } from 'react-syntax-highlighter/dist/styles/atelier-seaside-light';
-    export { default as atelierSulphurpoolDark } from 'react-syntax-highlighter/dist/styles/atelier-sulphurpool-dark';
-    export { default as atelierSulphurpoolLight } from 'react-syntax-highlighter/dist/styles/atelier-sulphurpool-light';
-    export { default as atomOneDark } from 'react-syntax-highlighter/dist/styles/atom-one-dark';
-    export { default as atomOneLight } from 'react-syntax-highlighter/dist/styles/atom-one-light';
-    export { default as brownPaper } from 'react-syntax-highlighter/dist/styles/brown-paper';
-    export { default as codepenEmbed } from 'react-syntax-highlighter/dist/styles/codepen-embed';
-    export { default as colorBrewer } from 'react-syntax-highlighter/dist/styles/color-brewer';
-    export { default as darcula } from 'react-syntax-highlighter/dist/styles/darcula';
-    export { default as dark } from 'react-syntax-highlighter/dist/styles/dark';
-    export { default as darkula } from 'react-syntax-highlighter/dist/styles/darkula';
-    export { default as defaultStyle } from 'react-syntax-highlighter/dist/styles/default-style';
-    export { default as docco } from 'react-syntax-highlighter/dist/styles/docco';
-    export { default as dracula } from 'react-syntax-highlighter/dist/styles/dracula';
-    export { default as far } from 'react-syntax-highlighter/dist/styles/far';
-    export { default as foundation } from 'react-syntax-highlighter/dist/styles/foundation';
-    export { default as githubGist } from 'react-syntax-highlighter/dist/styles/github-gist';
-    export { default as github } from 'react-syntax-highlighter/dist/styles/github';
-    export { default as googlecode } from 'react-syntax-highlighter/dist/styles/googlecode';
-    export { default as grayscale } from 'react-syntax-highlighter/dist/styles/grayscale';
-    export { default as gruvboxDark } from 'react-syntax-highlighter/dist/styles/gruvbox-dark';
-    export { default as gruvboxLight } from 'react-syntax-highlighter/dist/styles/gruvbox-light';
-    export { default as hopscotch } from 'react-syntax-highlighter/dist/styles/hopscotch';
-    export { default as hybrid } from 'react-syntax-highlighter/dist/styles/hybrid';
-    export { default as idea } from 'react-syntax-highlighter/dist/styles/idea';
-    export { default as irBlack } from 'react-syntax-highlighter/dist/styles/ir-black';
-    export { default as kimbieDark } from 'react-syntax-highlighter/dist/styles/kimbie.dark';
-    export { default as kimbieLight } from 'react-syntax-highlighter/dist/styles/kimbie.light';
-    export { default as magula } from 'react-syntax-highlighter/dist/styles/magula';
-    export { default as monoBlue } from 'react-syntax-highlighter/dist/styles/mono-blue';
-    export { default as monokaiSublime } from 'react-syntax-highlighter/dist/styles/monokai-sublime';
-    export { default as monokai } from 'react-syntax-highlighter/dist/styles/monokai';
-    export { default as obsidian } from 'react-syntax-highlighter/dist/styles/obsidian';
-    export { default as ocean } from 'react-syntax-highlighter/dist/styles/ocean';
-    export { default as paraisoDark } from 'react-syntax-highlighter/dist/styles/paraiso-dark';
-    export { default as paraisoLight } from 'react-syntax-highlighter/dist/styles/paraiso-light';
-    export { default as pojoaque } from 'react-syntax-highlighter/dist/styles/pojoaque';
-    export { default as purebasic } from 'react-syntax-highlighter/dist/styles/purebasic';
-    export { default as qtcreatorDark } from 'react-syntax-highlighter/dist/styles/qtcreator_dark';
-    export { default as qtcreatorLight } from 'react-syntax-highlighter/dist/styles/qtcreator_light';
-    export { default as railscasts } from 'react-syntax-highlighter/dist/styles/railscasts';
-    export { default as rainbow } from 'react-syntax-highlighter/dist/styles/rainbow';
-    export { default as schoolBook } from 'react-syntax-highlighter/dist/styles/school-book';
-    export { default as solarizedDark } from 'react-syntax-highlighter/dist/styles/solarized-dark';
-    export { default as solarizedLight } from 'react-syntax-highlighter/dist/styles/solarized-light';
-    export { default as sunburst } from 'react-syntax-highlighter/dist/styles/sunburst';
-    export { default as tomorrowNightBlue } from 'react-syntax-highlighter/dist/styles/tomorrow-night-blue';
-    export { default as tomorrowNightBright } from 'react-syntax-highlighter/dist/styles/tomorrow-night-bright';
-    export { default as tomorrowNightEighties } from 'react-syntax-highlighter/dist/styles/tomorrow-night-eighties';
-    export { default as tomorrowNight } from 'react-syntax-highlighter/dist/styles/tomorrow-night';
-    export { default as tomorrow } from 'react-syntax-highlighter/dist/styles/tomorrow';
-    export { default as vs } from 'react-syntax-highlighter/dist/styles/vs';
-    export { default as xcode } from 'react-syntax-highlighter/dist/styles/xcode';
-    export { default as xt256 } from 'react-syntax-highlighter/dist/styles/xt256';
-    export { default as zenburn } from 'react-syntax-highlighter/dist/styles/zenburn';
+declare module 'react-syntax-highlighter/styles/hljs' {
+    export { default as agate } from 'react-syntax-highlighter/styles/hljs/agate';
+    export { default as androidstudio } from 'react-syntax-highlighter/styles/hljs/androidstudio';
+    export { default as arduinoLight } from 'react-syntax-highlighter/styles/hljs/arduino-light';
+    export { default as arta } from 'react-syntax-highlighter/styles/hljs/arta';
+    export { default as ascetic } from 'react-syntax-highlighter/styles/hljs/ascetic';
+    export { default as atelierCaveDark } from 'react-syntax-highlighter/styles/hljs/atelier-cave-dark';
+    export { default as atelierCaveLight } from 'react-syntax-highlighter/styles/hljs/atelier-cave-light';
+    export { default as atelierDuneDark } from 'react-syntax-highlighter/styles/hljs/atelier-dune-dark';
+    export { default as atelierDuneLight } from 'react-syntax-highlighter/styles/hljs/atelier-dune-light';
+    export { default as atelierEstuaryDark } from 'react-syntax-highlighter/styles/hljs/atelier-estuary-dark';
+    export { default as atelierEstuaryLight } from 'react-syntax-highlighter/styles/hljs/atelier-estuary-light';
+    export { default as atelierForestDark } from 'react-syntax-highlighter/styles/hljs/atelier-forest-dark';
+    export { default as atelierForestLight } from 'react-syntax-highlighter/styles/hljs/atelier-forest-light';
+    export { default as atelierHeathDark } from 'react-syntax-highlighter/styles/hljs/atelier-heath-dark';
+    export { default as atelierHeathLight } from 'react-syntax-highlighter/styles/hljs/atelier-heath-light';
+    export { default as atelierLakesideDark } from 'react-syntax-highlighter/styles/hljs/atelier-lakeside-dark';
+    export { default as atelierLakesideLight } from 'react-syntax-highlighter/styles/hljs/atelier-lakeside-light';
+    export { default as atelierPlateauDark } from 'react-syntax-highlighter/styles/hljs/atelier-plateau-dark';
+    export { default as atelierPlateauLight } from 'react-syntax-highlighter/styles/hljs/atelier-plateau-light';
+    export { default as atelierSavannaDark } from 'react-syntax-highlighter/styles/hljs/atelier-savanna-dark';
+    export { default as atelierSavannaLight } from 'react-syntax-highlighter/styles/hljs/atelier-savanna-light';
+    export { default as atelierSeasideDark } from 'react-syntax-highlighter/styles/hljs/atelier-seaside-dark';
+    export { default as atelierSeasideLight } from 'react-syntax-highlighter/styles/hljs/atelier-seaside-light';
+    export { default as atelierSulphurpoolDark } from 'react-syntax-highlighter/styles/hljs/atelier-sulphurpool-dark';
+    export { default as atelierSulphurpoolLight } from 'react-syntax-highlighter/styles/hljs/atelier-sulphurpool-light';
+    export { default as atomOneDark } from 'react-syntax-highlighter/styles/hljs/atom-one-dark';
+    export { default as atomOneLight } from 'react-syntax-highlighter/styles/hljs/atom-one-light';
+    export { default as brownPaper } from 'react-syntax-highlighter/styles/hljs/brown-paper';
+    export { default as codepenEmbed } from 'react-syntax-highlighter/styles/hljs/codepen-embed';
+    export { default as colorBrewer } from 'react-syntax-highlighter/styles/hljs/color-brewer';
+    export { default as darcula } from 'react-syntax-highlighter/styles/hljs/darcula';
+    export { default as dark } from 'react-syntax-highlighter/styles/hljs/dark';
+    export { default as darkula } from 'react-syntax-highlighter/styles/hljs/darkula';
+    export { default as defaultStyle } from 'react-syntax-highlighter/styles/hljs/default-style';
+    export { default as docco } from 'react-syntax-highlighter/styles/hljs/docco';
+    export { default as dracula } from 'react-syntax-highlighter/styles/hljs/dracula';
+    export { default as far } from 'react-syntax-highlighter/styles/hljs/far';
+    export { default as foundation } from 'react-syntax-highlighter/styles/hljs/foundation';
+    export { default as githubGist } from 'react-syntax-highlighter/styles/hljs/github-gist';
+    export { default as github } from 'react-syntax-highlighter/styles/hljs/github';
+    export { default as googlecode } from 'react-syntax-highlighter/styles/hljs/googlecode';
+    export { default as grayscale } from 'react-syntax-highlighter/styles/hljs/grayscale';
+    export { default as gruvboxDark } from 'react-syntax-highlighter/styles/hljs/gruvbox-dark';
+    export { default as gruvboxLight } from 'react-syntax-highlighter/styles/hljs/gruvbox-light';
+    export { default as hopscotch } from 'react-syntax-highlighter/styles/hljs/hopscotch';
+    export { default as hybrid } from 'react-syntax-highlighter/styles/hljs/hybrid';
+    export { default as idea } from 'react-syntax-highlighter/styles/hljs/idea';
+    export { default as irBlack } from 'react-syntax-highlighter/styles/hljs/ir-black';
+    export { default as kimbieDark } from 'react-syntax-highlighter/styles/hljs/kimbie.dark';
+    export { default as kimbieLight } from 'react-syntax-highlighter/styles/hljs/kimbie.light';
+    export { default as magula } from 'react-syntax-highlighter/styles/hljs/magula';
+    export { default as monoBlue } from 'react-syntax-highlighter/styles/hljs/mono-blue';
+    export { default as monokaiSublime } from 'react-syntax-highlighter/styles/hljs/monokai-sublime';
+    export { default as monokai } from 'react-syntax-highlighter/styles/hljs/monokai';
+    export { default as obsidian } from 'react-syntax-highlighter/styles/hljs/obsidian';
+    export { default as ocean } from 'react-syntax-highlighter/styles/hljs/ocean';
+    export { default as paraisoDark } from 'react-syntax-highlighter/styles/hljs/paraiso-dark';
+    export { default as paraisoLight } from 'react-syntax-highlighter/styles/hljs/paraiso-light';
+    export { default as pojoaque } from 'react-syntax-highlighter/styles/hljs/pojoaque';
+    export { default as purebasic } from 'react-syntax-highlighter/styles/hljs/purebasic';
+    export { default as qtcreatorDark } from 'react-syntax-highlighter/styles/hljs/qtcreator_dark';
+    export { default as qtcreatorLight } from 'react-syntax-highlighter/styles/hljs/qtcreator_light';
+    export { default as railscasts } from 'react-syntax-highlighter/styles/hljs/railscasts';
+    export { default as rainbow } from 'react-syntax-highlighter/styles/hljs/rainbow';
+    export { default as routeros } from 'react-syntax-highlighter/styles/hljs/routeros';
+    export { default as schoolBook } from 'react-syntax-highlighter/styles/hljs/school-book';
+    export { default as solarizedDark } from 'react-syntax-highlighter/styles/hljs/solarized-dark';
+    export { default as solarizedLight } from 'react-syntax-highlighter/styles/hljs/solarized-light';
+    export { default as sunburst } from 'react-syntax-highlighter/styles/hljs/sunburst';
+    export { default as tomorrowNightBlue } from 'react-syntax-highlighter/styles/hljs/tomorrow-night-blue';
+    export { default as tomorrowNightBright } from 'react-syntax-highlighter/styles/hljs/tomorrow-night-bright';
+    export { default as tomorrowNightEighties } from 'react-syntax-highlighter/styles/hljs/tomorrow-night-eighties';
+    export { default as tomorrowNight } from 'react-syntax-highlighter/styles/hljs/tomorrow-night';
+    export { default as tomorrow } from 'react-syntax-highlighter/styles/hljs/tomorrow';
+    export { default as vs } from 'react-syntax-highlighter/styles/hljs/vs';
+    export { default as vs2015 } from 'react-syntax-highlighter/styles/hljs/vs2015';
+    export { default as xcode } from 'react-syntax-highlighter/styles/hljs/xcode';
+    export { default as xt256 } from 'react-syntax-highlighter/styles/hljs/xt256';
+    export { default as zenburn } from 'react-syntax-highlighter/styles/hljs/zenburn';
 }
 
-declare module 'react-syntax-highlighter/dist/styles/agate' {
+declare module 'react-syntax-highlighter/styles/hljs/agate' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/androidstudio' {
+declare module 'react-syntax-highlighter/styles/hljs/androidstudio' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/arduino-light' {
+declare module 'react-syntax-highlighter/styles/hljs/arduino-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/arta' {
+declare module 'react-syntax-highlighter/styles/hljs/arta' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/ascetic' {
+declare module 'react-syntax-highlighter/styles/hljs/ascetic' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-cave-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-cave-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-cave-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-cave-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-dune-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-dune-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-dune-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-dune-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-estuary-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-estuary-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-estuary-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-estuary-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-forest-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-forest-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-forest-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-forest-light' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-heath-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-heath-dark' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-heath-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-heath-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-lakeside-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-lakeside-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-lakeside-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-lakeside-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-plateau-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-plateau-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-plateau-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-plateau-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-savanna-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-savanna-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-savanna-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-savanna-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-seaside-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-seaside-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-seaside-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-seaside-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-sulphurpool-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-sulphurpool-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atelier-sulphurpool-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atelier-sulphurpool-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atom-one-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/atom-one-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/atom-one-light' {
+declare module 'react-syntax-highlighter/styles/hljs/atom-one-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/brown-paper' {
+declare module 'react-syntax-highlighter/styles/hljs/brown-paper' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/codepen-embed' {
+declare module 'react-syntax-highlighter/styles/hljs/codepen-embed' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/color-brewer' {
+declare module 'react-syntax-highlighter/styles/hljs/color-brewer' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/dist/styles/darcula' {
+declare module 'react-syntax-highlighter/styles/hljs/darcula' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/dist/styles/dark' {
+declare module 'react-syntax-highlighter/styles/hljs/dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/darkula' {
+declare module 'react-syntax-highlighter/styles/hljs/darkula' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/default-style' {
+declare module 'react-syntax-highlighter/styles/hljs/default-style' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/docco' {
+declare module 'react-syntax-highlighter/styles/hljs/docco' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/dracula' {
+declare module 'react-syntax-highlighter/styles/hljs/dracula' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/far' {
+declare module 'react-syntax-highlighter/styles/hljs/far' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/foundation' {
+declare module 'react-syntax-highlighter/styles/hljs/foundation' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/github-gist' {
+declare module 'react-syntax-highlighter/styles/hljs/github-gist' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/github' {
+declare module 'react-syntax-highlighter/styles/hljs/github' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/googlecode' {
+declare module 'react-syntax-highlighter/styles/hljs/googlecode' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/grayscale' {
+declare module 'react-syntax-highlighter/styles/hljs/grayscale' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/gruvbox-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/gruvbox-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/gruvbox-light' {
+declare module 'react-syntax-highlighter/styles/hljs/gruvbox-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/hopscotch' {
+declare module 'react-syntax-highlighter/styles/hljs/hopscotch' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/hybrid' {
+declare module 'react-syntax-highlighter/styles/hljs/hybrid' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/idea' {
+declare module 'react-syntax-highlighter/styles/hljs/idea' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/dist/styles/ir-black' {
+declare module 'react-syntax-highlighter/styles/hljs/ir-black' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/dist/styles/kimbie.dark' {
+declare module 'react-syntax-highlighter/styles/hljs/kimbie.dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/kimbie.light' {
+declare module 'react-syntax-highlighter/styles/hljs/kimbie.light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/magula' {
+declare module 'react-syntax-highlighter/styles/hljs/magula' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/mono-blue' {
+declare module 'react-syntax-highlighter/styles/hljs/mono-blue' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/monokai-sublime' {
+declare module 'react-syntax-highlighter/styles/hljs/monokai-sublime' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/monokai' {
+declare module 'react-syntax-highlighter/styles/hljs/monokai' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/obsidian' {
+declare module 'react-syntax-highlighter/styles/hljs/obsidian' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/ocean' {
+declare module 'react-syntax-highlighter/styles/hljs/ocean' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/paraiso-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/paraiso-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/paraiso-light' {
+declare module 'react-syntax-highlighter/styles/hljs/paraiso-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/pojoaque' {
+declare module 'react-syntax-highlighter/styles/hljs/pojoaque' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/purebasic' {
+declare module 'react-syntax-highlighter/styles/hljs/purebasic' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/qtcreator_dark' {
+declare module 'react-syntax-highlighter/styles/hljs/qtcreator_dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/qtcreator_light' {
+declare module 'react-syntax-highlighter/styles/hljs/qtcreator_light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/railscasts' {
+declare module 'react-syntax-highlighter/styles/hljs/railscasts' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/rainbow' {
+declare module 'react-syntax-highlighter/styles/hljs/rainbow' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/school-book' {
+declare module 'react-syntax-highlighter/styles/hljs/routeros' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/solarized-dark' {
+declare module 'react-syntax-highlighter/styles/hljs/school-book' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/solarized-light' {
+declare module 'react-syntax-highlighter/styles/hljs/solarized-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/sunburst' {
+declare module 'react-syntax-highlighter/styles/hljs/solarized-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/tomorrow-night-blue' {
+declare module 'react-syntax-highlighter/styles/hljs/sunburst' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/tomorrow-night-bright' {
+declare module 'react-syntax-highlighter/styles/hljs/tomorrow-night-blue' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/tomorrow-night-eighties' {
+declare module 'react-syntax-highlighter/styles/hljs/tomorrow-night-bright' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/tomorrow-night' {
+declare module 'react-syntax-highlighter/styles/hljs/tomorrow-night-eighties' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/tomorrow' {
+declare module 'react-syntax-highlighter/styles/hljs/tomorrow-night' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/vs' {
+declare module 'react-syntax-highlighter/styles/hljs/tomorrow' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/xcode' {
+declare module 'react-syntax-highlighter/styles/hljs/vs' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/xt256' {
+declare module 'react-syntax-highlighter/styles/hljs/vs2015' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/dist/styles/zenburn' {
+declare module 'react-syntax-highlighter/styles/hljs/xcode' {
     const style: any;
     export default style;
 }
+
+declare module 'react-syntax-highlighter/styles/hljs/xt256' {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/hljs/zenburn' {
+    const style: any;
+    export default style;
+}
+declare module 'react-syntax-highlighter/styles/prism' {
+    export { default as atomDark } from 'react-syntax-highlighter/styles/prism/atom-dark';
+    export { default as base16AteliersulphurpoolLight } from 'react-syntax-highlighter/styles/prism/base16-ateliersulphurpool.light';
+    export { default as cb } from 'react-syntax-highlighter/styles/prism/cb';
+    export { default as coy } from 'react-syntax-highlighter/styles/prism/coy';
+    export { default as darcula } from 'react-syntax-highlighter/styles/prism/darcula';
+    export { default as dark } from 'react-syntax-highlighter/styles/prism/dark';
+    export { default as duotoneDark } from 'react-syntax-highlighter/styles/prism/duotone-dark';
+    export { default as duotoneEarth } from 'react-syntax-highlighter/styles/prism/duotone-earth';
+    export { default as duotoneForest } from 'react-syntax-highlighter/styles/prism/duotone-forest';
+    export { default as duotoneLight } from 'react-syntax-highlighter/styles/prism/duotone-light';
+    export { default as duotoneSea } from 'react-syntax-highlighter/styles/prism/duotone-sea';
+    export { default as duotoneSpace } from 'react-syntax-highlighter/styles/prism/duotone-space';
+    export { default as funky } from 'react-syntax-highlighter/styles/prism/funky';
+    export { default as ghcolors } from 'react-syntax-highlighter/styles/prism/ghcolors';
+    export { default as hopscotch } from 'react-syntax-highlighter/styles/prism/hopscotch';
+    export { default as okaidia } from 'react-syntax-highlighter/styles/prism/okaidia';
+    export { default as pojoaque } from 'react-syntax-highlighter/styles/prism/pojoaque';
+    export { default as prism } from 'react-syntax-highlighter/styles/prism/prism';
+    export { default as solarizedlight } from 'react-syntax-highlighter/styles/prism/solarizedlight';
+    export { default as tomorrow } from 'react-syntax-highlighter/styles/prism/tomorrow';
+    export { default as twilight } from 'react-syntax-highlighter/styles/prism/twilight';
+    export { default as vs } from 'react-syntax-highlighter/styles/prism/vs';
+    export { default as xonokai } from 'react-syntax-highlighter/styles/prism/xonokai';
+}
+
+declare module 'react-syntax-highlighter/styles/prism/atom-dark'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/base16-ateliersulphurpool.light'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/cb'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/coy'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/darcula'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/dark'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/duotone-dark'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/duotone-earth'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/duotone-forest'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/duotone-light'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/duotone-sea'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/duotone-space'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/funky'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/ghcolors'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/hopscotch'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/okaidia'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/pojoaque'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/prism'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/solarizedlight'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/tomorrow'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/twilight'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/vs'  {
+    const style: any;
+    export default style;
+}
+
+declare module 'react-syntax-highlighter/styles/prism/xonokai'   {
+    const style: any;
+    export default style;
+}
+
diff --git a/types/react-syntax-highlighter/react-syntax-highlighter-tests.tsx b/types/react-syntax-highlighter/react-syntax-highlighter-tests.tsx
index 7cb8a9dc20..b957aebac0 100644
--- a/types/react-syntax-highlighter/react-syntax-highlighter-tests.tsx
+++ b/types/react-syntax-highlighter/react-syntax-highlighter-tests.tsx
@@ -1,10 +1,9 @@
-import * as React from 'react';
-import SyntaxHighlighter from 'react-syntax-highlighter';
-import { docco } from 'react-syntax-highlighter/dist/styles';
+import * as React from "react";
+import SyntaxHighlighter from "react-syntax-highlighter";
+import { docco } from "react-syntax-highlighter/styles/hljs";
 
 function highlighter(): JSX.Element {
-  const codeString: string =
-`class CPP {
+    const codeString: string = `class CPP {
     private year: number;
     public constructor(private version: string) {
         this.year = Number(version.match(/.+\d+$/));
@@ -14,5 +13,9 @@ function highlighter(): JSX.Element {
     }
 }
 `;
-  return <SyntaxHighlighter language='javascript' style={docco}>{codeString}</SyntaxHighlighter>;
-}
\ No newline at end of file
+    return (
+        <SyntaxHighlighter language="javascript" style={docco}>
+            {codeString}
+        </SyntaxHighlighter>
+    );
+}

From 2c31712ec57a29a1df39ac0aaa5095fb7130b157 Mon Sep 17 00:00:00 2001
From: Jonathan Siebern <jsiebern88@gmail.com>
Date: Thu, 15 Feb 2018 14:32:31 +0100
Subject: [PATCH 065/388] DateTime.until needs to return a typeof Interval

https://github.com/moment/luxon/blob/master/src/datetime.js#L1650
---
 types/luxon/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index fac0b90fe6..0d66b9750c 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/moment/luxon#readme
 // Definitions by: Colby DeHart <https://github.com/colbydehart>
 //                 Hyeonseok Yang <https://github.com/FourwingsY>
+//                 Jonathan Siebern <https://github.com/jsiebern>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -209,7 +210,7 @@ declare module 'luxon' {
             toSQLTime(options?: Object): string;
             toString(): string;
             toUTC(offset?: number, options?: ZoneOptions): DateTime;
-            until(other: DateTime): Duration;
+            until(other: DateTime): Interval;
             valueOf(): number;
         }
 

From 032b7a2ef4489b82878956f5b637ab5e553d0603 Mon Sep 17 00:00:00 2001
From: Jonathan Siebern <jsiebern88@gmail.com>
Date: Thu, 15 Feb 2018 14:37:58 +0100
Subject: [PATCH 066/388] Update Luxon Version

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

diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index 0d66b9750c..2275e331f0 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for luxon 0.2
+// Type definitions for luxon 0.4.0
 // Project: https://github.com/moment/luxon#readme
 // Definitions by: Colby DeHart <https://github.com/colbydehart>
 //                 Hyeonseok Yang <https://github.com/FourwingsY>

From 259c6434a43493e6ca28ae7ebba5529f191151b2 Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Thu, 15 Feb 2018 09:55:22 -0500
Subject: [PATCH 067/388] Update passport-tests.ts

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

diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index 58c306964c..3e7f4e675b 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -137,3 +137,14 @@ passportInstance.use(new TestStrategy());
 
 const authenticator = new passport.Authenticator();
 authenticator.use(new TestStrategy());
+
+declare namespace Express {
+  interface User {
+    username: string;
+  }
+}
+
+app.use((req, res, next) => {
+    console.log(req.user.username);
+    next();
+});

From 3ef2b4b3b4735ad80add4ff1bf5c25bfeb55bfe6 Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Thu, 15 Feb 2018 10:12:29 -0500
Subject: [PATCH 068/388] Update passport-tests.ts

---
 types/passport/passport-tests.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index 3e7f4e675b..cfee5c914f 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -138,13 +138,15 @@ passportInstance.use(new TestStrategy());
 const authenticator = new passport.Authenticator();
 authenticator.use(new TestStrategy());
 
-declare namespace Express {
-  interface User {
-    username: string;
-  }
+declare global {
+    namespace Express {
+        interface User {
+            username: string;
+        }
+    }
 }
 
 app.use((req, res, next) => {
-    console.log(req.user.username);
+    req.user.username = "hello user";
     next();
 });

From ba7deb74ed0dd4d047c87b11c1207f9550f0381c Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Thu, 15 Feb 2018 10:15:30 -0500
Subject: [PATCH 069/388] Update index.d.ts

---
 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 8adc4584d4..10f5d8ae8f 100644
--- a/types/passport/index.d.ts
+++ b/types/passport/index.d.ts
@@ -4,6 +4,7 @@
 //                 Eric Naeseth <https://github.com/enaeseth>
 //                 Igor Belagorudsky <https://github.com/theigor>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
+//                 Daniel Perez Alvarez <https://github.com/danielpa9708>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From fb7985211e0e08efbc0f78f7708f58594a7bb211 Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Thu, 15 Feb 2018 10:31:14 -0500
Subject: [PATCH 070/388] Update passport-tests.ts

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

diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index cfee5c914f..6bc7bbe64e 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -146,7 +146,7 @@ declare global {
     }
 }
 
-app.use((req, res, next) => {
+app.use((req: express.Request, res: express.Response, next: (err?: any) => void) => {
     req.user.username = "hello user";
     next();
 });

From 8564c357bb3fdb9b6bd5e17a5991f323e188e8f2 Mon Sep 17 00:00:00 2001
From: Flavio Torres <flavio@apetis.com>
Date: Thu, 15 Feb 2018 14:18:23 -0200
Subject: [PATCH 071/388] Added Beforefind readPreference options

---
 types/parse/index.d.ts     | 22 +++++++++++++++-------
 types/parse/parse-tests.ts |  8 ++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index d186211983..95331fe0d7 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -6,7 +6,7 @@
 //                  Flavio Negrão <https://github.com/flavionegrao>
 //                  Wes Grimes <https://github.com/wesleygrimes>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="node" />
 /// <reference types="jquery" />
@@ -907,22 +907,30 @@ declare namespace Parse {
             object: Object;
         }
 
-        interface BeforeFindTriggerRequest extends TriggerRequest {
-            query?: Query
-            count?: boolean
-        }
 
         interface AfterSaveRequest extends TriggerRequest { }
         interface AfterDeleteRequest extends TriggerRequest { }
         interface BeforeDeleteRequest extends TriggerRequest { }
         interface BeforeDeleteResponse extends FunctionResponse { }
         interface BeforeSaveRequest extends TriggerRequest { }
-        interface BeforeFindRequest extends BeforeFindTriggerRequest { }
         interface BeforeSaveResponse extends FunctionResponse {
             success: () => void;
         }
+
+        // Read preference describes how MongoDB driver route read operations to the members of a replica set.
+        enum ReadPreferenceOption {
+            Primary = 'PRIMARY',
+            PrimaryPreferred = 'PRIMARY_PREFERRED',
+            Secondary = 'SECONDARY',
+            SecondaryPreferred = 'SECONDARY_PREFERRED',
+            Nearest = 'NEAREST'
+        }
+
         interface BeforeFindRequest extends TriggerRequest {
-            query: Query;
+            query: Query
+            count: boolean
+            isGet: boolean
+            readPreference?: ReadPreferenceOption
         }
 
         function afterDelete(arg1: any, func?: (request: AfterDeleteRequest) => void): void;
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index 06ec062880..b8d0d0dd0e 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -390,6 +390,14 @@ function test_cloud_functions() {
         let user = request.user; // the user
         let isMaster = request.master; // if the query is run with masterKey
         let isCount = request.count; // if the query is a count operation (available on parse-server 2.4.0 or up)
+        let isGet = request.isGet; // if the query is a get operation
+
+        // All possible read preferences
+        request.readPreference = Parse.Cloud.ReadPreferenceOption.Primary
+        request.readPreference = Parse.Cloud.ReadPreferenceOption.PrimaryPreferred
+        request.readPreference = Parse.Cloud.ReadPreferenceOption.Secondary
+        request.readPreference = Parse.Cloud.ReadPreferenceOption.SecondaryPreferred
+        request.readPreference = Parse.Cloud.ReadPreferenceOption.Nearest
     });
 }
 

From 7af3a74feca151d9c91de5c7321dec46e4537123 Mon Sep 17 00:00:00 2001
From: Flavio Torres <flavio@apetis.com>
Date: Thu, 15 Feb 2018 16:04:08 -0200
Subject: [PATCH 072/388] updated requirements to TypeScript Version: 2.4

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

diff --git a/types/parse-mockdb/index.d.ts b/types/parse-mockdb/index.d.ts
index bff2e81935..94a1f63bb1 100644
--- a/types/parse-mockdb/index.d.ts
+++ b/types/parse-mockdb/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/HustleInc/parse-mockdb
 // Definitions by: David Poetzsch-Heffter <https://github.com/dpoetzsch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="parse" />
 

From 4820191c9e7f94c450445c0d7bd8900f8a7be6b7 Mon Sep 17 00:00:00 2001
From: Eric Heikes <eric.heikes@banno.com>
Date: Thu, 15 Feb 2018 10:27:14 -0800
Subject: [PATCH 073/388] Rewrite module function declaration & export to match
 template

Follows template in TS docs now:
https://www.typescriptlang.org/docs/handbook/declaration-files/templates/module-function-d-ts.html

Also makes it possible to reference interfaces from the NodeVault
namespace outside of this module.
---
 types/node-vault/index.d.ts          | 6 ++----
 types/node-vault/node-vault-tests.ts | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/types/node-vault/index.d.ts b/types/node-vault/index.d.ts
index 653db37e85..835e364ae7 100644
--- a/types/node-vault/index.d.ts
+++ b/types/node-vault/index.d.ts
@@ -122,7 +122,5 @@ declare namespace NodeVault {
     }
 }
 
-type GetClient = (options?: NodeVault.VaultOptions) => NodeVault.client;
-
-declare const getClient: GetClient;
-export = getClient;
+declare function NodeVault(options?: NodeVault.VaultOptions): NodeVault.client;
+export = NodeVault;
diff --git a/types/node-vault/node-vault-tests.ts b/types/node-vault/node-vault-tests.ts
index 6ce23bd4cd..506514cc92 100644
--- a/types/node-vault/node-vault-tests.ts
+++ b/types/node-vault/node-vault-tests.ts
@@ -1,7 +1,7 @@
 import nv = require("node-vault");
 
 // Test code came from the sample code in README of the module.
-const options = {
+const options: nv.VaultOptions = {
   apiVersion: 'v1', // default
   endpoint: 'http://127.0.0.1:8200', // default
   token: '1234', // optional client token; can be fetched after valid initialization of the server

From 3b91816142ed28e283218537e5a6ffd8828773cf Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Thu, 15 Feb 2018 13:29:47 -0500
Subject: [PATCH 074/388] Update passport-tests.ts

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

diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index 6bc7bbe64e..49b2436333 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -147,6 +147,8 @@ declare global {
 }
 
 app.use((req: express.Request, res: express.Response, next: (err?: any) => void) => {
-    req.user.username = "hello user";
+    if (req.user) {
+        req.user.username = "hello user";
+    }
     next();
 });

From 312205dd02ed28c9a46913c8ef85251c0225b6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C4=83lin=20Br=C3=A2ndu=C8=99e?= <malin.branduse@gmail.com>
Date: Thu, 15 Feb 2018 22:16:12 +0200
Subject: [PATCH 075/388] [isotope-layout] Export the module from the
 definitions

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

diff --git a/types/isotope-layout/index.d.ts b/types/isotope-layout/index.d.ts
index 019aa9ec37..e9c39dea62 100644
--- a/types/isotope-layout/index.d.ts
+++ b/types/isotope-layout/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for isotope 3.0
 // Project: http://isotope.metafizzy.co/
 // Definitions by: Anže Videnič <https://github.com/avidenic>
+//                 Mălin Brândușe <https://github.com/malinushj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -270,13 +271,17 @@ interface Isotope extends IsotopeLibrary.Isotope { }
 
 declare var Isotope: {
     prototype: IsotopeLibrary.Isotope;
-    new (selector: string): IsotopeLibrary.Isotope;
+    new (elementOrSelector: HTMLElement | string, options: IsotopeLibrary.IsotopeOptions): IsotopeLibrary.Isotope;
     /**
      * Get the Isotope instance via its element. Isotope.data() is useful for getting the Isotope instance in JavaScript, after it has been initalized in HTML.
      */
     data(element: HTMLElement | string): IsotopeLibrary.Isotope;
 };
 
+declare module 'isotope-layout' {
+    export default Isotope;
+}
+
 interface JQuery {
     /**
      * Get the Isotope instance from a jQuery object. Isotope instances are useful to access Isotope properties.
diff --git a/types/isotope-layout/isotope-layout-tests.ts b/types/isotope-layout/isotope-layout-tests.ts
index 648ba507ce..998e8b0392 100644
--- a/types/isotope-layout/isotope-layout-tests.ts
+++ b/types/isotope-layout/isotope-layout-tests.ts
@@ -98,7 +98,7 @@ $grid.isotope('layout').isotope('reloadItems').isotope('shuffle');
 let iso: Isotope = $grid.data('isotope');
 
 // test native javascript methods
-iso = new Isotope('.grid');
+iso = new Isotope('.grid', {});
 iso.addItems($('.items'));
 iso.appended(new HTMLElement());
 iso.arrange({ cellsByColumn: { columnWidth: 101, rowHeight: 12 } });

From daffa70f19756c7bbc4ab6df80f61f9d0b3f56f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C4=83lin=20Br=C3=A2ndu=C8=99e?= <malin.branduse@gmail.com>
Date: Thu, 15 Feb 2018 23:34:31 +0200
Subject: [PATCH 076/388] fixed lint errors

---
 types/isotope-layout/index.d.ts              | 323 +++++++++----------
 types/isotope-layout/isotope-layout-tests.ts |   1 +
 2 files changed, 161 insertions(+), 163 deletions(-)

diff --git a/types/isotope-layout/index.d.ts b/types/isotope-layout/index.d.ts
index e9c39dea62..5e1f0623e4 100644
--- a/types/isotope-layout/index.d.ts
+++ b/types/isotope-layout/index.d.ts
@@ -5,9 +5,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="jquery"/>
+export as namespace Isotope
+export = Isotope;
 
-declare namespace IsotopeLibrary {
+declare namespace Isotope {
     type LayoutModes = 'masonry' | 'fitRows' | 'cellsByRow' | 'vertical' | 'packery' | 'masonryHorizontal' | 'fitColumns' | 'cellsByColumn' | 'horiz';
     type Elements = HTMLElement[] | HTMLElement | JQuery | NodeList;
 
@@ -124,96 +125,6 @@ declare namespace IsotopeLibrary {
         visibleStyle?: Style;
     }
 
-    interface Isotope {
-        /**
-         * Adds item elements to the Isotope instance. addItems does not lay out items like appended, prepended, or insert.
-         * @param elements Element, jQuery Object, NodeList, or Array of Elements
-         */
-        addItems(elements: Elements): void;
-        /**
-         * Adds and lays out newly appended item elements to the end of the layout.
-         * @param elements Element, jQuery Object, NodeList, or Array of Elements
-         */
-        appended(elements: Elements): void;
-        /**
-         * Filters, sorts, and lays out items. arrange is the principle method of Isotope. It is the default method with jQuery .isotope(). Pass in options to apply filtering and sorting.
-         * @param options All options are optional, but itemSelector is recommended. Layout modes have their own separate options.
-         */
-        arrange(options: IsotopeOptions): void;
-        /**
-         * Removes the Isotope functionality completely. destroy will return the element back to its pre-initialized state.
-         */
-        destroy(): void;
-        /**
-         * Returns an array of filtered item elements in current sorted order.
-         */
-        getFilteredItemElements(): Element[];
-        /**
-         * Returns an array of all item elements in the Isotope instance.
-         */
-        getItemElements(): Element[];
-        /**
-         * Hide items.
-         * @param elements Element, jQuery Object, NodeList, or Array of Elements
-         */
-        hideItemElements(elements: Elements): void;
-        /**
-         * Appends elements into container element, adds elements as items, and arranges items with filtering and sorting.
-         * @param elements Element, jQuery Object, NodeList, or Array of Elements
-         */
-        insert(elements: Elements): void;
-        /**
-         * Lays out all item elements. layout is useful when an item has changed size, and all items need to be laid out again. layout does not apply filtering or sorting.
-         */
-        layout(): void;
-        /**
-         * Lays out specified items.
-         * @param elements Array of Isotope.Items
-         * @param isStill Disables transitions
-         */
-        layoutItems(elements: HTMLElement[], isStill: boolean): void;
-        /**
-         * Adds and lays out newly prepended item elements at the beginning of layout.
-         * @param elements Element, jQuery Object, NodeList, or Array of Elements
-         */
-        prepended(elements: Elements): void;
-        /**
-         * Recollects all item elements.
-         * For frameworks like Angular and React, reloadItems may be useful to apply changes to the DOM to Isotope.
-         */
-        reloadItems(): void;
-        /**
-         * Removes elements from the Isotope instance and DOM.
-         * @param elements Element, jQuery Object, NodeList, or Array of Elements
-         */
-        remove(elements: Elements): void;
-        /**
-         * Reveals hidden items.
-         * @param elements Element, jQuery Object, NodeList, or Array of Elements
-         */
-        revealItemElements(elements: Elements): void;
-        /**
-         * Shuffles items in a random order.
-         */
-        shuffle(): void;
-        /**
-         * Stamps elements in the layout. Isotope will lay out item elements around stamped elements.
-         * Stamping is only supported by some layout modes: masonry, packery and masonryhorizontal.
-         * @param elements Element, jQuery Object, NodeList, or Array of Elements
-         */
-        stamp(elements: Elements): void;
-        /**
-         * Un-stamps elements in the layout, so that Isotope will no longer layout item elements around them.
-         * @param elements Element, jQuery Object, NodeList, or Array of Elements
-         */
-        unstamp(elements: Elements): void;
-        /**
-         * Updates sort data
-         * @param elements Element, jQuery Object, NodeList, or Array of Elements
-         */
-        updateSortData(elements: Elements): void;
-    }
-
     interface Sorter {
         [key: string]: ((itemElm: JQuery) => number | string) | string;
     }
@@ -267,111 +178,197 @@ declare namespace IsotopeLibrary {
     }
 }
 
-interface Isotope extends IsotopeLibrary.Isotope { }
-
-declare var Isotope: {
-    prototype: IsotopeLibrary.Isotope;
-    new (elementOrSelector: HTMLElement | string, options: IsotopeLibrary.IsotopeOptions): IsotopeLibrary.Isotope;
+interface Isotope {
     /**
-     * Get the Isotope instance via its element. Isotope.data() is useful for getting the Isotope instance in JavaScript, after it has been initalized in HTML.
+     * Adds item elements to the Isotope instance. addItems does not lay out items like appended, prepended, or insert.
+     * @param elements Element, jQuery Object, NodeList, or Array of Elements
      */
-    data(element: HTMLElement | string): IsotopeLibrary.Isotope;
-};
-
-declare module 'isotope-layout' {
-    export default Isotope;
-}
-
-interface JQuery {
+    addItems(elements: Isotope.Elements): void;
     /**
-     * Get the Isotope instance from a jQuery object. Isotope instances are useful to access Isotope properties.
+     * Adds and lays out newly appended item elements to the end of the layout.
+     * @param elements Element, jQuery Object, NodeList, or Array of Elements
      */
-    data(methodName: 'isotope'): IsotopeLibrary.Isotope;
+    appended(elements: Isotope.Elements): void;
+    /**
+     * Filters, sorts, and lays out items. arrange is the principle method of Isotope. It is the default method with jQuery .isotope(). Pass in options to apply filtering and sorting.
+     * @param options All options are optional, but itemSelector is recommended. Layout modes have their own separate options.
+     */
+    arrange(options: Isotope.IsotopeOptions): void;
+    /**
+     * Removes the Isotope functionality completely. destroy will return the element back to its pre-initialized state.
+     */
+    destroy(): void;
+    /**
+     * Returns an array of filtered item elements in current sorted order.
+     */
+    getFilteredItemElements(): Element[];
+    /**
+     * Returns an array of all item elements in the Isotope instance.
+     */
+    getItemElements(): Element[];
+    /**
+     * Hide items.
+     * @param elements Element, jQuery Object, NodeList, or Array of Elements
+     */
+    hideItemElements(elements: Isotope.Elements): void;
+    /**
+     * Appends elements into container element, adds elements as items, and arranges items with filtering and sorting.
+     * @param elements Element, jQuery Object, NodeList, or Array of Elements
+     */
+    insert(elements: Isotope.Elements): void;
+    /**
+     * Lays out all item elements. layout is useful when an item has changed size, and all items need to be laid out again. layout does not apply filtering or sorting.
+     */
+    layout(): void;
     /**
      * Lays out specified items.
      * @param elements Array of Isotope.Items
      * @param isStill Disables transitions
      */
-    isotope(methodName: 'layoutItems', elements: HTMLElement[], isStill: boolean): JQuery;
-    /**
-     * Adds item elements to the Isotope instance. addItems does not lay out items like appended, prepended, or insert.
-     * @param elements Element, jQuery Object, NodeList, or Array of Elements
-     */
-    isotope(methodName: 'addItems', elements: IsotopeLibrary.Elements): JQuery;
-    /**
-     * Adds and lays out newly appended item elements to the end of the layout.
-     * @param elements Element, jQuery Object, NodeList, or Array of Elements
-     */
-    isotope(methodName: 'appended', elements: IsotopeLibrary.Elements): JQuery;
-    /**
-     * Hide items.
-     * @param elements Element, jQuery Object, NodeList, or Array of Elements
-     */
-    isotope(methodName: 'hideItemElements', elements: IsotopeLibrary.Elements): JQuery;
-    /**
-     * Appends elements into container element, adds elements as items, and arranges items with filtering and sorting.
-     * @param elements Element, jQuery Object, NodeList, or Array of Elements
-     */
-    isotope(methodName: 'insert', elements: IsotopeLibrary.Elements): JQuery;
+    layoutItems(elements: HTMLElement[], isStill: boolean): void;
     /**
      * Adds and lays out newly prepended item elements at the beginning of layout.
      * @param elements Element, jQuery Object, NodeList, or Array of Elements
      */
-    isotope(methodName: 'prepended', elements: IsotopeLibrary.Elements): JQuery;
+    prepended(elements: Isotope.Elements): void;
+    /**
+     * Recollects all item elements.
+     * For frameworks like Angular and React, reloadItems may be useful to apply changes to the DOM to Isotope.
+     */
+    reloadItems(): void;
     /**
      * Removes elements from the Isotope instance and DOM.
      * @param elements Element, jQuery Object, NodeList, or Array of Elements
      */
-    isotope(methodName: 'remove', elements: IsotopeLibrary.Elements): JQuery;
+    remove(elements: Isotope.Elements): void;
     /**
      * Reveals hidden items.
      * @param elements Element, jQuery Object, NodeList, or Array of Elements
      */
-    isotope(methodName: 'revealItemElements', elements: IsotopeLibrary.Elements): JQuery;
+    revealItemElements(elements: Isotope.Elements): void;
+    /**
+     * Shuffles items in a random order.
+     */
+    shuffle(): void;
     /**
      * Stamps elements in the layout. Isotope will lay out item elements around stamped elements.
      * Stamping is only supported by some layout modes: masonry, packery and masonryhorizontal.
      * @param elements Element, jQuery Object, NodeList, or Array of Elements
      */
-    isotope(methodName: 'stamp', elements: IsotopeLibrary.Elements): JQuery;
+    stamp(elements: Isotope.Elements): void;
     /**
      * Un-stamps elements in the layout, so that Isotope will no longer layout item elements around them.
      * @param elements Element, jQuery Object, NodeList, or Array of Elements
      */
-    isotope(methodName: 'unstamp', elements: IsotopeLibrary.Elements): JQuery;
+    unstamp(elements: Isotope.Elements): void;
     /**
      * Updates sort data
      * @param elements Element, jQuery Object, NodeList, or Array of Elements
      */
-    isotope(methodName: 'updateSortData', elements: IsotopeLibrary.Elements): JQuery;
+    updateSortData(elements: Isotope.Elements): void;
+}
+
+declare const Isotope: {
+    prototype: Isotope,
+    new (elementOrSelector: HTMLElement | string, options: Isotope.IsotopeOptions): Isotope;
     /**
-     * Removes the Isotope functionality completely. destroy will return the element back to its pre-initialized state.
+     * Get the Isotope instance via its element. Isotope.data() is useful for getting the Isotope instance in JavaScript, after it has been initalized in HTML.
      */
-    isotope(methodName: 'destroy'): void;
-    /**
-     * Returns an array of filtered item elements in current sorted order.
-     */
-    isotope(methodName: 'getFilteredItemElements'): Element[];
-    /**
-     * Returns an array of all item elements in the Isotope instance.
-     */
-    isotope(methodName: 'getItemElements'): Element[];
-    /**
-     * Lays out all item elements. layout is useful when an item has changed size, and all items need to be laid out again. layout does not apply filtering or sorting.
-     */
-    isotope(methodName: 'layout'): JQuery;
-    /**
-     * Recollects all item elements.
-     * For frameworks like Angular and React, reloadItems may be useful to apply changes to the DOM to Isotope.
-     */
-    isotope(methodName: 'reloadItems'): JQuery;
-    /**
-     * Shuffles items in a random order.
-     */
-    isotope(methodName: 'shuffle'): JQuery;
-    /**
-     * Filters, sorts, and lays out items. Pass in options to apply filtering and sorting.
-     * @param options All options are optional, but itemSelector is recommended. Layout modes have their own separate options.
-     */
-    isotope(options: IsotopeLibrary.IsotopeOptions): JQuery;
+    data(element: HTMLElement | string): Isotope;
+};
+
+declare global {
+    interface JQuery {
+        /**
+         * Get the Isotope instance from a jQuery object. Isotope instances are useful to access Isotope properties.
+         */
+        data(methodName: 'isotope'): Isotope;
+        /**
+         * Lays out specified items.
+         * @param elements Array of Isotope.Items
+         * @param isStill Disables transitions
+         */
+        isotope(methodName: 'layoutItems', elements: HTMLElement[], isStill: boolean): JQuery;
+        /**
+         * Adds item elements to the Isotope instance. addItems does not lay out items like appended, prepended, or insert.
+         * @param elements Element, jQuery Object, NodeList, or Array of Elements
+         */
+        isotope(methodName: 'addItems', elements: Isotope.Elements): JQuery;
+        /**
+         * Adds and lays out newly appended item elements to the end of the layout.
+         * @param elements Element, jQuery Object, NodeList, or Array of Elements
+         */
+        isotope(methodName: 'appended', elements: Isotope.Elements): JQuery;
+        /**
+         * Hide items.
+         * @param elements Element, jQuery Object, NodeList, or Array of Elements
+         */
+        isotope(methodName: 'hideItemElements', elements: Isotope.Elements): JQuery;
+        /**
+         * Appends elements into container element, adds elements as items, and arranges items with filtering and sorting.
+         * @param elements Element, jQuery Object, NodeList, or Array of Elements
+         */
+        isotope(methodName: 'insert', elements: Isotope.Elements): JQuery;
+        /**
+         * Adds and lays out newly prepended item elements at the beginning of layout.
+         * @param elements Element, jQuery Object, NodeList, or Array of Elements
+         */
+        isotope(methodName: 'prepended', elements: Isotope.Elements): JQuery;
+        /**
+         * Removes elements from the Isotope instance and DOM.
+         * @param elements Element, jQuery Object, NodeList, or Array of Elements
+         */
+        isotope(methodName: 'remove', elements: Isotope.Elements): JQuery;
+        /**
+         * Reveals hidden items.
+         * @param elements Element, jQuery Object, NodeList, or Array of Elements
+         */
+        isotope(methodName: 'revealItemElements', elements: Isotope.Elements): JQuery;
+        /**
+         * Stamps elements in the layout. Isotope will lay out item elements around stamped elements.
+         * Stamping is only supported by some layout modes: masonry, packery and masonryhorizontal.
+         * @param elements Element, jQuery Object, NodeList, or Array of Elements
+         */
+        isotope(methodName: 'stamp', elements: Isotope.Elements): JQuery;
+        /**
+         * Un-stamps elements in the layout, so that Isotope will no longer layout item elements around them.
+         * @param elements Element, jQuery Object, NodeList, or Array of Elements
+         */
+        isotope(methodName: 'unstamp', elements: Isotope.Elements): JQuery;
+        /**
+         * Updates sort data
+         * @param elements Element, jQuery Object, NodeList, or Array of Elements
+         */
+        isotope(methodName: 'updateSortData', elements: Isotope.Elements): JQuery;
+        /**
+         * Removes the Isotope functionality completely. destroy will return the element back to its pre-initialized state.
+         */
+        isotope(methodName: 'destroy'): void;
+        /**
+         * Returns an array of filtered item elements in current sorted order.
+         */
+        isotope(methodName: 'getFilteredItemElements'): Element[];
+        /**
+         * Returns an array of all item elements in the Isotope instance.
+         */
+        isotope(methodName: 'getItemElements'): Element[];
+        /**
+         * Lays out all item elements. layout is useful when an item has changed size, and all items need to be laid out again. layout does not apply filtering or sorting.
+         */
+        isotope(methodName: 'layout'): JQuery;
+        /**
+         * Recollects all item elements.
+         * For frameworks like Angular and React, reloadItems may be useful to apply changes to the DOM to Isotope.
+         */
+        isotope(methodName: 'reloadItems'): JQuery;
+        /**
+         * Shuffles items in a random order.
+         */
+        isotope(methodName: 'shuffle'): JQuery;
+        /**
+         * Filters, sorts, and lays out items. Pass in options to apply filtering and sorting.
+         * @param options All options are optional, but itemSelector is recommended. Layout modes have their own separate options.
+         */
+        isotope(options: Isotope.IsotopeOptions): JQuery;
+    }
 }
diff --git a/types/isotope-layout/isotope-layout-tests.ts b/types/isotope-layout/isotope-layout-tests.ts
index 998e8b0392..776412b2c2 100644
--- a/types/isotope-layout/isotope-layout-tests.ts
+++ b/types/isotope-layout/isotope-layout-tests.ts
@@ -1,3 +1,4 @@
+/// <reference types="jquery"/>
 /* inspired by documentation at http://isotope.metafizzy.co/ */
 
 // test all options

From 6cd2cfa3ff55cd7ddb79d279e99c72d57a5eec0d Mon Sep 17 00:00:00 2001
From: Art <a.molcanovas@gmail.com>
Date: Thu, 15 Feb 2018 22:34:11 +0000
Subject: [PATCH 077/388] Update index.d.ts

Make .lean() return Query<any> so we can properly cast it to whatever we need
---
 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 cb8ca38408..264060bb38 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1598,7 +1598,7 @@ declare module "mongoose" {
      * getters/setters or other Mongoose magic applied.
      * @param bool defaults to true
      */
-    lean(bool?: boolean): Query<object>;
+    lean(bool?: boolean): Query<any>;
 
     /** Specifies the maximum number of documents the query will return. Cannot be used with distinct() */
     limit(val: number): this;

From bc6d4d82fca9f0e951875bade1293998b4981bb9 Mon Sep 17 00:00:00 2001
From: Will Sabransky <will.sabransky@postmates.com>
Date: Thu, 15 Feb 2018 14:37:15 -0800
Subject: [PATCH 078/388] Fix incorrect style props and add API method

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

diff --git a/types/react-geosuggest/index.d.ts b/types/react-geosuggest/index.d.ts
index 8a06859b53..30db05ddb0 100644
--- a/types/react-geosuggest/index.d.ts
+++ b/types/react-geosuggest/index.d.ts
@@ -13,6 +13,7 @@ export default class Geosuggest extends Component<GeosuggestProps> {
     blur(): void;
     update(value: string): void;
     clear(): void;
+    selectSuggest(): void;
 }
 
 export interface GeosuggestProps extends InputHTMLAttributes<HTMLInputElement> {
@@ -50,8 +51,8 @@ export interface GeosuggestProps extends InputHTMLAttributes<HTMLInputElement> {
     label?: string;
     suggestsClassName?: string;
     suggestsHiddenClassName?: string;
-    suggestsItemClassName?: string;
-    suggestsItemActiveClassName?: string;
+    suggestItemClassName?: string;
+    suggestItemActiveClassName?: string;
     autoComplete?: string;
 }
 
diff --git a/types/react-geosuggest/react-geosuggest-tests.tsx b/types/react-geosuggest/react-geosuggest-tests.tsx
index 72fe93c9da..6969e50ac8 100644
--- a/types/react-geosuggest/react-geosuggest-tests.tsx
+++ b/types/react-geosuggest/react-geosuggest-tests.tsx
@@ -67,8 +67,8 @@ class ReactGeosuggest extends React.Component {
                     style={styles}
                     suggestsClassName="suggestsClassName"
                     suggestsHiddenClassName="suggestsHiddenClassName"
-                    suggestsItemActiveClassName="suggestsItemActiveClassName"
-                    suggestsItemClassName="suggestsItemClassName"
+                    suggestItemActiveClassName="suggestItemActiveClassName"
+                    suggestItemClassName="suggestItemClassName"
                     types={["geocode", "(regions)"]}
                 />
 

From 1a51a3acf7cf3f0dbd16e9f6658c7fe90e3e4a91 Mon Sep 17 00:00:00 2001
From: Avi Vahl <avi.vahl@wix.com>
Date: Fri, 16 Feb 2018 00:49:06 +0200
Subject: [PATCH 079/388] Add proxy file for light hls.js dist allows importing
 Hls directly from the light file with type safety

---
 types/hls.js/dist/hls.light.d.ts | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 types/hls.js/dist/hls.light.d.ts

diff --git a/types/hls.js/dist/hls.light.d.ts b/types/hls.js/dist/hls.light.d.ts
new file mode 100644
index 0000000000..5795b12091
--- /dev/null
+++ b/types/hls.js/dist/hls.light.d.ts
@@ -0,0 +1,2 @@
+import Hls = require("../index");
+export = Hls;

From 6aa8712fd31366a643db6abdcfb1d3da2f98647b Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Fri, 16 Feb 2018 00:17:19 -0800
Subject: [PATCH 080/388] Fixed range for styled-component.

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

diff --git a/types/grid-styled/package.json b/types/grid-styled/package.json
index c381522c0d..f8a379b117 100644
--- a/types/grid-styled/package.json
+++ b/types/grid-styled/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "styled-components": ">=2.0 || >=3.0"
+        "styled-components": "2.x - 3.x"
     }
 }

From 0c37383d3eb7ec5984f78e84e938d8ea669c4519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nenad=20Vi=C4=87enti=C4=87?= <vicentic@immounited.com>
Date: Fri, 16 Feb 2018 09:54:44 +0100
Subject: [PATCH 081/388] `MarkerCluster` and `MarkerClusterGroup` should be
 classes, to be consistent with definitions of similar layers in Leaflet.ts
 (`TileLayer`, `GridLayer`, etc...). Using `interface` definitions also breaks
 inheritance chain.

---
 types/leaflet.markercluster/index.d.ts        |  4 +--
 .../leaflet.markercluster-tests.ts            | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/types/leaflet.markercluster/index.d.ts b/types/leaflet.markercluster/index.d.ts
index e2f317dd46..4bcf268da6 100644
--- a/types/leaflet.markercluster/index.d.ts
+++ b/types/leaflet.markercluster/index.d.ts
@@ -7,7 +7,7 @@
 import * as L from 'leaflet';
 
 declare module 'leaflet' {
-    interface MarkerCluster extends Marker {
+    class MarkerCluster extends Marker {
         /*
         * Recursively retrieve all child markers of this cluster.
         */
@@ -117,7 +117,7 @@ declare module 'leaflet' {
         chunkDelay?: number;
     }
 
-    interface MarkerClusterGroup extends FeatureGroup {
+    class MarkerClusterGroup extends FeatureGroup {
         /*
         * Bulk methods for adding and removing markers and should be favoured over the
         * single versions when doing bulk addition/removal of markers.
diff --git a/types/leaflet.markercluster/leaflet.markercluster-tests.ts b/types/leaflet.markercluster/leaflet.markercluster-tests.ts
index aeee213ca5..cc54bb1163 100644
--- a/types/leaflet.markercluster/leaflet.markercluster-tests.ts
+++ b/types/leaflet.markercluster/leaflet.markercluster-tests.ts
@@ -81,3 +81,34 @@ markerClusterGroup.zoomToShowLayer(marker, () => {});
 let hasLayer: boolean;
 hasLayer = markerClusterGroup.hasLayer(layer);
 hasLayer = markerClusterGroup.hasLayer(marker);
+
+// inheritance
+const Subclass1 = L.MarkerClusterGroup.extend({
+    myFunction() {}
+});
+class Subclass2 extends L.MarkerClusterGroup {
+    myFunction() {}
+}
+const Subclass3 = L.MarkerCluster.extend({
+    myFunction() {}
+});
+class Subclass4 extends L.MarkerCluster {
+    myFunction() {}
+}
+
+const s1 = new Subclass1(); // any
+const s2 = new Subclass2();
+const s3 = new Subclass3(); // any
+const s4 = new Subclass4([1, 2]);
+
+// call subclass function
+s1.myFunction();
+s2.myFunction();
+s3.myFunction();
+s4.myFunction();
+
+// call base class function
+s1.refreshClusters();
+s2.refreshClusters();
+s3.getAllChildMarkers();
+s4.getAllChildMarkers();

From ceef045943bd055e8bdb8da169ca1f623c1d028a Mon Sep 17 00:00:00 2001
From: Nicholas Rahn <nick@transparentech.com>
Date: Fri, 16 Feb 2018 09:56:52 +0100
Subject: [PATCH 082/388] @types/highchart Add support for fontMetrics method
 on RendererObject.

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

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index c63c99a3c5..347c82576d 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -6553,6 +6553,13 @@ declare namespace Highcharts {
          * @since 5.0.0
          */
         definition(def: object): ElementObject;
+        /**
+         * Utility to return the baseline offset and total line height from the font size.
+         *
+         * @param fontSize The current font size to inspect. If not given, the font size will be found from the DOM element.
+         * @param elem The element to inspect for a current font size.
+         */
+        fontMetrics(fontSize: string, elem: ElementObject): FontMetrics;
         /**
          * Add an SVG/VML group.
          * @param [string] name The name of the group. This will be used in the class name, which will be 'highcharts-'+ name.
@@ -6615,6 +6622,21 @@ declare namespace Highcharts {
         text(str: string, x: number, y: number): ElementObject;
     }
 
+    interface FontMetrics {
+        /**
+         * The baseline relative to the top of the box.
+         */
+        b: number;
+        /**
+         * The font size.
+         */
+        f: number;
+        /**
+         * The line height.
+         */
+        h: number;
+    }
+
     interface Renderer {
         new (parentNode: HTMLElement, width: number, height: number): RendererObject;
     }

From fc80a44bfeb69a8de8eb2883ee1711763079823d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=BCmay=20=C3=87eber?= <tumayceber@gmail.com>
Date: Fri, 16 Feb 2018 13:34:40 +0300
Subject: [PATCH 083/388] requested changes

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

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index da4714d59f..122de69b7f 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -2435,9 +2435,8 @@ declare module "mongoose" {
      * If a callback is not passed, the aggregate itself is returned.
      * @param aggregations pipeline operator(s) or operator array
      */
-    aggregate(): Aggregate<any[]>;
-    aggregate(aggregations: any[]): Aggregate<any[]>;
-    aggregate(aggregations: any[], cb: Function): Promise<any[]>;
+    aggregate(aggregations?: any[]): Aggregate<any[]>;
+    aggregate(aggregations: any[], cb?: Function): Promise<any[]>;
 
     /** Counts number of matching documents in a database collection. */
     count(conditions: any, callback?: (err: any, count: number) => void): Query<number>;

From bec06b6e115b7dc8269df52953bcd7cfdbe6a522 Mon Sep 17 00:00:00 2001
From: Avi Vahl <avi.vahl@wix.com>
Date: Fri, 16 Feb 2018 13:27:12 +0200
Subject: [PATCH 084/388] Add new hls.light.d.ts to tsconfig.json's list

---
 types/hls.js/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/hls.js/tsconfig.json b/types/hls.js/tsconfig.json
index ed68ee32f3..17aacd07df 100644
--- a/types/hls.js/tsconfig.json
+++ b/types/hls.js/tsconfig.json
@@ -19,6 +19,7 @@
     },
     "files": [
         "index.d.ts",
+        "dist/hls.light.d.ts",
         "hls.js-tests.ts"
     ]
 }
\ No newline at end of file

From 8f35c97473e5fda1ccb4b7392c3f8cc3089ba0bb Mon Sep 17 00:00:00 2001
From: Michael Williamson <michael@healx.io>
Date: Fri, 16 Feb 2018 11:41:21 +0000
Subject: [PATCH 085/388] Cytoscape: fix filter() signature

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

diff --git a/types/cytoscape/index.d.ts b/types/cytoscape/index.d.ts
index ad0c8de371..b04ac2276e 100644
--- a/types/cytoscape/index.d.ts
+++ b/types/cytoscape/index.d.ts
@@ -427,7 +427,7 @@ declare namespace cytoscape {
         /**
          * Get elements in the graph matching the specified selector or filter function.
          */
-        filter(selector: Selector | ((i: number, ele: Singular) => boolean)): CollectionElements;
+        filter(selector: Selector | ((ele: Singular, i: number, eles: CollectionElements) => boolean)): CollectionElements;
 
         /**
          * Allow for manipulation of elements without triggering multiple style calculations or multiple redraws.
@@ -2231,7 +2231,7 @@ declare namespace cytoscape {
          * ele - The element being considered.
          * http://js.cytoscape.org/#eles.filter
          */
-        filter(selector: Selector | ((i: number, ele: CollectionElements) => boolean)): CollectionElements;
+        filter(selector: Selector | ((ele: Singular, i: number, eles: CollectionElements) => boolean)): CollectionElements;
         /**
          * Get the nodes that match the specified selector.
          *

From 0a53cd74f51582904f200e342fece664cb932e1b Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Date: Fri, 16 Feb 2018 12:53:09 +0100
Subject: [PATCH 086/388] ora: `promise` method should belong to `oraFactory`,
 not `Ora` class.

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

diff --git a/types/ora/index.d.ts b/types/ora/index.d.ts
index 05c4c9b460..f5dd605073 100644
--- a/types/ora/index.d.ts
+++ b/types/ora/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Basarat Ali Syed <https://github.com/basarat>
 //                 Christian Rackerseder <https://github.com/screendriver>
 //                 BendingBender <https://github.com/BendingBender>
+//                 Aleh Zasypkin <https://github.com/azasypkin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -118,14 +119,14 @@ declare class Ora {
     text: string;
 
     color: Color;
-
-    promise(action: PromiseLike<any>, options?: Options | string): Ora;
 }
 
 interface oraFactory {
     (options?: Options | string): Ora;
 
     new (options?: Options | string): Ora;
+
+    promise(action: PromiseLike<any>, options?: Options | string): Ora;
 }
 
 declare const ora: oraFactory;
diff --git a/types/ora/ora-tests.ts b/types/ora/ora-tests.ts
index ca5db9d70d..56a0d498c3 100644
--- a/types/ora/ora-tests.ts
+++ b/types/ora/ora-tests.ts
@@ -41,7 +41,7 @@ spinner.stopAndPersist({text: 'all done'});
 spinner.stopAndPersist({symbol: '@', text: 'all done'});
 
 const resolves = Promise.resolve(1);
-spinner.promise(resolves, {
+Ora.promise(resolves, {
     stream: new PassThrough(),
     text: 'foo',
     color: 'blue',

From 724e21e0edd6c37abeb11b888c1e228c4a3f5171 Mon Sep 17 00:00:00 2001
From: alasdair-macleod <alasdair.macleod@ufl.edu>
Date: Fri, 16 Feb 2018 10:15:58 -0500
Subject: [PATCH 087/388] Add definitions for kronecker product function kron.
 This calculates the kronecker product of two matrices or vectors.

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

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index fa39c8b0d5..ad3dec6d75 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -229,6 +229,13 @@ declare namespace mathjs {
 		hypot(...args: number[]): number;
 		hypot(...args: BigNumber[]): BigNumber;
 
+        /**
+         * Calculate the kronecker product of two matrices or vectors
+         * @param x First Matrix
+         * @param y Second Matrix
+         */
+        kron(x: Matrix|MathArray, y: Matrix|MathArray): Matrix;
+
 		/**
 		 * 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)
@@ -1656,6 +1663,13 @@ declare namespace mathjs {
 		hypot(...args: number[]): IMathJsChain;
 		hypot(...args: BigNumber[]): IMathJsChain;
 
+        /**
+         * 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;
+
 		/**
 		 * 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)

From aa9e921b860c43c36cd199e6b051416b13ad8526 Mon Sep 17 00:00:00 2001
From: Rob Moran <rob.moran@arm.com>
Date: Fri, 16 Feb 2018 16:06:03 +0000
Subject: [PATCH 088/388] loadImage and importImage can also accept streams

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

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index 094584dfec..9256134c76 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -837,13 +837,13 @@ declare class Dockerode {
   createImage(options: {}): Promise<Dockerode.Image>;
   createImage(auth: any, options: {}): Promise<Dockerode.Image>;
 
-  loadImage(file: string, options: {}, callback: Callback<any>): void;
-  loadImage(file: string, callback: Callback<any>): void;
-  loadImage(file: string, options?: {}): Promise<any>;
+  loadImage(file: string | NodeJS.ReadableStream, options: {}, callback: Callback<any>): void;
+  loadImage(file: string | NodeJS.ReadableStream, callback: Callback<any>): void;
+  loadImage(file: string | NodeJS.ReadableStream, options?: {}): Promise<any>;
 
-  importImage(file: string, options: {}, callback: Callback<any>): void;
-  importImage(file: string, callback: Callback<any>): void;
-  importImage(file: string, options?: {}): Promise<any>;
+  importImage(file: string | NodeJS.ReadableStream, options: {}, callback: Callback<any>): void;
+  importImage(file: string | NodeJS.ReadableStream, callback: Callback<any>): void;
+  importImage(file: string | NodeJS.ReadableStream, options?: {}): Promise<any>;
 
   checkAuth(options: any, callback: Callback<any>): void;
   checkAuth(options: any): Promise<any>;

From d0e71f615e10c5d21086e851340f2b2e43912cb1 Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Fri, 16 Feb 2018 11:07:54 -0500
Subject: [PATCH 089/388] Update passport-tests.ts

https://stackoverflow.com/questions/40349987/how-to-suppress-typescript-error-ts2533-object-is-possibly-null-or-undefine
---
 types/passport/passport-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index 49b2436333..9cd246e7f5 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -148,7 +148,7 @@ declare global {
 
 app.use((req: express.Request, res: express.Response, next: (err?: any) => void) => {
     if (req.user) {
-        req.user.username = "hello user";
+        req.user!.username = "hello user";
     }
     next();
 });

From 63f6f7484709e475cccae7edebee53181892cd9d Mon Sep 17 00:00:00 2001
From: Rob Moran <rob.moran@arm.com>
Date: Fri, 16 Feb 2018 16:10:01 +0000
Subject: [PATCH 090/388] Added contributor

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

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index 9256134c76..b38072b69b 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -5,6 +5,7 @@
 //                 ByeongHun Yoo <https://github.com/isac322>
 //                 Ray Fang <https://github.com/lazarusx>
 //                 Marius Meisenzahl <https://github.com/meisenzahl>
+//                 Rob Moran <https://github.com/thegecko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From 1d61b414bbafcddec38b568ab8f8033bf6a408fa Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Fri, 16 Feb 2018 11:14:17 -0500
Subject: [PATCH 091/388] Update passport-tests.ts

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

diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index 9cd246e7f5..23058684a7 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -148,7 +148,9 @@ declare global {
 
 app.use((req: express.Request, res: express.Response, next: (err?: any) => void) => {
     if (req.user) {
-        req.user!.username = "hello user";
+        if (req.user.username) {
+            req.user.username = "hello user";
+        }
     }
     next();
 });

From aed892f99e6351ecbb091fb962d7e5f2704e3923 Mon Sep 17 00:00:00 2001
From: Stan Goldmann <goldmann@traum-ferienwohnungen.de>
Date: Fri, 16 Feb 2018 17:32:11 +0100
Subject: [PATCH 092/388] Export as default function

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

diff --git a/types/anybar/anybar-tests.ts b/types/anybar/anybar-tests.ts
index 6b4ea8ef89..9577c6a7de 100644
--- a/types/anybar/anybar-tests.ts
+++ b/types/anybar/anybar-tests.ts
@@ -1,4 +1,4 @@
-import * as anybar from 'anybar'
+import anybar from 'anybar'
 
 anybar('red', { port: 123 })
 
diff --git a/types/anybar/index.d.ts b/types/anybar/index.d.ts
index 4972f29756..b42bcb3e40 100644
--- a/types/anybar/index.d.ts
+++ b/types/anybar/index.d.ts
@@ -5,6 +5,4 @@
 
 declare namespace anybar { }
 
-declare function anybar(color: string, options?: { port: number }): void
-
-export = anybar
+export default function anybar(color: string, options?: { port: number }): void

From a571fadbf55bbed1bce83bbc44991f715f36ba7f Mon Sep 17 00:00:00 2001
From: Stan Goldmann <goldmann@traum-ferienwohnungen.de>
Date: Fri, 16 Feb 2018 17:32:11 +0100
Subject: [PATCH 093/388] Export as default function

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

diff --git a/types/anybar/index.d.ts b/types/anybar/index.d.ts
index b42bcb3e40..083dff9b44 100644
--- a/types/anybar/index.d.ts
+++ b/types/anybar/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for anybar 2.0.1
+// Type definitions for anybar 3.0.0
 // Project: https://github.com/sindresorhus/anybar
 // Definitions by: Chris Khoo <https://github.com/khoomeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 891d2682f05c6ca9219454c94830d61dd392df13 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 16 Feb 2018 10:35:12 -0800
Subject: [PATCH 094/388] knockout: Remove unnecessary type references in tests

---
 types/knockout/test/index.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/knockout/test/index.ts b/types/knockout/test/index.ts
index 36db7657ed..9bdd4f2748 100644
--- a/types/knockout/test/index.ts
+++ b/types/knockout/test/index.ts
@@ -1,6 +1,3 @@
-/// <reference types="knockout.postbox" />
-/// <reference types="knockout.mapping" />
-
 declare var $;
 
 function test_creatingVMs() {

From 8a2ab1a1ed54264bc78a94fa9ebeb3395fd2b123 Mon Sep 17 00:00:00 2001
From: ZheyangSong <jerome_soung@hotmail.com>
Date: Fri, 16 Feb 2018 10:46:25 -0800
Subject: [PATCH 095/388] Fix Wrong Formatter Type of <Legend />

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 207471eba3..ae13044035 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -13,6 +13,7 @@ import { CurveFactory } from 'd3-shape';
 
 export type Percentage = string;
 export type RechartsFunction = (...args: any[]) => void;
+export type LegendValueFormatter = (value?: LegendPayload['value'], entry?: LegendPayload, i?: number) => any;
 export type TickFormatterFunction = (value: any) => any;
 export type TickGeneratorFunction = (noTicksProps: object) => any[];
 export type LabelFormatter = (label: string | number) => React.ReactNode;
@@ -370,7 +371,7 @@ export interface LegendProps {
     verticalAlign?: 'top' | 'middle' | 'bottom';
     margin?: Partial<Margin>;
     payload?: LegendPayload[];
-    formatter?: RechartsFunction;
+    formatter?: LegendValueFormatter;
     onClick?: RechartsFunction;
     onMouseEnter?: RechartsFunction;
     onMouseLeave?: RechartsFunction;

From 762a9a1e1c9060f3c83629b9f7d905e4eb42b7f8 Mon Sep 17 00:00:00 2001
From: aldentaylor <aldentaylor@gmail.com>
Date: Fri, 16 Feb 2018 15:05:46 -0800
Subject: [PATCH 096/388] Update index.d.ts

Added Transaction to QueryInterfaceOptions to allow use of Transactions in calls using QueryInterfaceOptions
---
 types/sequelize/index.d.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 4de155e6ee..b6480c802e 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -4061,7 +4061,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; 
 
     }
 

From 8b0ad3367aad198e0aebeb1af7c7d093d25c7801 Mon Sep 17 00:00:00 2001
From: Edgar Simson <edgar.simson@orangelv.com>
Date: Sat, 17 Feb 2018 04:07:02 +0200
Subject: [PATCH 097/388] Require TS 2.1 for maker.js because of opentype.js

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

diff --git a/types/maker.js/index.d.ts b/types/maker.js/index.d.ts
index ff6a7bd69e..e8be054a36 100644
--- a/types/maker.js/index.d.ts
+++ b/types/maker.js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Microsoft/maker.js
 // Definitions by: Dan Marshall <https://github.com/danmarshall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="pdfkit" />
 /// <reference types="bezier-js" />

From 2da5be97e5e747f2437d72b63e43083637e615e6 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Sat, 17 Feb 2018 13:56:01 +0900
Subject: [PATCH 098/388] Add name member to Database interface.

Looking at the PouchDB source, this member is always set[1] (earlier in that function we throw if the name is not a string).

[1] https://github.com/pouchdb/pouchdb/blob/master/packages/node_modules/pouchdb-core/src/constructor.js#L68
---
 types/pouchdb-core/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index 59e5650e62..af9fed83a2 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -581,6 +581,9 @@ declare namespace PouchDB {
     }
 
     interface Database<Content extends {} = {}>  {
+        /** The name passed to the PouchDB constructor and unique identifier of the database. */
+        name: string;
+
         /** Fetch all documents matching the given options. */
         allDocs<Model>(options?: Core.AllDocsWithKeyOptions | Core.AllDocsWithKeysOptions | Core.AllDocsWithinRangeOptions | Core.AllDocsOptions):
             Promise<Core.AllDocsResponse<Content & Model>>;

From 514d6d0ec215226c16d1c8889b6c197950e8d6f6 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Sat, 17 Feb 2018 15:17:13 +0900
Subject: [PATCH 099/388] Fix the return type of pouchdb-core's bulkDocs to
 include Error values

As per [1]:

> The response contains an array of the familiar ok/rev/id from the
> put()/post() API. If there are any errors, they will be provided
> individually

Demo: https://square-shape.glitch.me/

[1] https://pouchdb.com/api.html#batch_create
---
 types/pouchdb-core/index.d.ts            |  4 ++--
 types/pouchdb-core/pouchdb-core-tests.ts | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index 59e5650e62..01c7a0045c 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -594,7 +594,7 @@ declare namespace PouchDB {
          */
         bulkDocs<Model>(docs: Array<Core.PutDocument<Content & Model>>,
                         options: Core.BulkDocsOptions | null,
-                        callback: Core.Callback<Core.Response[]>): void;
+                        callback: Core.Callback<Array<Core.Response | Core.Error>>): void;
 
         /**
          * Create, update or delete multiple documents. The docs argument is an array of documents.
@@ -604,7 +604,7 @@ declare namespace PouchDB {
          * Finally, to delete a document, include a _deleted parameter with the value true.
          */
         bulkDocs<Model>(docs: Array<Core.PutDocument<Content & Model>>,
-                        options?: Core.BulkDocsOptions): Promise<Core.Response[]>;
+                        options?: Core.BulkDocsOptions): Promise<Array<Core.Response | Core.Error >>;
 
         /** Compact the database */
         compact(options?: Core.CompactOptions): Promise<Core.Response>;
diff --git a/types/pouchdb-core/pouchdb-core-tests.ts b/types/pouchdb-core/pouchdb-core-tests.ts
index 79a151aa3a..fe79997461 100644
--- a/types/pouchdb-core/pouchdb-core-tests.ts
+++ b/types/pouchdb-core/pouchdb-core-tests.ts
@@ -47,10 +47,19 @@ function testBulkDocs() {
     const model = { property: 'test' };
     const model2 = { property: 'test' };
 
+    const isError = (
+        result: PouchDB.Core.Response | PouchDB.Core.Error
+    ): result is PouchDB.Core.Error => {
+        return !!(<PouchDB.Core.Error> result).error;
+    };
+
     db.bulkDocs([model, model2]).then((result) => {
-        result.forEach(({ ok, id, rev }) => {
+        result.forEach(result => {
+          if (!isError(result)) {
+            const { ok, id, rev } = result;
             isString(id);
             isString(rev);
+          }
         });
     });
 

From 214cbdcda00746631641680a87d370f1df4db5e1 Mon Sep 17 00:00:00 2001
From: mtgto <hogerappa@gmail.com>
Date: Sat, 17 Feb 2018 17:09:55 +0900
Subject: [PATCH 100/388] [copy-webpack-plugin] enable dt-header rule.

---
 types/copy-webpack-plugin/index.d.ts  | 2 +-
 types/copy-webpack-plugin/tslint.json | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/copy-webpack-plugin/index.d.ts b/types/copy-webpack-plugin/index.d.ts
index 35150a5e72..8dd6aeb8f8 100644
--- a/types/copy-webpack-plugin/index.d.ts
+++ b/types/copy-webpack-plugin/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for copy-webpack-plugin v4.4.1
+// Type definitions for copy-webpack-plugin 4.4
 // Project: https://github.com/kevlened/copy-webpack-plugin
 // Definitions by: flying-sheep <https://github.com/flying-sheep>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/copy-webpack-plugin/tslint.json b/types/copy-webpack-plugin/tslint.json
index a41bf5d19a..a0357daa61 100644
--- a/types/copy-webpack-plugin/tslint.json
+++ b/types/copy-webpack-plugin/tslint.json
@@ -7,7 +7,6 @@
         "ban-types": false,
         "callable-types": false,
         "comment-format": false,
-        "dt-header": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,

From 6ce7d76242d00983b26675291702521ddd5d5310 Mon Sep 17 00:00:00 2001
From: Klaus Meinhardt <klaus.meinhardt1@gmail.com>
Date: Sat, 17 Feb 2018 11:23:32 +0100
Subject: [PATCH 101/388] resolve: add option preserveSymlinks

---
 types/resolve/index.d.ts | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/types/resolve/index.d.ts b/types/resolve/index.d.ts
index 11a46b97a3..af32bf4097 100644
--- a/types/resolve/index.d.ts
+++ b/types/resolve/index.d.ts
@@ -63,40 +63,46 @@ declare function resolveSync(id: string, opts?: resolve.SyncOpts): string;
 
 /**
  * Return whether a package is in core
- *
- * @param id
  */
-declare function resolveIsCore(id: string): boolean;
+declare function resolveIsCore(id: string): boolean | undefined;
 
 declare namespace resolve {
   interface Opts {
-    // directory to begin resolving from (defaults to __dirname)
+    /** directory to begin resolving from (defaults to __dirname) */
     basedir?: string;
-    // package.json data applicable to the module being loaded
+    /** package.json data applicable to the module being loaded */
     package?: any;
-    // array of file extensions to search in order (defaults to ['.js'])
+    /** array of file extensions to search in order (defaults to ['.js']) */
     extensions?: string | string[];
-    // transform the parsed package.json contents before looking at the "main" field
+    /** transform the parsed package.json contents before looking at the "main" field */
     packageFilter?: (pkg: any, pkgfile: string) => any;
-    // transform a path within a package
+    /** transform a path within a package */
     pathFilter?: (pkg: any, path: string, relativePath: string) => string;
-    // require.paths array to use if nothing is found on the normal node_modules recursive walk (probably don't use this)
+    /** require.paths array to use if nothing is found on the normal node_modules recursive walk (probably don't use this) */
     paths?: string | string[];
-    // directory (or directories) in which to recursively look for modules. (default to 'node_modules')
+    /** directory (or directories) in which to recursively look for modules. (default to 'node_modules') */
     moduleDirectory?: string | string[]
+    /**
+     * if true, doesn't resolve `basedir` to real path before resolving.
+     * This is the way Node resolves dependencies when executed with the --preserve-symlinks flag.
+     *
+     * Note: this property is currently true by default but it will be changed to false in the next major version because Node's resolution
+     * algorithm does not preserve symlinks by default.
+    */
+    preserveSymlinks?: boolean;
   }
 
   export interface AsyncOpts extends Opts {
-    // how to read files asynchronously (defaults to fs.readFile)
+    /** how to read files asynchronously (defaults to fs.readFile) */
     readFile?: (file: string, cb: readFileCallback) => void;
-    // function to asynchronously test whether a file exists
+    /** function to asynchronously test whether a file exists */
     isFile?: (file: string, cb: isFileCallback) => void;
   }
 
   export interface SyncOpts extends Opts {
-    // how to read files synchronously (defaults to fs.readFileSync)
+    /** how to read files synchronously (defaults to fs.readFileSync) */
     readFileSync?: (file: string, charset: string) => string | Buffer;
-    // function to synchronously test whether a file exists
+    /** function to synchronously test whether a file exists */
     isFile?: (file: string) => boolean;
   }
 

From a1133810eba5485839de5f14c164e5b7f4cdb508 Mon Sep 17 00:00:00 2001
From: Klaus Meinhardt <klaus.meinhardt1@gmail.com>
Date: Sat, 17 Feb 2018 11:26:27 +0100
Subject: [PATCH 102/388] Add test

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

diff --git a/types/resolve/resolve-tests.ts b/types/resolve/resolve-tests.ts
index 1ebaa5bfb4..909d2a77b3 100644
--- a/types/resolve/resolve-tests.ts
+++ b/types/resolve/resolve-tests.ts
@@ -41,7 +41,8 @@ function test_options_async() {
           return cb(null, stat.isFile());
         }
       });
-    }
+    },
+    preserveSymlinks: false,
   }, function(error, resolved, pkg) {
     if (error) {
       console.error(error.message);
@@ -72,7 +73,8 @@ function test_options_sync() {
       } catch (error) {
         return false;
       }
-    }
+    },
+    preserveSymlinks: true,
   });
   console.log(resolved);
   resolved = resolve.sync('typescript', {

From 82b376579b672f7c532e81379a5e463bc0c02acc Mon Sep 17 00:00:00 2001
From: Pierre Marchand <pierremarc07@gmail.com>
Date: Sat, 17 Feb 2018 11:39:07 +0100
Subject: [PATCH 103/388] fixed version format

---
 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 8ed1a2ffbd..b7073bcda2 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for OpenLayers v4.6.0
+// Type definitions for OpenLayers 4.6
 // Project: http://openlayers.org/
 // Definitions by: Olivier Sechet <https://github.com/osechet>
 //                 Bin Wang <https://github.com/wb14123>

From 08d820c93bfd29652e4bf4daab50a4e28934555e Mon Sep 17 00:00:00 2001
From: chenyang <cyupdev@gmail.com>
Date: Sat, 17 Feb 2018 19:52:34 +0800
Subject: [PATCH 104/388] Added new type definition for aoo-root-dir

---
 types/app-root-dir/app-root-dir-tests.ts |  7 +++++++
 types/app-root-dir/index.d.ts            | 21 +++++++++++++++++++++
 types/app-root-dir/tsconfig.json         | 23 +++++++++++++++++++++++
 types/app-root-dir/tslint.json           |  3 +++
 4 files changed, 54 insertions(+)
 create mode 100644 types/app-root-dir/app-root-dir-tests.ts
 create mode 100644 types/app-root-dir/index.d.ts
 create mode 100644 types/app-root-dir/tsconfig.json
 create mode 100644 types/app-root-dir/tslint.json

diff --git a/types/app-root-dir/app-root-dir-tests.ts b/types/app-root-dir/app-root-dir-tests.ts
new file mode 100644
index 0000000000..eecfc42d03
--- /dev/null
+++ b/types/app-root-dir/app-root-dir-tests.ts
@@ -0,0 +1,7 @@
+import * as rootDir from 'app-root-dir'
+
+let appRootPath: string
+
+rootDir.set(__dirname)
+appRootPath = rootDir.get()
+
diff --git a/types/app-root-dir/index.d.ts b/types/app-root-dir/index.d.ts
new file mode 100644
index 0000000000..9c7fb51cbc
--- /dev/null
+++ b/types/app-root-dir/index.d.ts
@@ -0,0 +1,21 @@
+import { interfaceExtends } from '../babel-types/index.d'
+// Type definitions for [ app-root-dir ] [ 1.0.2 ]
+// Project : [ https://github.com/philidem/node-app-root-dir ]
+// Definitions by: shaochenyang <https://github.com/chenyang-biu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface AppRootDir {
+  // Get the application's root directory
+  get(): string
+  /**
+   * Set the application's root directory
+   *    this will set a global so that no matter
+   *    how many instances of app-root-dir module are installed,
+   *    they will all return the same directory
+   */
+  set(dirname: string): void
+}
+
+declare const AppRootDir: AppRootDir
+
+export = AppRootDir
diff --git a/types/app-root-dir/tsconfig.json b/types/app-root-dir/tsconfig.json
new file mode 100644
index 0000000000..c3a03ef0b7
--- /dev/null
+++ b/types/app-root-dir/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": ["node"],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "app-root-dir-tests.ts"
+    ]
+}
diff --git a/types/app-root-dir/tslint.json b/types/app-root-dir/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/app-root-dir/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}

From 78a202e81dd7546e0fa6e4747495db1f4bb4a3fb Mon Sep 17 00:00:00 2001
From: chenyang <cyupdev@gmail.com>
Date: Sat, 17 Feb 2018 20:28:04 +0800
Subject: [PATCH 105/388] fix: 1.add semicolon 2. tsconfig.types set to [] 3.
 Correct the  index.d.ts header format

---
 types/app-root-dir/app-root-dir-tests.ts |  9 ++++-----
 types/app-root-dir/index.d.ts            | 13 ++++++-------
 types/app-root-dir/tsconfig.json         |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/types/app-root-dir/app-root-dir-tests.ts b/types/app-root-dir/app-root-dir-tests.ts
index eecfc42d03..bff8969927 100644
--- a/types/app-root-dir/app-root-dir-tests.ts
+++ b/types/app-root-dir/app-root-dir-tests.ts
@@ -1,7 +1,6 @@
-import * as rootDir from 'app-root-dir'
+import * as rootDir from 'app-root-dir';
 
-let appRootPath: string
-
-rootDir.set(__dirname)
-appRootPath = rootDir.get()
+let appRootPath: string;
 
+rootDir.set('__dirname');
+appRootPath = rootDir.get();
diff --git a/types/app-root-dir/index.d.ts b/types/app-root-dir/index.d.ts
index 9c7fb51cbc..8b0bf5bc6a 100644
--- a/types/app-root-dir/index.d.ts
+++ b/types/app-root-dir/index.d.ts
@@ -1,21 +1,20 @@
-import { interfaceExtends } from '../babel-types/index.d'
-// Type definitions for [ app-root-dir ] [ 1.0.2 ]
-// Project : [ https://github.com/philidem/node-app-root-dir ]
+// Type definitions for app-root-dir 0.1
+// Project: https://github.com/philidem/node-app-root-dir
 // Definitions by: shaochenyang <https://github.com/chenyang-biu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface AppRootDir {
   // Get the application's root directory
-  get(): string
+  get(): string;
   /**
    * Set the application's root directory
    *    this will set a global so that no matter
    *    how many instances of app-root-dir module are installed,
    *    they will all return the same directory
    */
-  set(dirname: string): void
+  set(dirname: string): void;
 }
 
-declare const AppRootDir: AppRootDir
+declare const AppRootDir: AppRootDir;
 
-export = AppRootDir
+export = AppRootDir;
diff --git a/types/app-root-dir/tsconfig.json b/types/app-root-dir/tsconfig.json
index c3a03ef0b7..9fc4a91fff 100644
--- a/types/app-root-dir/tsconfig.json
+++ b/types/app-root-dir/tsconfig.json
@@ -12,7 +12,7 @@
         "typeRoots": [
             "../"
         ],
-        "types": ["node"],
+        "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },

From 25103578d893591f45f32a149dd7b8d3c25fc2ac Mon Sep 17 00:00:00 2001
From: Tobias Lidskog <tobias@lidskog.se>
Date: Sat, 17 Feb 2018 13:57:24 +0100
Subject: [PATCH 106/388] Allow null for cache data, according to HAR spec.

The HAR spec allows for afterRequest and beforeRequest to be null, see
http://www.softwareishard.com/blog/har-12-spec/#cache. This has a different semantics from the fields being left out.
---
 types/har-format/har-format-tests.ts | 13 +++++++++++++
 types/har-format/index.d.ts          |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/types/har-format/har-format-tests.ts b/types/har-format/har-format-tests.ts
index 9a226d150c..00ce0b1e47 100644
--- a/types/har-format/har-format-tests.ts
+++ b/types/har-format/har-format-tests.ts
@@ -89,6 +89,19 @@ const testEntry: harFormat.Entry = {
     pageref: "page_1"
 };
 
+// Examples from http://www.softwareishard.com/blog/har-12-spec/#cache
+const testCacheNoInformation: harFormat.Cache = {
+};
+
+const testNoCacheAfter: harFormat.Cache = {
+  afterRequest: null
+};
+
+const testCacheNotCached: harFormat.Cache = {
+  beforeRequest: null,
+  afterRequest: null
+};
+
 const testLog: harFormat.Log = {
     version: "1.2",
     creator: testCreator,
diff --git a/types/har-format/index.d.ts b/types/har-format/index.d.ts
index 3ab7fd773e..31421be8b4 100644
--- a/types/har-format/index.d.ts
+++ b/types/har-format/index.d.ts
@@ -728,13 +728,13 @@ export interface Cache {
      *
      * Leave out this field if the information is not available.
      */
-    beforeRequest?: CacheDetails;
+    beforeRequest?: CacheDetails | null;
     /**
      * State of a cache entry after the request.
      *
      * Leave out this field if the information is not available.
      */
-    afterRequest?: CacheDetails;
+    afterRequest?: CacheDetails | null;
     /**  A comment provided by the user or the application */
     comment?: string;
 }

From a9956ccc9717d38f6b9b1ddfcf26b7204ba682a9 Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 16:08:37 +0100
Subject: [PATCH 107/388] Wrap in module

---
 types/electron-store/index.d.ts | 145 ++++++++++++++++----------------
 1 file changed, 74 insertions(+), 71 deletions(-)

diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index e270fb2b8e..1bf43b71a8 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -1,79 +1,82 @@
 // Type definitions for electron-store 1.2
 // Project: https://github.com/sindresorhus/electron-store
 // Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
+//                 Jakub Synowiec <https://github.com/jsynowiec>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface ElectronStoreOptions {
-  /**
-   * Default config.
-   */
-  defaults?: {};
+declare module 'electron-store' {
+    interface ElectronStoreOptions {
+    /**
+     * Default config.
+     */
+    defaults?: {};
 
-  /**
-   * Name of the config file (without extension).
-   */
-  name?: string;
+    /**
+     * Name of the config file (without extension).
+     */
+    name?: string;
 
-  /**
-   * Storage file location. *Don't specify this unless absolutely necessary!*
-   */
-  cwd?: string;
+    /**
+     * Storage file location. *Don't specify this unless absolutely necessary!*
+     */
+    cwd?: string;
+    }
+
+    class ElectronStore implements Iterable<[string, string | number | boolean | symbol | {}]> {
+    constructor(options?: ElectronStoreOptions);
+
+    /**
+     * Sets an item.
+     */
+    set(key: string, value: any): void;
+
+    /**
+     * Sets multiple items at once.
+     */
+    set(object: {}): void;
+
+    /**
+     * Retrieves an item.
+     */
+    get(key: string, defaultValue?: any): any;
+
+    /**
+     * Checks if an item exists.
+     */
+    has(key: string): boolean;
+
+    /**
+     * Deletes an item.
+     */
+    delete(key: string): void;
+
+    /**
+     * Deletes all items.
+     */
+    clear(): void;
+
+    /**
+     * Open the storage file in the user's editor.
+     */
+    openInEditor(): void;
+
+    /**
+     * Gets the item count.
+     */
+    size: number;
+
+    /**
+     * Gets all the config as an object or replace the current config with an object.
+     */
+    store: {};
+
+    /**
+     * Gets the path to the config file.
+     */
+    path: string;
+
+    [Symbol.iterator](): Iterator<[string, string | number | boolean | symbol | {}]>;
+    }
+
+    export = ElectronStore;
 }
-
-declare class ElectronStore implements Iterable<[string, string | number | boolean | symbol | {}]> {
-  constructor(options?: ElectronStoreOptions);
-
-  /**
-   * Sets an item.
-   */
-  set(key: string, value: any): void;
-
-  /**
-   * Sets multiple items at once.
-   */
-  set(object: {}): void;
-
-  /**
-   * Retrieves an item.
-   */
-  get(key: string, defaultValue?: any): any;
-
-  /**
-   * Checks if an item exists.
-   */
-  has(key: string): boolean;
-
-  /**
-   * Deletes an item.
-   */
-  delete(key: string): void;
-
-  /**
-   * Deletes all items.
-   */
-  clear(): void;
-
-  /**
-   * Open the storage file in the user's editor.
-   */
-  openInEditor(): void;
-
-  /**
-   * Gets the item count.
-   */
-  size: number;
-
-  /**
-   * Gets all the config as an object or replace the current config with an object.
-   */
-  store: {};
-
-  /**
-   * Gets the path to the config file.
-   */
-  path: string;
-
-  [Symbol.iterator](): Iterator<[string, string | number | boolean | symbol | {}]>;
-}
-
-export = ElectronStore;

From 3189dabe5c3659e81e9b5da76e4050edf586e476 Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 16:09:46 +0100
Subject: [PATCH 108/388] Add types for JSON-serializable values

---
 types/electron-store/index.d.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index 1bf43b71a8..c99f0775d6 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -5,6 +5,14 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module 'electron-store' {
+    type JSONValue = string | number | boolean | JSONObject | JSONArray;
+
+    interface JSONObject {
+        [x: string]: JSONValue;
+    }
+
+    interface JSONArray extends Array<JSONValue> {}
+
     interface ElectronStoreOptions {
     /**
      * Default config.

From e74562b16519e976cd0e91eb1e22d857ddfdec4c Mon Sep 17 00:00:00 2001
From: Tommaso Ricci <t.ricci@molecle.com>
Date: Sat, 17 Feb 2018 16:11:37 +0100
Subject: [PATCH 109/388] Fix undertaker typings - removed deps param

---
 types/undertaker/index.d.ts          | 8 --------
 types/undertaker/undertaker-tests.ts | 7 -------
 2 files changed, 15 deletions(-)

diff --git a/types/undertaker/index.d.ts b/types/undertaker/index.d.ts
index f7775ce28b..f4dcb58417 100644
--- a/types/undertaker/index.d.ts
+++ b/types/undertaker/index.d.ts
@@ -57,14 +57,6 @@ declare class Undertaker extends EventEmitter {
      */
     task(taskName: string, fn: Undertaker.TaskFunction): void;
 
-    /**
-     * Register the task by the taskName.
-     * @param taskName - Task name.
-     * @param dependencies - Task dependencies.
-     * @param fn - Task function.
-     */
-    task(taskName: string, dependencies: string[], fn: Undertaker.TaskFunction): void;
-
     /**
      * Register the task by the name property of the function.
      * @param fn - Task function.
diff --git a/types/undertaker/undertaker-tests.ts b/types/undertaker/undertaker-tests.ts
index d4db785245..224732b720 100644
--- a/types/undertaker/undertaker-tests.ts
+++ b/types/undertaker/undertaker-tests.ts
@@ -22,13 +22,6 @@ taker.task("task3", () => {
     });
 });
 
-taker.task("task3", ["task1"], () => {
-    return new Promise((resolve, reject) => {
-        // do things depending on "task1"
-        resolve(); // when everything is done
-    });
-});
-
 taker.task("combined", taker.series("task1", "task2"));
 
 taker.task("all", taker.parallel("combined", "task3"));

From 6fc5287a015fbf530b34d58e1155c81bb9491ade Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 16:12:58 +0100
Subject: [PATCH 110/388] Add generic type for options and class

---
 types/electron-store/index.d.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index c99f0775d6..cde9890c55 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -13,11 +13,11 @@ declare module 'electron-store' {
 
     interface JSONArray extends Array<JSONValue> {}
 
-    interface ElectronStoreOptions {
+    interface ElectronStoreOptions<T = JSONObject> {
     /**
      * Default config.
      */
-    defaults?: {};
+    defaults?: T;
 
     /**
      * Name of the config file (without extension).
@@ -30,8 +30,8 @@ declare module 'electron-store' {
     cwd?: string;
     }
 
-    class ElectronStore implements Iterable<[string, string | number | boolean | symbol | {}]> {
-    constructor(options?: ElectronStoreOptions);
+    class ElectronStore<T> implements Iterable<[keyof T, JSONValue]> {
+    constructor(options?: ElectronStoreOptions<T>);
 
     /**
      * Sets an item.
@@ -83,7 +83,7 @@ declare module 'electron-store' {
      */
     path: string;
 
-    [Symbol.iterator](): Iterator<[string, string | number | boolean | symbol | {}]>;
+    [Symbol.iterator](): Iterator<[keyof T, JSONValue]>;
     }
 
     export = ElectronStore;

From 4dd280734ca80b2c1903f3234da2be317ff657b3 Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 16:15:49 +0100
Subject: [PATCH 111/388] Use lookup types so TypeScript can infer allowed keys
 and types

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

diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index cde9890c55..2121f7a452 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -36,27 +36,30 @@ declare module 'electron-store' {
     /**
      * Sets an item.
      */
+    set<K extends keyof T>(key: K, value: T[K]): void;
     set(key: string, value: any): void;
 
     /**
      * Sets multiple items at once.
      */
-    set(object: {}): void;
+    set<K extends keyof T>(object: Pick<T, K> | T): void;
+    set(object: JSONObject): void
 
     /**
      * Retrieves an item.
      */
+    get<K extends keyof T>(key: K, defaultValue?: JSONValue): T[K];
     get(key: string, defaultValue?: any): any;
 
     /**
      * Checks if an item exists.
      */
-    has(key: string): boolean;
+    has<K extends keyof T>(key: K | string): boolean;
 
     /**
      * Deletes an item.
      */
-    delete(key: string): void;
+    delete<K extends keyof T>(key: K | string): void;
 
     /**
      * Deletes all items.

From 992cd81c05f6c926463556b9f1b42322afb1fd54 Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 16:18:38 +0100
Subject: [PATCH 112/388] Add missing onDidChange

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

diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index 2121f7a452..30091af75c 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -71,6 +71,9 @@ declare module 'electron-store' {
      */
     openInEditor(): void;
 
+    onDidChange<K extends keyof T>(key: K, callback: (newValue: T[K], oldValue: T[K]) => void): void;
+    onDidChange(key: string, callback: (newValue: JSONValue, oldValue: JSONValue) => void): void;
+
     /**
      * Gets the item count.
      */

From 5ff2de3ce7763d332b3f4b941d87faa9b960f571 Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 16:19:37 +0100
Subject: [PATCH 113/388] Use generic type for store

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

diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index 30091af75c..e15a8aa7e7 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -82,7 +82,7 @@ declare module 'electron-store' {
     /**
      * Gets all the config as an object or replace the current config with an object.
      */
-    store: {};
+    store: T;
 
     /**
      * Gets the path to the config file.

From 3403443a423bfeb9067b0f40e8baee428b5725cf Mon Sep 17 00:00:00 2001
From: Tommaso Ricci <t.ricci@molecle.com>
Date: Sat, 17 Feb 2018 16:17:04 +0100
Subject: [PATCH 114/388] Bumped undertaker version

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

diff --git a/types/undertaker/index.d.ts b/types/undertaker/index.d.ts
index f4dcb58417..5dc0cc0563 100644
--- a/types/undertaker/index.d.ts
+++ b/types/undertaker/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for undertaker 1.1
+// Type definitions for undertaker 1.2
 // Project: https://github.com/phated/undertaker
 // Definitions by: Qubo <https://github.com/tkqubo>, Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 6a4dc063be40d7c464b681a3e213a597704ee726 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Sat, 17 Feb 2018 16:22:22 +0100
Subject: [PATCH 115/388] Do not ignore TSLint rules, and make linting pass

---
 types/filesize/filesize-tests.ts |  2 +-
 types/filesize/index.d.ts        | 76 +++++++++++++++----------------
 types/filesize/tslint.json       | 78 +-------------------------------
 3 files changed, 39 insertions(+), 117 deletions(-)

diff --git a/types/filesize/filesize-tests.ts b/types/filesize/filesize-tests.ts
index 0cb3b911ed..6980ac892d 100644
--- a/types/filesize/filesize-tests.ts
+++ b/types/filesize/filesize-tests.ts
@@ -17,4 +17,4 @@ filesize(12, {fullform: true, fullforms: ["байтов"]});  // "12 байто
 filesize(265318, {separator: ","});   // "259,1 KB"
 
 const size = filesize.partial({standard: "iec"});
-size(265318)
\ No newline at end of file
+size(265318);
diff --git a/types/filesize/index.d.ts b/types/filesize/index.d.ts
index 056eba92ec..511e2373af 100644
--- a/types/filesize/index.d.ts
+++ b/types/filesize/index.d.ts
@@ -1,16 +1,15 @@
-// Type definitions for filesize 3.6.0
+// Type definitions for filesize 3.6
 // Project: https://github.com/avoidwork/filesize.js
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Renaud Chaput <https://github.com/renchap>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare var fileSize: Filesize.IFilesize;
+declare var fileSize: Filesize.Filesize;
 export = fileSize;
 export as namespace filesize;
 
 declare namespace Filesize {
-
-    export interface SiJedecBits {
+    interface SiJedecBits {
         b?: string;
         Kb?: string;
         Mb?: string;
@@ -22,7 +21,7 @@ declare namespace Filesize {
         Yb?: string;
     }
 
-    export interface SiJedecBytes {
+    interface SiJedecBytes {
         B?: string;
         KB?: string;
         MB?: string;
@@ -36,65 +35,64 @@ declare namespace Filesize {
 
     type SiJedec = SiJedecBits & SiJedecBytes & { [name: string]: string };
 
-    export interface Options {
+    interface Options {
         /**
-        * Number base, default is 2
-        */
+         * Number base, default is 2
+         */
         base?: number;
         /**
-        * Enables bit sizes, default is false
-        */
+         * Enables bit sizes, default is false
+         */
         bits?: boolean;
         /**
-        * Specifies the SI suffix via exponent, e.g. 2 is MB for bytes, default is -1
-        */
+         * Specifies the SI suffix via exponent, e.g. 2 is MB for bytes, default is -1
+         */
         exponent?: number;
         /**
-        * Enables full form of unit of measure, default is false
-        */
+         * Enables full form of unit of measure, default is false
+         */
         fullform?: boolean;
         /**
-        * Array of full form overrides, default is []
-        */
+         * Array of full form overrides, default is []
+         */
         fullforms?: string[];
         /**
-        * Output of function (array, exponent, object, or string), default is string
-        */
+         * Output of function (array, exponent, object, or string), default is string
+         */
         output?: "array" | "exponent" | "object" | "string";
         /**
-        * Decimal place, default is 2
-        */
+         * Decimal place, default is 2
+         */
         round?: number;
         /**
-        * Decimal separator character, default is .
-        */
+         * Decimal separator character, default is `.`
+         */
         separator?: string;
         /**
-        * Character between the result and suffix, default is " "
-        */
+         * Character between the result and suffix, default is ` `
+         */
         spacer?: string;
-        /*
-        * Standard unit of measure, can be iec or jedec, default is jedec; can be overruled by base
-        */
-        standard?: "iec" | "jedec"
         /**
-        * Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found
-        */
+         * Standard unit of measure, can be iec or jedec, default is jedec; can be overruled by base
+         */
+        standard?: "iec" | "jedec";
+        /**
+         * Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found
+         */
         symbols?: SiJedec;
         /**
-        * Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found
-        * @deprecated: use 'symbols'
-        */
+         * Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found
+         * @deprecated: use `symbols`
+         */
         suffixes?: SiJedec;
         /**
-        *  Enables unix style human readable output, e.g ls -lh, default is false
-        */
+         *  Enables unix style human readable output, e.g ls -lh, default is false
+         */
         unix?: boolean;
     }
 
-    export interface IFilesize {
-        (bytes: number): string;
-        (bytes: number, options: Options): string;
-        partial: (options: Options) => ((bytes: number) => string)
+    interface Filesize {
+        (bytes: number, options?: Options): string;
+        partial: (options: Options) => ((bytes: number) => string);
     }
 }
diff --git a/types/filesize/tslint.json b/types/filesize/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/filesize/tslint.json
+++ b/types/filesize/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 dea469dcaafcb8ba6696173adf60ef06649612a2 Mon Sep 17 00:00:00 2001
From: Tobias Lidskog <tobias@lidskog.se>
Date: Sat, 17 Feb 2018 16:31:17 +0100
Subject: [PATCH 116/388] WebPageTest extensions can be set to null.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

WebPageTest can set extended fields (fields starting with ’_’) to null, instead of omitting them.
---
 types/har-format/har-format-tests.ts |   2 +
 types/har-format/index.d.ts          | 314 +++++++++++++--------------
 2 files changed, 159 insertions(+), 157 deletions(-)

diff --git a/types/har-format/har-format-tests.ts b/types/har-format/har-format-tests.ts
index 00ce0b1e47..0733ea3ed4 100644
--- a/types/har-format/har-format-tests.ts
+++ b/types/har-format/har-format-tests.ts
@@ -84,6 +84,8 @@ const testEntry: harFormat.Entry = {
     response: testResponse,
     cache: {},
     timings: testTimings,
+    _gzip_total: null,
+    _server_rtt: null,
     serverIPAddress: "192.30.253.113",
     connection: "26487",
     pageref: "page_1"
diff --git a/types/har-format/index.d.ts b/types/har-format/index.d.ts
index 31421be8b4..eda539a6c3 100644
--- a/types/har-format/index.d.ts
+++ b/types/har-format/index.d.ts
@@ -102,159 +102,159 @@ export interface Page {
     comment?: string;
     /** _non-standard_  */
     /** _non-standard_  */
-    _adult_site?: number;
+    _adult_site?: number | null;
     /** _non-standard_  */
-    _aft?: number;
+    _aft?: number | null;
     /** _non-standard_  */
-    _base_page_cdn?: string;
+    _base_page_cdn?: string | null;
     /** _non-standard_  */
-    _base_page_redirects?: number;
+    _base_page_redirects?: number | null;
     /** _non-standard_  */
-    _base_page_ttfb?: number;
+    _base_page_ttfb?: number | null;
     /** _non-standard_  */
-    _browser_main_memory_kb?: number;
+    _browser_main_memory_kb?: number | null;
     /** _non-standard_  */
-    _browser_name?: string;
+    _browser_name?: string | null;
     /** _non-standard_  */
-    _browser_other_private_memory_kb?: number;
+    _browser_other_private_memory_kb?: number | null;
     /** _non-standard_  */
-    _browser_process_count?: number;
+    _browser_process_count?: number | null;
     /** _non-standard_  */
-    _browser_version?: string;
+    _browser_version?: string | null;
     /** _non-standard_  */
-    _browser_working_set_kb?: number;
+    _browser_working_set_kb?: number | null;
     /** _non-standard_  */
-    _bytesIn?: number;
+    _bytesIn?: number | null;
     /** _non-standard_  */
-    _bytesInDoc?: number;
+    _bytesInDoc?: number | null;
     /** _non-standard_  */
-    _bytesOut?: number;
+    _bytesOut?: number | null;
     /** _non-standard_  */
-    _bytesOutDoc?: number;
+    _bytesOutDoc?: number | null;
     /** _non-standard_  */
-    _cached?: number;
+    _cached?: number | null;
     /** _non-standard_  */
-    _certificate_bytes?: number;
+    _certificate_bytes?: number | null;
     /** _non-standard_  */
-    _connections?: number;
+    _connections?: number | null;
     /** _non-standard_  */
-    _date?: number;
+    _date?: number | null;
     /** _non-standard_  */
-    _docCPUms?: number;
+    _docCPUms?: number | null;
     /** _non-standard_  */
-    _docCPUpct?: number;
+    _docCPUpct?: number | null;
     /** _non-standard_  */
-    _docTime?: number;
+    _docTime?: number | null;
     /** _non-standard_  */
-    _domContentLoadedEventEnd?: number;
+    _domContentLoadedEventEnd?: number | null;
     /** _non-standard_  */
-    _domContentLoadedEventStart?: number;
+    _domContentLoadedEventStart?: number | null;
     /** _non-standard_  */
-    _domElements?: number;
+    _domElements?: number | null;
     /** _non-standard_  */
-    _domInteractive?: number;
+    _domInteractive?: number | null;
     /** _non-standard_  */
-    _domLoading?: number;
+    _domLoading?: number | null;
     /** _non-standard_  */
-    _domTime?: number;
+    _domTime?: number | null;
     /** _non-standard_  */
-    _effectiveBps?: number;
+    _effectiveBps?: number | null;
     /** _non-standard_  */
-    _effectiveBpsDoc?: number;
+    _effectiveBpsDoc?: number | null;
     /** _non-standard_  */
-    _eventName?: string;
+    _eventName?: string | null;
     /** _non-standard_  */
-    _firstPaint?: number;
+    _firstPaint?: number | null;
     /** _non-standard_  */
-    _fixed_viewport?: number;
+    _fixed_viewport?: number | null;
     /** _non-standard_  */
-    _fullyLoaded?: number;
+    _fullyLoaded?: number | null;
     /** _non-standard_  */
-    _fullyLoadedCPUms?: number;
+    _fullyLoadedCPUms?: number | null;
     /** _non-standard_  */
-    _fullyLoadedCPUpct?: number;
+    _fullyLoadedCPUpct?: number | null;
     /** _non-standard_  */
-    _gzip_savings?: number;
+    _gzip_savings?: number | null;
     /** _non-standard_  */
-    _gzip_total?: number;
+    _gzip_total?: number | null;
     /** _non-standard_  */
-    _image_savings?: number;
+    _image_savings?: number | null;
     /** _non-standard_  */
-    _image_total?: number;
+    _image_total?: number | null;
     /** _non-standard_  */
-    _isResponsive?: number;
+    _isResponsive?: number | null;
     /** _non-standard_  */
-    _lastVisualChange?: number;
+    _lastVisualChange?: number | null;
     /** _non-standard_  */
-    _loadEventEnd?: number;
+    _loadEventEnd?: number | null;
     /** _non-standard_  */
-    _loadEventStart?: number;
+    _loadEventStart?: number | null;
     /** _non-standard_  */
-    _loadTime?: number;
+    _loadTime?: number | null;
     /** _non-standard_  */
-    _minify_savings?: number;
+    _minify_savings?: number | null;
     /** _non-standard_  */
-    _minify_total?: number;
+    _minify_total?: number | null;
     /** _non-standard_  */
-    _optimization_checked?: number;
+    _optimization_checked?: number | null;
     /** _non-standard_  */
-    _pageSpeedVersion?: string;
+    _pageSpeedVersion?: string | null;
     /** _non-standard_  */
-    _render?: number;
+    _render?: number | null;
     /** _non-standard_  */
-    _requests?: number;
+    _requests?: number | null;
     /** _non-standard_  */
-    _requestsDoc?: number;
+    _requestsDoc?: number | null;
     /** _non-standard_  */
-    _requestsFull?: number;
+    _requestsFull?: number | null;
     /** _non-standard_  */
-    _responses_200?: number;
+    _responses_200?: number | null;
     /** _non-standard_  */
-    _responses_404?: number;
+    _responses_404?: number | null;
     /** _non-standard_  */
-    _responses_other?: number;
+    _responses_other?: number | null;
     /** _non-standard_  */
-    _result?: number;
+    _result?: number | null;
     /** _non-standard_  */
-    _run?: number;
+    _run?: number | null;
     /** _non-standard_  */
-    _score_cache?: number;
+    _score_cache?: number | null;
     /** _non-standard_  */
-    _score_cdn?: number;
+    _score_cdn?: number | null;
     /** _non-standard_  */
-    _score_combine?: number;
+    _score_combine?: number | null;
     /** _non-standard_  */
-    _score_compress?: number;
+    _score_compress?: number | null;
     /** _non-standard_  */
-    _score_cookies?: number;
+    _score_cookies?: number | null;
     /** _non-standard_  */
-    _score_etags?: number;
+    _score_etags?: number | null;
     /** _non-standard_  */
-    _score_gzip?: number;
+    _score_gzip?: number | null;
     /** _non-standard_  */
-    "_score_keep-alive"?: number;
+    "_score_keep-alive"?: number | null;
     /** _non-standard_  */
-    _score_minify?: number;
+    _score_minify?: number | null;
     /** _non-standard_  */
-    _score_progressive_jpeg?: number;
+    _score_progressive_jpeg?: number | null;
     /** _non-standard_  */
-    _server_count?: number;
+    _server_count?: number | null;
     /** _non-standard_  */
-    _server_rtt?: number;
+    _server_rtt?: number | null;
     /** _non-standard_  */
-    _SpeedIndex?: number;
+    _SpeedIndex?: number | null;
     /** _non-standard_  */
-    _step?: number;
+    _step?: number | null;
     /** _non-standard_  */
-    _title?: string;
+    _title?: string | null;
     /** _non-standard_  */
-    _titleTime?: number;
+    _titleTime?: number | null;
     /** _non-standard_  */
-    _TTFB?: number;
+    _TTFB?: number | null;
     /** _non-standard_  */
-    _URL?: string;
+    _URL?: string | null;
     /** _non-standard_  */
-    _visualComplete?: number;
+    _visualComplete?: number | null;
 }
 /**
  * This object describes timings for various events (states) fired during the
@@ -283,7 +283,7 @@ export interface PageTiming {
     onLoad?: number;
     /** A comment provided by the user or the application */
     comment?: string;
-    _startRender?: number;
+    _startRender?: number | null;
 }
 /**
  * This object represents an array with all exported HTTP requests. Sorting
@@ -341,161 +341,161 @@ export interface Entry {
     /**  A comment provided by the user or the application */
     comment?: string;
     /** _non-standard_  */
-    _all_end?: number | string;
+    _all_end?: number | string | null;
     /** _non-standard_  */
-    _all_ms?: number | string;
+    _all_ms?: number | string | null;
     /** _non-standard_  */
-    _all_start?: number | string;
+    _all_start?: number | string | null;
     /** _non-standard_  */
-    _bytesIn?: number | string;
+    _bytesIn?: number | string | null;
     /** _non-standard_  */
-    _bytesOut?: number | string;
+    _bytesOut?: number | string | null;
     /** _non-standard_  */
-    _cacheControl?: string;
+    _cacheControl?: string | null;
     /** _non-standard_  */
-    _cache_time?: number | string;
+    _cache_time?: number | string | null;
     /** _non-standard_  */
-    _cdn_provider?: string;
+    _cdn_provider?: string | null;
     /** _non-standard_  */
-    _certificate_bytes?: number | string;
+    _certificate_bytes?: number | string | null;
     /** _non-standard_  */
-    _client_port?: number | string;
+    _client_port?: number | string | null;
     /** _non-standard_  */
-    _connect_end?: number | string;
+    _connect_end?: number | string | null;
     /** _non-standard_  */
-    _connect_ms?: number | string;
+    _connect_ms?: number | string | null;
     /** _non-standard_  */
-    _connect_start?: number | string;
+    _connect_start?: number | string | null;
     /** _non-standard_  */
-    _contentEncoding?: string;
+    _contentEncoding?: string | null;
     /** _non-standard_  */
-    _contentType?: string;
+    _contentType?: string | null;
     /** _non-standard_  */
-    _dns_end?: number | string;
+    _dns_end?: number | string | null;
     /** _non-standard_  */
-    _dns_ms?: number | string;
+    _dns_ms?: number | string | null;
     /** _non-standard_  */
-    _dns_start?: number | string;
+    _dns_start?: number | string | null;
     /** _non-standard_  */
-    _download_end?: number | string;
+    _download_end?: number | string | null;
     /** _non-standard_  */
-    _download_ms?: number | string;
+    _download_ms?: number | string | null;
     /** _non-standard_  */
-    _download_start?: number | string;
+    _download_start?: number | string | null;
     /** _non-standard_  */
-    _expires?: string;
+    _expires?: string | null;
     /** _non-standard_  */
-    _full_url?: string;
+    _full_url?: string | null;
     /** _non-standard_  */
-    _gzip_save?: number | string;
+    _gzip_save?: number | string | null;
     /** _non-standard_  */
-    _gzip_total?: number | string;
+    _gzip_total?: number | string | null;
     /** _non-standard_  */
-    _host?: string;
+    _host?: string | null;
     /** _non-standard_  */
-    _http2_stream_dependency?: number | string;
+    _http2_stream_dependency?: number | string | null;
     /** _non-standard_  */
-    _http2_stream_exclusive?: number | string;
+    _http2_stream_exclusive?: number | string | null;
     /** _non-standard_  */
-    _http2_stream_id?: number | string;
+    _http2_stream_id?: number | string | null;
     /** _non-standard_  */
-    _http2_stream_weight?: number | string;
+    _http2_stream_weight?: number | string | null;
     /** _non-standard_  */
-    _image_save?: number | string;
+    _image_save?: number | string | null;
     /** _non-standard_  */
-    _image_total?: number | string;
+    _image_total?: number | string | null;
     /** _non-standard_  */
-    _index?: number;
+    _index?: number | null;
     /** _non-standard_  */
-    _initiator?: string;
+    _initiator?: string | null;
     /** _non-standard_  */
-    _initiator_column?: string;
+    _initiator_column?: string | null;
     /** _non-standard_  */
-    _initiator_detail?: string;
+    _initiator_detail?: string | null;
     /** _non-standard_  */
-    _initiator_function?: string;
+    _initiator_function?: string | null;
     /** _non-standard_  */
-    _initiator_line?: string;
+    _initiator_line?: string | null;
     /** _non-standard_  */
-    _initiator_type?: string;
+    _initiator_type?: string | null;
     /** _non-standard_  */
-    _ip_addr?: string;
+    _ip_addr?: string | null;
     /** _non-standard_  */
-    _is_secure?: number | string;
+    _is_secure?: number | string | null;
     /** _non-standard_  */
-    _jpeg_scan_count?: number | string;
+    _jpeg_scan_count?: number | string | null;
     /** _non-standard_  */
-    _load_end?: number | string;
+    _load_end?: number | string | null;
     /** _non-standard_  */
-    _load_ms?: number | string;
+    _load_ms?: number | string | null;
     /** _non-standard_  */
-    _load_start?: number | string;
+    _load_start?: number | string | null;
     /** _non-standard_  */
-    _method?: string;
+    _method?: string | null;
     /** _non-standard_  */
-    _minify_save?: number | string;
+    _minify_save?: number | string | null;
     /** _non-standard_  */
-    _minify_total?: number | string;
+    _minify_total?: number | string | null;
     /** _non-standard_  */
-    _number?: number;
+    _number?: number | null;
     /** _non-standard_  */
-    _objectSize?: number | string;
+    _objectSize?: number | string | null;
     /** _non-standard_  */
-    _objectSizeUncompressed?: number | string;
+    _objectSizeUncompressed?: number | string | null;
     /** _non-standard_  */
-    _priority?: string;
+    _priority?: string | null;
     /** _non-standard_  */
-    _protocol?: number | string;
+    _protocol?: number | string | null;
     /** _non-standard_  */
-    _request_id?: number | string;
+    _request_id?: number | string | null;
     /** _non-standard_  */
-    _responseCode?: number | string;
+    _responseCode?: number | string | null;
     /** _non-standard_  */
-    _score_cache?: number | string;
+    _score_cache?: number | string | null;
     /** _non-standard_  */
-    _score_cdn?: number | string;
+    _score_cdn?: number | string | null;
     /** _non-standard_  */
-    _score_combine?: number | string;
+    _score_combine?: number | string | null;
     /** _non-standard_  */
-    _score_compress?: number | string;
+    _score_compress?: number | string | null;
     /** _non-standard_  */
-    _score_cookies?: number | string;
+    _score_cookies?: number | string | null;
     /** _non-standard_  */
-    _score_etags?: number | string;
+    _score_etags?: number | string | null;
     /** _non-standard_  */
-    _score_gzip?: number | string;
+    _score_gzip?: number | string | null;
     /** _non-standard_  */
-    "_score_keep-alive"?: number | string;
+    "_score_keep-alive"?: number | string | null;
     /** _non-standard_  */
-    _score_minify?: number | string;
+    _score_minify?: number | string | null;
     /** _non-standard_  */
-    _score_progressive_jpeg?: number;
+    _score_progressive_jpeg?: number | null;
     /** _non-standard_  */
-    _server_count?: number | string;
+    _server_count?: number | string | null;
     /** _non-standard_  */
-    _server_rtt?: number | string;
+    _server_rtt?: number | string | null;
     /** _non-standard_  */
-    _socket?: number | string;
+    _socket?: number | string | null;
     /** _non-standard_  */
-    _ssl_end?: number | string;
+    _ssl_end?: number | string | null;
     /** _non-standard_  */
-    _ssl_ms?: number | string;
+    _ssl_ms?: number | string | null;
     /** _non-standard_  */
-    _ssl_start?: number | string;
+    _ssl_start?: number | string | null;
     /** _non-standard_  */
-    _ttfb_end?: number | string;
+    _ttfb_end?: number | string | null;
     /** _non-standard_  */
-    _ttfb_ms?: number | string;
+    _ttfb_ms?: number | string | null;
     /** _non-standard_  */
-    _ttfb_start?: number | string;
+    _ttfb_start?: number | string | null;
     /** _non-standard_  */
-    _type?: number | string;
+    _type?: number | string | null;
     /** _non-standard_  */
-    _url?: string;
+    _url?: string | null;
     /** _non-standard_  */
-    _was_pushed?: number | string;
+    _was_pushed?: number | string | null;
     /** _non-standard_  */
-    _initialPriority?: string;
+    _initialPriority?: string | null;
 }
 /**
  * This object contains detailed info about performed request.
@@ -575,7 +575,7 @@ export interface Response {
     /**  A comment provided by the user or the application */
     comment?: string;
     /** _non-standard_  */
-    _transferSize?: number;
+    _transferSize?: number | null;
 }
 /**
  * This object contains list of all cookies (used in `request` and `response`

From 39aac8440834c12c558088a2bf3ef39572eacf5e Mon Sep 17 00:00:00 2001
From: Tobias Lidskog <tobias@lidskog.se>
Date: Sat, 17 Feb 2018 16:36:23 +0100
Subject: [PATCH 117/388] JS Date is not a JSON type.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The cookie ”expires” field is an optional string according to http://www.softwareishard.com/blog/har-12-spec/#cookies. It’s a string that can be parsed as a date, but it’s not a Date object.
---
 types/har-format/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/har-format/index.d.ts b/types/har-format/index.d.ts
index eda539a6c3..178d95314f 100644
--- a/types/har-format/index.d.ts
+++ b/types/har-format/index.d.ts
@@ -597,7 +597,7 @@ export interface Cookie {
      * (ISO 8601 - `YYYY-MM-DDThh:mm:ss.sTZD`,
      * e.g. `2009-07-24T19:20:30.123+02:00`).
      */
-    expires?: string | Date | null;
+    expires?: string;
     /** Set to true if the cookie is HTTP only, false otherwise. */
     httpOnly?: boolean;
     /** True if the cookie was transmitted over ssl, false otherwise. */

From 60f12b76412342fd1a62cb34d0373d30dfd9dde8 Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 16:38:37 +0100
Subject: [PATCH 118/388] Update comments using official package docs

---
 types/electron-store/index.d.ts | 124 ++++++++++++++++----------------
 1 file changed, 64 insertions(+), 60 deletions(-)

diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index e15a8aa7e7..6a30daa8fc 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -14,83 +14,87 @@ declare module 'electron-store' {
     interface JSONArray extends Array<JSONValue> {}
 
     interface ElectronStoreOptions<T = JSONObject> {
-    /**
-     * Default config.
-     */
-    defaults?: T;
+      /**
+       * Default data.
+       */
+      defaults?: T;
 
-    /**
-     * Name of the config file (without extension).
-     */
-    name?: string;
+      /**
+       * Name of the storage file (without extension).
+       */
+      name?: string;
 
-    /**
-     * Storage file location. *Don't specify this unless absolutely necessary!*
-     */
-    cwd?: string;
+      /**
+       * Storage file location. Don't specify this unless absolutely necessary!
+       */
+      cwd?: string;
     }
 
     class ElectronStore<T> implements Iterable<[keyof T, JSONValue]> {
-    constructor(options?: ElectronStoreOptions<T>);
+      constructor(options?: ElectronStoreOptions<T>);
 
-    /**
-     * Sets an item.
-     */
-    set<K extends keyof T>(key: K, value: T[K]): void;
-    set(key: string, value: any): void;
+      /**
+       * Set an item.
+       */
+      set<K extends keyof T>(key: K, value: T[K]): void;
+      set(key: string, value: any): void;
 
-    /**
-     * Sets multiple items at once.
-     */
-    set<K extends keyof T>(object: Pick<T, K> | T): void;
-    set(object: JSONObject): void
+      /**
+       * Set multiple items at once.
+       */
+      set<K extends keyof T>(object: Pick<T, K> | T): void;
+      set(object: JSONObject): void
 
-    /**
-     * Retrieves an item.
-     */
-    get<K extends keyof T>(key: K, defaultValue?: JSONValue): T[K];
-    get(key: string, defaultValue?: any): any;
+      /**
+       * Get an item or defaultValue if the item does not exist.
+       */
+      get<K extends keyof T>(key: K, defaultValue?: JSONValue): T[K];
+      get(key: string, defaultValue?: any): any;
 
-    /**
-     * Checks if an item exists.
-     */
-    has<K extends keyof T>(key: K | string): boolean;
+      /**
+       * Check if an item exists.
+       */
+      has<K extends keyof T>(key: K | string): boolean;
 
-    /**
-     * Deletes an item.
-     */
-    delete<K extends keyof T>(key: K | string): void;
+      /**
+       * Delete an item.
+       */
+      delete<K extends keyof T>(key: K | string): void;
 
-    /**
-     * Deletes all items.
-     */
-    clear(): void;
+      /**
+       * Delete all items.
+       */
+      clear(): void;
 
-    /**
-     * Open the storage file in the user's editor.
-     */
-    openInEditor(): void;
+      /**
+       * Watches the given key, calling callback on any changes. When a key is first set oldValue
+       * will be undefined, and when a key is deleted newValue will be undefined.
+       */
+      onDidChange<K extends keyof T>(key: K, callback: (newValue: T[K], oldValue: T[K]) => void): void;
+      onDidChange(key: string, callback: (newValue: JSONValue, oldValue: JSONValue) => void): void;
 
-    onDidChange<K extends keyof T>(key: K, callback: (newValue: T[K], oldValue: T[K]) => void): void;
-    onDidChange(key: string, callback: (newValue: JSONValue, oldValue: JSONValue) => void): void;
+      /**
+       * Get the item count.
+       */
+      size: number;
 
-    /**
-     * Gets the item count.
-     */
-    size: number;
+      /**
+       * Get all the data as an object or replace the current data with an object.
+       */
+      store: T;
 
-    /**
-     * Gets all the config as an object or replace the current config with an object.
-     */
-    store: T;
+      /**
+       * Get the path to the storage file.
+       */
+      path: string;
 
-    /**
-     * Gets the path to the config file.
-     */
-    path: string;
+      /**
+       * Open the storage file in the user's editor.
+       */
+      openInEditor(): void;
 
-    [Symbol.iterator](): Iterator<[keyof T, JSONValue]>;
+      [Symbol.iterator](): Iterator<[keyof T, JSONValue]>;
     }
 
     export = ElectronStore;
-}
+  }

From 40f344779647caa52e175487c7f69d39b5c5ccfa Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 16:59:09 +0100
Subject: [PATCH 119/388] Add encryptionKey option

---
 types/electron-store/index.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index 6a30daa8fc..1e687fee0e 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -4,6 +4,8 @@
 //                 Jakub Synowiec <https://github.com/jsynowiec>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="node" />
+
 declare module 'electron-store' {
     type JSONValue = string | number | boolean | JSONObject | JSONArray;
 
@@ -28,6 +30,11 @@ declare module 'electron-store' {
        * Storage file location. Don't specify this unless absolutely necessary!
        */
       cwd?: string;
+
+        /**
+         * When specified, the store will be encrypted using the aes-256-cbc encryption algorithm.
+         */
+        encryptionKey?: string | Buffer;
     }
 
     class ElectronStore<T> implements Iterable<[keyof T, JSONValue]> {

From bb345b4d8984bbe89dc152b54f69d3765ce55542 Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 17:02:32 +0100
Subject: [PATCH 120/388] Reformat document according to guidelines

---
 types/electron-store/index.d.ts | 134 +++++++++++++++++---------------
 1 file changed, 70 insertions(+), 64 deletions(-)

diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index 1e687fee0e..357ec98460 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -16,20 +16,20 @@ declare module 'electron-store' {
     interface JSONArray extends Array<JSONValue> {}
 
     interface ElectronStoreOptions<T = JSONObject> {
-      /**
-       * Default data.
-       */
-      defaults?: T;
+        /**
+         * Default data.
+         */
+        defaults?: T;
 
-      /**
-       * Name of the storage file (without extension).
-       */
-      name?: string;
+        /**
+         * Name of the storage file (without extension).
+         */
+        name?: string;
 
-      /**
-       * Storage file location. Don't specify this unless absolutely necessary!
-       */
-      cwd?: string;
+        /**
+         * Storage file location. Don't specify this unless absolutely necessary!
+         */
+        cwd?: string;
 
         /**
          * When specified, the store will be encrypted using the aes-256-cbc encryption algorithm.
@@ -38,70 +38,76 @@ declare module 'electron-store' {
     }
 
     class ElectronStore<T> implements Iterable<[keyof T, JSONValue]> {
-      constructor(options?: ElectronStoreOptions<T>);
+        constructor(options?: ElectronStoreOptions<T>);
 
-      /**
-       * Set an item.
-       */
-      set<K extends keyof T>(key: K, value: T[K]): void;
-      set(key: string, value: any): void;
+        /**
+         * Set an item.
+         */
+        set<K extends keyof T>(key: K, value: T[K]): void;
+        set(key: string, value: any): void;
 
-      /**
-       * Set multiple items at once.
-       */
-      set<K extends keyof T>(object: Pick<T, K> | T): void;
-      set(object: JSONObject): void
+        /**
+         * Set multiple items at once.
+         */
+        set<K extends keyof T>(object: Pick<T, K> | T): void;
+        set(object: JSONObject): void;
 
-      /**
-       * Get an item or defaultValue if the item does not exist.
-       */
-      get<K extends keyof T>(key: K, defaultValue?: JSONValue): T[K];
-      get(key: string, defaultValue?: any): any;
+        /**
+         * Get an item or defaultValue if the item does not exist.
+         */
+        get<K extends keyof T>(key: K, defaultValue?: JSONValue): T[K];
+        get(key: string, defaultValue?: any): any;
 
-      /**
-       * Check if an item exists.
-       */
-      has<K extends keyof T>(key: K | string): boolean;
+        /**
+         * Check if an item exists.
+         */
+        has<K extends keyof T>(key: K | string): boolean;
 
-      /**
-       * Delete an item.
-       */
-      delete<K extends keyof T>(key: K | string): void;
+        /**
+         * Delete an item.
+         */
+        delete<K extends keyof T>(key: K | string): void;
 
-      /**
-       * Delete all items.
-       */
-      clear(): void;
+        /**
+         * Delete all items.
+         */
+        clear(): void;
 
-      /**
-       * Watches the given key, calling callback on any changes. When a key is first set oldValue
-       * will be undefined, and when a key is deleted newValue will be undefined.
-       */
-      onDidChange<K extends keyof T>(key: K, callback: (newValue: T[K], oldValue: T[K]) => void): void;
-      onDidChange(key: string, callback: (newValue: JSONValue, oldValue: JSONValue) => void): void;
+        /**
+         * Watches the given key, calling callback on any changes. When a key is first set oldValue
+         * will be undefined, and when a key is deleted newValue will be undefined.
+         */
+        onDidChange<K extends keyof T>(
+            key: K,
+            callback: (newValue: T[K], oldValue: T[K]) => void
+        ): void;
+        onDidChange(
+            key: string,
+            callback: (newValue: JSONValue, oldValue: JSONValue) => void
+        ): void;
 
-      /**
-       * Get the item count.
-       */
-      size: number;
+        /**
+         * Get the item count.
+         */
+        size: number;
 
-      /**
-       * Get all the data as an object or replace the current data with an object.
-       */
-      store: T;
+        /**
+         * Get all the data as an object or replace the current data with an object.
+         */
+        store: T;
 
-      /**
-       * Get the path to the storage file.
-       */
-      path: string;
+        /**
+         * Get the path to the storage file.
+         */
+        path: string;
 
-      /**
-       * Open the storage file in the user's editor.
-       */
-      openInEditor(): void;
+        /**
+         * Open the storage file in the user's editor.
+         */
+        openInEditor(): void;
 
-      [Symbol.iterator](): Iterator<[keyof T, JSONValue]>;
+        [Symbol.iterator](): Iterator<[keyof T, JSONValue]>;
     }
 
     export = ElectronStore;
-  }
+}

From afa07abdbbbbc3a0d58342fa9726c6236649f581 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Sat, 17 Feb 2018 00:51:03 -0800
Subject: [PATCH 121/388] Added 'set-value'.

---
 types/set-value/index.d.ts         | 23 +++++++++++++++++++++++
 types/set-value/set-value-tests.ts | 12 ++++++++++++
 types/set-value/tsconfig.json      | 23 +++++++++++++++++++++++
 types/set-value/tslint.json        |  1 +
 4 files changed, 59 insertions(+)
 create mode 100644 types/set-value/index.d.ts
 create mode 100644 types/set-value/set-value-tests.ts
 create mode 100644 types/set-value/tsconfig.json
 create mode 100644 types/set-value/tslint.json

diff --git a/types/set-value/index.d.ts b/types/set-value/index.d.ts
new file mode 100644
index 0000000000..be3f2c8b0a
--- /dev/null
+++ b/types/set-value/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for set-value 2.0
+// Project: https://github.com/jonschlinkert/set-value
+// Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export = set;
+
+// Technically, everything will fall to the last overload,
+// but the first one can be useful for signature help.
+
+/**
+ * @param object The object to set `value` on
+ * @param prop The property to set.
+ * @param value The value to set on `object[prop]`
+ */
+declare function set<T, K extends keyof T>(object: T, prop: K, value: T[K]): void;
+/**
+ * @param object The object to set `value` on
+ * @param prop The property to set. Dot-notation may be used.
+ * @param value The value to set on `object[prop]`
+ */
+declare function set(object: object, prop: string, value: any): void;
diff --git a/types/set-value/set-value-tests.ts b/types/set-value/set-value-tests.ts
new file mode 100644
index 0000000000..b2b6e78166
--- /dev/null
+++ b/types/set-value/set-value-tests.ts
@@ -0,0 +1,12 @@
+import set = require("set-value");
+
+{
+    const obj = {};
+    set(obj, "a.b.c", "d");
+    set({}, "a\\.b.c", "d");
+}
+
+{
+    const obj = { a: 100 };
+    set(obj, "a", 1000);
+}
diff --git a/types/set-value/tsconfig.json b/types/set-value/tsconfig.json
new file mode 100644
index 0000000000..38bec2daa7
--- /dev/null
+++ b/types/set-value/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",
+        "set-value-tests.ts"
+    ]
+}
diff --git a/types/set-value/tslint.json b/types/set-value/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/set-value/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c448d9b017a9806d5ebf253384bbf027b2bb9072 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Sat, 17 Feb 2018 01:16:48 -0800
Subject: [PATCH 122/388] Added 'get-value'.

---
 types/get-value/get-value-tests.ts | 22 +++++++++++++
 types/get-value/index.d.ts         | 53 ++++++++++++++++++++++++++++++
 types/get-value/tsconfig.json      | 23 +++++++++++++
 types/get-value/tslint.json        |  1 +
 4 files changed, 99 insertions(+)
 create mode 100644 types/get-value/get-value-tests.ts
 create mode 100644 types/get-value/index.d.ts
 create mode 100644 types/get-value/tsconfig.json
 create mode 100644 types/get-value/tslint.json

diff --git a/types/get-value/get-value-tests.ts b/types/get-value/get-value-tests.ts
new file mode 100644
index 0000000000..9e7534e000
--- /dev/null
+++ b/types/get-value/get-value-tests.ts
@@ -0,0 +1,22 @@
+import get = require("get-value");
+const obj = { a: { b: { c: { d: "foo" } } } };
+
+get(obj);
+get(obj, "a");
+get(obj, "a.b");
+get(obj, "a.b.c");
+get(obj, "a.b.c.d");
+
+{
+    const isEnumerable = Object.prototype.propertyIsEnumerable;
+    const options: get.Options = {
+        isValid: (key, obj) => isEnumerable.call(obj, key) || typeof obj[key] === "string",
+    };
+
+    const obj = {};
+    Object.defineProperty(obj, 'foo', { value: 'bar', enumerable: false });
+
+    get(obj, 'foo', options);
+    get({}, 'hasOwnProperty', options);
+    get({}, 'constructor', options);
+}
diff --git a/types/get-value/index.d.ts b/types/get-value/index.d.ts
new file mode 100644
index 0000000000..70cf0286e7
--- /dev/null
+++ b/types/get-value/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for get-value 3.0
+// Project: https://github.com/jonschlinkert/get-value
+// Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export = get;
+
+declare function get<T>(obj: T): T;
+declare function get(obj: object, key: string, options?: get.Options): any;
+
+declare namespace get {
+    interface Options {
+        /**
+         * The default value to return when get-value cannot result a value from the given object.
+         *
+         * default: `undefined`
+         */
+        default?: any;
+        /**
+         * If defined, this function is called on each resolved value.
+         * Useful if you want to do `.hasOwnProperty` or `Object.prototype.propertyIsEnumerable`.
+         */
+        isValid?: <K extends string>(key: K, object: Record<K, any>) => boolean;
+        /**
+         * Custom function to use for splitting the string into object path segments.
+         *
+         * default: `String.split`
+         */
+        split?: (s: string) => string[];
+        /**
+         * The separator to use for spliting the string.
+         * (this is probably not needed when `options.split` is used).
+         *
+         *  default: `"."`
+         */
+        separator?: string | RegExp;
+        /**
+         * Customize how the object path is created when iterating over path segments.
+         *
+         * default: `Array.join`
+         */
+        join?: (segs: string[]) => string;
+        /**
+         * The character to use when re-joining the string to check for keys
+         * with dots in them (this is probably not needed when `options.join` is used).
+         * This can be a different value than the separator, since the separator can be a string or regex.
+         *
+         * default: `"."`
+         */
+        joinChar?: string;
+    }
+}
diff --git a/types/get-value/tsconfig.json b/types/get-value/tsconfig.json
new file mode 100644
index 0000000000..33aa3925c5
--- /dev/null
+++ b/types/get-value/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",
+        "get-value-tests.ts"
+    ]
+}
diff --git a/types/get-value/tslint.json b/types/get-value/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/get-value/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 732f67b1e58f25708e4f10a481ac81d6d6cfb5ae Mon Sep 17 00:00:00 2001
From: s0m3on3 <amedvedev@ciferox.com>
Date: Sat, 17 Feb 2018 20:40:18 +0200
Subject: [PATCH 123/388] [adone] refactoring * [collection.Queue] add static
 "from" method * add pretty namespace * [text] move pretty.table, pretty.json
 to pretty * [util] move humanizeTime, humanizeSize to pretty

---
 types/adone/glosses/collections/queue.d.ts    |   2 +
 types/adone/glosses/pretty/index.d.ts         |  10 +
 types/adone/glosses/pretty/json.d.ts          |  16 ++
 types/adone/glosses/pretty/size.d.ts          |   3 +
 types/adone/glosses/pretty/table.d.ts         |  38 ++++
 types/adone/glosses/pretty/time.d.ts          |  11 +
 types/adone/glosses/text/index.d.ts           |   1 -
 types/adone/glosses/text/pretties.d.ts        |  55 -----
 types/adone/glosses/utils.d.ts                |  11 -
 types/adone/index.d.ts                        |   1 +
 types/adone/test/glosses/collections/queue.ts |  11 +
 types/adone/test/glosses/pretty/json.ts       |  19 ++
 types/adone/test/glosses/pretty/size.ts       |  12 ++
 types/adone/test/glosses/pretty/table.ts      | 177 +++++++++++++++
 types/adone/test/glosses/pretty/time.ts       |  14 ++
 types/adone/test/glosses/text/pretties.ts     | 203 ------------------
 types/adone/test/glosses/utils.ts             |  14 --
 types/adone/tsconfig.json                     |  13 +-
 18 files changed, 324 insertions(+), 287 deletions(-)
 create mode 100644 types/adone/glosses/pretty/index.d.ts
 create mode 100644 types/adone/glosses/pretty/json.d.ts
 create mode 100644 types/adone/glosses/pretty/size.d.ts
 create mode 100644 types/adone/glosses/pretty/table.d.ts
 create mode 100644 types/adone/glosses/pretty/time.d.ts
 delete mode 100644 types/adone/glosses/text/pretties.d.ts
 create mode 100644 types/adone/test/glosses/pretty/json.ts
 create mode 100644 types/adone/test/glosses/pretty/size.ts
 create mode 100644 types/adone/test/glosses/pretty/table.ts
 create mode 100644 types/adone/test/glosses/pretty/time.ts
 delete mode 100644 types/adone/test/glosses/text/pretties.ts

diff --git a/types/adone/glosses/collections/queue.d.ts b/types/adone/glosses/collections/queue.d.ts
index e67eb8fda9..8a0832a7e6 100644
--- a/types/adone/glosses/collections/queue.d.ts
+++ b/types/adone/glosses/collections/queue.d.ts
@@ -27,5 +27,7 @@ declare namespace adone.collection {
          * Removes and returns an element from the beginning
          */
         pop(): T | undefined;
+
+        static from<T>(iterable: Iterable<T>, length?: number): Queue<T>;
     }
 }
diff --git a/types/adone/glosses/pretty/index.d.ts b/types/adone/glosses/pretty/index.d.ts
new file mode 100644
index 0000000000..ca2bc125f6
--- /dev/null
+++ b/types/adone/glosses/pretty/index.d.ts
@@ -0,0 +1,10 @@
+/// <reference path="./json.d.ts" />
+/// <reference path="./size.d.ts" />
+/// <reference path="./table.d.ts" />
+/// <reference path="./time.d.ts" />
+
+declare namespace adone {
+    namespace pretty {
+        //
+    }
+}
diff --git a/types/adone/glosses/pretty/json.d.ts b/types/adone/glosses/pretty/json.d.ts
new file mode 100644
index 0000000000..0c86d4fa49
--- /dev/null
+++ b/types/adone/glosses/pretty/json.d.ts
@@ -0,0 +1,16 @@
+declare namespace adone.pretty {
+    namespace I {
+        interface JSONOptions {
+            emptyArrayMsg?: string;
+            keysColor?: string;
+            dashColor?: string;
+            numberColor?: string;
+            stringColor?: string;
+            defaultIndentation?: number;
+            noColor?: boolean;
+            noAlign?: boolean;
+        }
+    }
+
+    function json(data: any, options?: I.JSONOptions, indentation?: number): string;
+}
diff --git a/types/adone/glosses/pretty/size.d.ts b/types/adone/glosses/pretty/size.d.ts
new file mode 100644
index 0000000000..2ff1c1c4b5
--- /dev/null
+++ b/types/adone/glosses/pretty/size.d.ts
@@ -0,0 +1,3 @@
+declare namespace adone.pretty {
+    function size(num: number, space?: string): string;
+}
diff --git a/types/adone/glosses/pretty/table.d.ts b/types/adone/glosses/pretty/table.d.ts
new file mode 100644
index 0000000000..b71ce18d2c
--- /dev/null
+++ b/types/adone/glosses/pretty/table.d.ts
@@ -0,0 +1,38 @@
+declare namespace adone.pretty {
+    namespace I {
+        interface TableColumn {
+            id: string;
+            header?: string;
+            align?: "right" | "center" | "left";
+            width?: string | number;
+            maxWidth?: number | string;
+            wordwrap?: "soft" | "hard" | adone.text.I.WordWrapOptions;
+            handle?: (item: object) => string;
+            format?: string | ((val: any, item: object) => string);
+            style?: string | ((val: any, str: string) => string);
+        }
+
+        type TableModel = TableColumn[];
+
+        interface TableStyle {
+            "padding-left"?: number;
+            "padding-right"?: number;
+            head?: string[];
+            broder?: string[];
+            compact?: boolean;
+        }
+
+        interface TableOptions {
+            model: TableModel;
+            noHeader?: boolean;
+            borderless?: boolean;
+            style?: TableStyle;
+            width?: number | string;
+            countAnsiEscapeCodes?: boolean;
+        }
+
+        type TableData = Array<{ [id: string]: any }>;
+    }
+
+    function table(data: I.TableData, options: I.TableOptions): string;
+}
diff --git a/types/adone/glosses/pretty/time.d.ts b/types/adone/glosses/pretty/time.d.ts
new file mode 100644
index 0000000000..3732c16640
--- /dev/null
+++ b/types/adone/glosses/pretty/time.d.ts
@@ -0,0 +1,11 @@
+declare namespace adone.pretty {
+    namespace I {
+        interface TimeOptions {
+            msDecimalDigits?: number;
+            secDecimalDigits?: number;
+            verbose?: boolean;
+            compact?: boolean;
+        }
+    }
+    function time(ms: number, options?: I.TimeOptions): string;
+}
diff --git a/types/adone/glosses/text/index.d.ts b/types/adone/glosses/text/index.d.ts
index a640789765..57b0fb1867 100644
--- a/types/adone/glosses/text/index.d.ts
+++ b/types/adone/glosses/text/index.d.ts
@@ -1,4 +1,3 @@
-/// <reference path="./pretties.d.ts" />
 /// <reference path="./spinners.d.ts" />
 /// <reference path="./table.d.ts" />
 /// <reference path="./unicode.d.ts" />
diff --git a/types/adone/glosses/text/pretties.d.ts b/types/adone/glosses/text/pretties.d.ts
deleted file mode 100644
index 886901b268..0000000000
--- a/types/adone/glosses/text/pretties.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-declare namespace adone.text {
-    namespace pretty {
-        namespace I {
-            interface JSONOptions {
-                emptyArrayMsg?: string;
-                keysColor?: string;
-                dashColor?: string;
-                numberColor?: string;
-                stringColor?: string;
-                defaultIndentation?: number;
-                noColor?: boolean;
-                noAlign?: boolean;
-            }
-        }
-
-        function json(data: any, options?: I.JSONOptions, indentation?: number): string;
-
-        namespace I {
-            interface TableColumn {
-                id: string;
-                header?: string;
-                align?: "right" | "center" | "left";
-                width?: string | number;
-                maxWidth?: number | string;
-                wordwrap?: "soft" | "hard" | adone.text.I.WordWrapOptions;
-                handle?: (item: object) => string;
-                format?: string | ((val: any, item: object) => string);
-                style?: string | ((val: any, str: string) => string);
-            }
-
-            type TableModel = TableColumn[];
-
-            interface TableStyle {
-                "padding-left"?: number;
-                "padding-right"?: number;
-                head?: string[];
-                broder?: string[];
-                compact?: boolean;
-            }
-
-            interface TableOptions {
-                model: TableModel;
-                noHeader?: boolean;
-                borderless?: boolean;
-                style?: TableStyle;
-                width?: number | string;
-                countAnsiEscapeCodes?: boolean;
-            }
-
-            type TableData = Array<{ [id: string]: any }>;
-        }
-
-        function table(data: I.TableData, options: I.TableOptions): string;
-    }
-}
diff --git a/types/adone/glosses/utils.d.ts b/types/adone/glosses/utils.d.ts
index d84dce79c9..d1a0aa49bc 100644
--- a/types/adone/glosses/utils.d.ts
+++ b/types/adone/glosses/utils.d.ts
@@ -86,17 +86,6 @@ declare namespace adone {
 
         function invertObject(source: object, options?: I.KeysOptions): object;
 
-        namespace I {
-            interface HumanizeTimeOptions {
-                msDecimalDigits?: number;
-                secDecimalDigits?: number;
-                verbose?: boolean;
-                compact?: boolean;
-            }
-        }
-        function humanizeTime(ms: number, options?: I.HumanizeTimeOptions): string;
-        function humanizeSize(num: number, space?: string): string;
-
         function parseSize(str: string | number): number | null;
 
         namespace I {
diff --git a/types/adone/index.d.ts b/types/adone/index.d.ts
index abcf5165c2..ea3b208438 100644
--- a/types/adone/index.d.ts
+++ b/types/adone/index.d.ts
@@ -22,6 +22,7 @@
 /// <reference path="./glosses/math/index.d.ts" />
 /// <reference path="./glosses/meta.d.ts" />
 /// <reference path="./glosses/net/index.d.ts" />
+/// <reference path="./glosses/pretty/index.d.ts" />
 /// <reference path="./glosses/promise.d.ts" />
 /// <reference path="./glosses/regex.d.ts" />
 /// <reference path="./glosses/semver.d.ts" />
diff --git a/types/adone/test/glosses/collections/queue.ts b/types/adone/test/glosses/collections/queue.ts
index fd6df7f39b..2aefee9716 100644
--- a/types/adone/test/glosses/collections/queue.ts
+++ b/types/adone/test/glosses/collections/queue.ts
@@ -14,4 +14,15 @@ namespace adoneTests.collection.Queue {
     { const a: boolean = new Queue().full; }
     { const a: number = new Queue().length; }
     { const a: boolean = new Queue().empty; }
+
+    {
+        const q = Queue.from([1, 2, 3]);
+        const a: number | undefined = q.pop();
+    }
+    {
+        const q = Queue.from((function*() {
+            yield 42;
+        })());
+        const a: number | undefined = q.pop();
+    }
 }
diff --git a/types/adone/test/glosses/pretty/json.ts b/types/adone/test/glosses/pretty/json.ts
new file mode 100644
index 0000000000..730447baba
--- /dev/null
+++ b/types/adone/test/glosses/pretty/json.ts
@@ -0,0 +1,19 @@
+namespace adoneTests.pretty.json {
+    const {
+        json
+    } = adone.pretty;
+
+    let str: string;
+
+    str = json({});
+    str = json({}, {});
+    str = json({}, {}, 1);
+    str = json({}, { dashColor: "green" });
+    str = json({}, { defaultIndentation: 10 });
+    str = json({}, { emptyArrayMsg: "asdas" });
+    str = json({}, { keysColor: "green" });
+    str = json({}, { noAlign: true });
+    str = json({}, { noColor: true });
+    str = json({}, { numberColor: "green" });
+    str = json({}, { stringColor: "green" });
+}
diff --git a/types/adone/test/glosses/pretty/size.ts b/types/adone/test/glosses/pretty/size.ts
new file mode 100644
index 0000000000..1ed5e904fe
--- /dev/null
+++ b/types/adone/test/glosses/pretty/size.ts
@@ -0,0 +1,12 @@
+namespace adoneTests.pretty.size {
+    const {
+        pretty: {
+            size
+        }
+    } = adone;
+
+    let str: string;
+
+    str = size(12345);
+    str = size(12345, "");
+}
diff --git a/types/adone/test/glosses/pretty/table.ts b/types/adone/test/glosses/pretty/table.ts
new file mode 100644
index 0000000000..0ed4099bbc
--- /dev/null
+++ b/types/adone/test/glosses/pretty/table.ts
@@ -0,0 +1,177 @@
+namespace adoneTests.pretty.table {
+    const {
+        table
+    } = adone.pretty;
+
+    let str: string;
+
+    str = table([], {
+        model: []
+    });
+    str = table([], {
+        borderless: true,
+        model: []
+    });
+    str = table([], {
+        countAnsiEscapeCodes: true,
+        model: []
+    });
+    str = table([], {
+        noHeader: true,
+        model: []
+    });
+    str = table([], {
+        style: {
+            "padding-left": 1
+        },
+        model: []
+    });
+    str = table([], {
+        style: {
+            "padding-right": 1
+        },
+        model: []
+    });
+    str = table([], {
+        style: {
+            broder: ["a"]
+        },
+        model: []
+    });
+    str = table([], {
+        style: {
+            compact: true
+        },
+        model: []
+    });
+    str = table([], {
+        style: {
+            head: ["a"]
+        },
+        model: []
+    });
+    str = table([], {
+        width: 100,
+        model: []
+    });
+    str = table([], {
+        width: "100%",
+        model: []
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            align: "center"
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            format: "%s"
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            format(val: any, item: object) {
+                return "2";
+            }
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            handle(item: object) {
+                return "a";
+            }
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            header: "he"
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            maxWidth: "100%"
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            maxWidth: 100
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            style: "asd"
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            style(val: any, str: string) {
+                return "1";
+            }
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            width: 100
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            width: "100%"
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            wordwrap: "soft"
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            wordwrap: "hard"
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            wordwrap: {
+                countAnsiEscapeCodes: true
+            }
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            wordwrap: {
+                join: true
+            }
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            wordwrap: {
+                mode: "soft"
+            }
+        }]
+    });
+    str = table([], {
+        model: [{
+            id: "ads",
+            wordwrap: {
+                mode: "hard"
+            }
+        }]
+    });
+}
diff --git a/types/adone/test/glosses/pretty/time.ts b/types/adone/test/glosses/pretty/time.ts
new file mode 100644
index 0000000000..79d1e6325f
--- /dev/null
+++ b/types/adone/test/glosses/pretty/time.ts
@@ -0,0 +1,14 @@
+namespace adoneTests.pretty.time {
+    const {
+        time
+    } = adone.pretty;
+
+    let str: string;
+
+    str = time(12345);
+    str = time(12345, {});
+    str = time(12345, { compact: true });
+    str = time(12345, { msDecimalDigits: 2 });
+    str = time(12345, { secDecimalDigits: 2 });
+    str = time(12345, { verbose: true });
+}
diff --git a/types/adone/test/glosses/text/pretties.ts b/types/adone/test/glosses/text/pretties.ts
deleted file mode 100644
index 3061275cdd..0000000000
--- a/types/adone/test/glosses/text/pretties.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-namespace adoneTests.text.pretty {
-    const {
-        text: {
-            pretty
-        }
-    } = adone;
-
-    let str: string;
-
-    namespace json {
-        const {
-            json
-        } = pretty;
-
-        str = json({});
-        str = json({}, {});
-        str = json({}, {}, 1);
-        str = json({}, { dashColor: "green" });
-        str = json({}, { defaultIndentation: 10 });
-        str = json({}, { emptyArrayMsg: "asdas" });
-        str = json({}, { keysColor: "green" });
-        str = json({}, { noAlign: true });
-        str = json({}, { noColor: true });
-        str = json({}, { numberColor: "green" });
-        str = json({}, { stringColor: "green" });
-    }
-
-    namespace table {
-        const {
-            table
-        } = pretty;
-
-        str = table([], {
-            model: []
-        });
-        str = table([], {
-            borderless: true,
-            model: []
-        });
-        str = table([], {
-            countAnsiEscapeCodes: true,
-            model: []
-        });
-        str = table([], {
-            noHeader: true,
-            model: []
-        });
-        str = table([], {
-            style: {
-                "padding-left": 1
-            },
-            model: []
-        });
-        str = table([], {
-            style: {
-                "padding-right": 1
-            },
-            model: []
-        });
-        str = table([], {
-            style: {
-                broder: ["a"]
-            },
-            model: []
-        });
-        str = table([], {
-            style: {
-                compact: true
-            },
-            model: []
-        });
-        str = table([], {
-            style: {
-                head: ["a"]
-            },
-            model: []
-        });
-        str = table([], {
-            width: 100,
-            model: []
-        });
-        str = table([], {
-            width: "100%",
-            model: []
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                align: "center"
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                format: "%s"
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                format(val: any, item: object) {
-                    return "2";
-                }
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                handle(item: object) {
-                    return "a";
-                }
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                header: "he"
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                maxWidth: "100%"
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                maxWidth: 100
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                style: "asd"
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                style(val: any, str: string) {
-                    return "1";
-                }
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                width: 100
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                width: "100%"
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                wordwrap: "soft"
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                wordwrap: "hard"
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                wordwrap: {
-                    countAnsiEscapeCodes: true
-                }
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                wordwrap: {
-                    join: true
-                }
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                wordwrap: {
-                    mode: "soft"
-                }
-            }]
-        });
-        str = table([], {
-            model: [{
-                id: "ads",
-                wordwrap: {
-                    mode: "hard"
-                }
-            }]
-        });
-    }
-}
diff --git a/types/adone/test/glosses/utils.ts b/types/adone/test/glosses/utils.ts
index 656e000f8b..f0b789c78b 100644
--- a/types/adone/test/glosses/utils.ts
+++ b/types/adone/test/glosses/utils.ts
@@ -195,20 +195,6 @@ namespace utilTests {
         const e: object = util.invertObject({}, { onlyEnumerable: true });
     }
 
-    namespace humanizeTime {
-        const a: string = util.humanizeTime(12345);
-        const b: string = util.humanizeTime(12345, {});
-        const c: string = util.humanizeTime(12345, { compact: true });
-        const d: string = util.humanizeTime(12345, { msDecimalDigits: 2 });
-        const e: string = util.humanizeTime(12345, { secDecimalDigits: 2 });
-        const f: string = util.humanizeTime(12345, { verbose: true });
-    }
-
-    namespace humanizeSize {
-        const a: string = util.humanizeSize(12345);
-        const b: string = util.humanizeSize(12345, "");
-    }
-
     namespace parseSize {
         const a: number | null = util.parseSize(123);
         const b: number | null = util.parseSize("123Kb");
diff --git a/types/adone/tsconfig.json b/types/adone/tsconfig.json
index 66671bc175..18f90a5ae9 100644
--- a/types/adone/tsconfig.json
+++ b/types/adone/tsconfig.json
@@ -16,7 +16,8 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
-        "experimentalDecorators": true
+        "experimentalDecorators": true,
+        "esModuleInterop": true
     },
     "files": [
         "adone-tests.ts",
@@ -63,6 +64,10 @@
         "glosses/net/http/client.d.ts",
         "glosses/net/http/index.d.ts",
         "glosses/net/index.d.ts",
+        "glosses/pretty/json.d.ts",
+        "glosses/pretty/size.d.ts",
+        "glosses/pretty/table.d.ts",
+        "glosses/pretty/time.d.ts",
         "glosses/promise.d.ts",
         "glosses/regex.d.ts",
         "glosses/semver.d.ts",
@@ -78,7 +83,6 @@
         "glosses/templating/index.d.ts",
         "glosses/templating/nunjucks.d.ts",
         "glosses/text/index.d.ts",
-        "glosses/text/pretties.d.ts",
         "glosses/text/spinners.d.ts",
         "glosses/text/table.d.ts",
         "glosses/text/unicode.d.ts",
@@ -123,6 +127,10 @@
         "test/glosses/math/simd.ts",
         "test/glosses/meta.ts",
         "test/glosses/net/http/client.ts",
+        "test/glosses/pretty/json.ts",
+        "test/glosses/pretty/size.ts",
+        "test/glosses/pretty/table.ts",
+        "test/glosses/pretty/time.ts",
         "test/glosses/promise.ts",
         "test/glosses/regex.ts",
         "test/glosses/semver.ts",
@@ -136,7 +144,6 @@
         "test/glosses/templating/dot.ts",
         "test/glosses/templating/nunjucks.ts",
         "test/glosses/text/index.ts",
-        "test/glosses/text/pretties.ts",
         "test/glosses/text/spinners.ts",
         "test/glosses/text/table.ts",
         "test/glosses/text/unicode.ts",

From ddba7a0d3ad96010611d61e5c81e93da7da03d78 Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 20:41:59 +0100
Subject: [PATCH 124/388] Fix tslint errors

---
 types/electron-store/index.d.ts | 207 ++++++++++++++++----------------
 1 file changed, 103 insertions(+), 104 deletions(-)

diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index 357ec98460..66e579b392 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -1,113 +1,112 @@
-// Type definitions for electron-store 1.2
+// Type definitions for electron-store 1.3
 // Project: https://github.com/sindresorhus/electron-store
 // Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
 //                 Jakub Synowiec <https://github.com/jsynowiec>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// TypeScript Version: 2.3
+
 /// <reference types="node" />
 
-declare module 'electron-store' {
-    type JSONValue = string | number | boolean | JSONObject | JSONArray;
+type JSONValue = string | number | boolean | JSONObject | JSONArray;
 
-    interface JSONObject {
-        [x: string]: JSONValue;
-    }
-
-    interface JSONArray extends Array<JSONValue> {}
-
-    interface ElectronStoreOptions<T = JSONObject> {
-        /**
-         * Default data.
-         */
-        defaults?: T;
-
-        /**
-         * Name of the storage file (without extension).
-         */
-        name?: string;
-
-        /**
-         * Storage file location. Don't specify this unless absolutely necessary!
-         */
-        cwd?: string;
-
-        /**
-         * When specified, the store will be encrypted using the aes-256-cbc encryption algorithm.
-         */
-        encryptionKey?: string | Buffer;
-    }
-
-    class ElectronStore<T> implements Iterable<[keyof T, JSONValue]> {
-        constructor(options?: ElectronStoreOptions<T>);
-
-        /**
-         * Set an item.
-         */
-        set<K extends keyof T>(key: K, value: T[K]): void;
-        set(key: string, value: any): void;
-
-        /**
-         * Set multiple items at once.
-         */
-        set<K extends keyof T>(object: Pick<T, K> | T): void;
-        set(object: JSONObject): void;
-
-        /**
-         * Get an item or defaultValue if the item does not exist.
-         */
-        get<K extends keyof T>(key: K, defaultValue?: JSONValue): T[K];
-        get(key: string, defaultValue?: any): any;
-
-        /**
-         * Check if an item exists.
-         */
-        has<K extends keyof T>(key: K | string): boolean;
-
-        /**
-         * Delete an item.
-         */
-        delete<K extends keyof T>(key: K | string): void;
-
-        /**
-         * Delete all items.
-         */
-        clear(): void;
-
-        /**
-         * Watches the given key, calling callback on any changes. When a key is first set oldValue
-         * will be undefined, and when a key is deleted newValue will be undefined.
-         */
-        onDidChange<K extends keyof T>(
-            key: K,
-            callback: (newValue: T[K], oldValue: T[K]) => void
-        ): void;
-        onDidChange(
-            key: string,
-            callback: (newValue: JSONValue, oldValue: JSONValue) => void
-        ): void;
-
-        /**
-         * Get the item count.
-         */
-        size: number;
-
-        /**
-         * Get all the data as an object or replace the current data with an object.
-         */
-        store: T;
-
-        /**
-         * Get the path to the storage file.
-         */
-        path: string;
-
-        /**
-         * Open the storage file in the user's editor.
-         */
-        openInEditor(): void;
-
-        [Symbol.iterator](): Iterator<[keyof T, JSONValue]>;
-    }
-
-    export = ElectronStore;
+interface JSONObject {
+    [x: string]: JSONValue;
 }
+
+interface JSONArray extends Array<JSONValue> {}
+
+interface ElectronStoreOptions<T> {
+    /**
+     * Default data.
+     */
+    defaults?: T;
+
+    /**
+     * Name of the storage file (without extension).
+     */
+    name?: string;
+
+    /**
+     * Storage file location. Don't specify this unless absolutely necessary!
+     */
+    cwd?: string;
+
+    /**
+     * When specified, the store will be encrypted using the aes-256-cbc encryption algorithm.
+     */
+    encryptionKey?: string | Buffer;
+}
+
+declare class ElectronStore<T = {}> implements Iterable<[string, JSONValue]> {
+    constructor(options?: ElectronStoreOptions<T>);
+
+    /**
+     * Set an item.
+     */
+    set<K extends keyof T>(key: K, value: T[K]): void;
+    set(key: string, value: any): void;
+
+    /**
+     * Set multiple items at once.
+     */
+    set(object: Pick<T, keyof T> | T | JSONObject): void;
+
+    /**
+     * Get an item or defaultValue if the item does not exist.
+     */
+    get<K extends keyof T>(key: K, defaultValue?: JSONValue): T[K];
+    get(key: string, defaultValue?: any): any;
+
+    /**
+     * Check if an item exists.
+     */
+    has(key: keyof T | string): boolean;
+
+    /**
+     * Delete an item.
+     */
+    delete(key: keyof T | string): void;
+
+    /**
+     * Delete all items.
+     */
+    clear(): void;
+
+    /**
+     * Watches the given key, calling callback on any changes. When a key is first set oldValue
+     * will be undefined, and when a key is deleted newValue will be undefined.
+     */
+    onDidChange<K extends keyof T>(
+        key: K,
+        callback: (newValue: T[K], oldValue: T[K]) => void
+    ): void;
+    onDidChange(
+        key: string,
+        callback: (newValue: JSONValue, oldValue: JSONValue) => void
+    ): void;
+
+    /**
+     * Get the item count.
+     */
+    size: number;
+
+    /**
+     * Get all the data as an object or replace the current data with an object.
+     */
+    store: T;
+
+    /**
+     * Get the path to the storage file.
+     */
+    path: string;
+
+    /**
+     * Open the storage file in the user's editor.
+     */
+    openInEditor(): void;
+
+    [Symbol.iterator](): Iterator<[string, JSONValue]>;
+}
+
+export = ElectronStore;

From 3437e530d9ed260d2b0a3aab495fe0d91c594ed4 Mon Sep 17 00:00:00 2001
From: Jakub Synowiec <github@jakubsynowiec.info>
Date: Sat, 17 Feb 2018 20:42:17 +0100
Subject: [PATCH 125/388] Add tests for typed store

---
 types/electron-store/electron-store-tests.ts | 32 ++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/types/electron-store/electron-store-tests.ts b/types/electron-store/electron-store-tests.ts
index 61d74d6f18..f27cd6aca3 100644
--- a/types/electron-store/electron-store-tests.ts
+++ b/types/electron-store/electron-store-tests.ts
@@ -1,20 +1,20 @@
 import ElectronStore = require('electron-store');
 
 new ElectronStore({
-  defaults: {}
+    defaults: {}
 });
 
 new ElectronStore({
-  name: 'myConfiguration',
-  cwd: 'unicorn'
+    name: 'myConfiguration',
+    cwd: 'unicorn'
 });
 
 const electronStore = new ElectronStore();
 
 electronStore.set('foo', 'bar');
 electronStore.set({
-  foo: 'bar',
-  foo2: 'bar2'
+    foo: 'bar',
+    foo2: 'bar2'
 });
 electronStore.delete('foo');
 electronStore.get('foo');
@@ -28,7 +28,27 @@ electronStore.size;
 electronStore.store;
 
 electronStore.store = {
-  foo: 'bar'
+    foo: 'bar'
 };
 
 electronStore.path;
+
+interface SampleStore {
+    enabled: boolean;
+    interval: number;
+}
+
+const typedElectronStore = new ElectronStore<SampleStore>({
+    defaults: {
+        enabled: true,
+        interval: 30000,
+    },
+});
+
+const interval: number = typedElectronStore.get('interval');
+const enabled = false;
+typedElectronStore.set('enabled', enabled);
+typedElectronStore.set({
+    enabled: true,
+    interval: 10000,
+});

From 942e3f71b6a2a72410d971a408095ee235b5b598 Mon Sep 17 00:00:00 2001
From: Edgar Simson <edgar.simson@orangelv.com>
Date: Sat, 17 Feb 2018 22:16:28 +0200
Subject: [PATCH 126/388] Use standard lint config, fix lint errors

---
 types/opentype.js/index.d.ts           | 63 ++++++++++-----------
 types/opentype.js/opentype.js-tests.ts | 76 ++++++++++++-------------
 types/opentype.js/tslint.json          | 78 +-------------------------
 3 files changed, 68 insertions(+), 149 deletions(-)

diff --git a/types/opentype.js/index.d.ts b/types/opentype.js/index.d.ts
index 8dff7e3135..8dc449784d 100644
--- a/types/opentype.js/index.d.ts
+++ b/types/opentype.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for opentype.js 0.7.3
+// Type definitions for opentype.js 0.7
 // Project: https://github.com/nodebox/opentype.js
 // Definitions by: Dan Marshall <https://github.com/danmarshall>
 //                 Edgar Simson <https://github.com/edzis>
@@ -60,15 +60,13 @@ export class Font {
         y: number | undefined,
         fontSize: number | undefined,
         options: RenderOptions | undefined,
-        callback: {
-            (
-                glyph: Glyph,
-                x: number,
-                y: number,
-                fontSize: number,
-                options?: RenderOptions
-            ): void;
-        }
+        callback: (
+            glyph: Glyph,
+            x: number,
+            y: number,
+            fontSize: number,
+            options?: RenderOptions
+        ) => void
     ): number;
     getAdvanceWidth(
         text: string,
@@ -115,7 +113,7 @@ export type FontConstructorOptions = FontConstructorOptionsBase &
         glyphs: Glyph[];
     };
 
-interface FontOptions {
+export interface FontOptions {
     empty?: boolean;
     familyName: string;
     styleName: string;
@@ -140,7 +138,7 @@ interface FontOptions {
     fsSelection?: string;
 }
 
-interface FontConstructorOptionsBase {
+export interface FontConstructorOptionsBase {
     familyName: string;
     styleName: string;
     unitsPerEm: number;
@@ -148,7 +146,7 @@ interface FontConstructorOptionsBase {
     descender: number;
 }
 
-interface FontNames {
+export interface FontNames {
     copyright: LocalizedName;
     description: LocalizedName;
     designer: LocalizedName;
@@ -165,7 +163,7 @@ interface FontNames {
     version: LocalizedName;
 }
 
-interface Table {
+export interface Table {
     [propName: string]: any;
     encode(): number[];
     fields: Field[];
@@ -174,15 +172,15 @@ interface Table {
     tableName: string;
 }
 
-interface KerningPairs {
+export interface KerningPairs {
     [pair: string]: number;
 }
 
-interface LocalizedName {
+export interface LocalizedName {
     [lang: string]: string;
 }
 
-interface Field {
+export interface Field {
     name: string;
     type: string;
     value: any;
@@ -201,7 +199,7 @@ export class Glyph {
     private points;
 
     name: string;
-    path: Path | { (): Path };
+    path: Path | (() => Path);
     unicode: number;
     unicodes: number[];
     advanceWidth: number;
@@ -242,7 +240,7 @@ export class Glyph {
         font?: Font
     ): Path;
 }
-interface GlyphOptions {
+export interface GlyphOptions {
     advanceWidth?: number;
     index?: number;
     font?: Font;
@@ -266,13 +264,13 @@ export class GlyphNames {
 export class GlyphSet {
     private font;
     private glyphs;
-    constructor(font: Font, glyphs: Glyph[] | { (): Glyph }[]);
+    constructor(font: Font, glyphs: Glyph[] | Array<(() => Glyph)>);
     get(index: number): Glyph;
     length: number;
-    push(index: number, loader: { (): Glyph }): void;
+    push(index: number, loader: () => Glyph): void;
 }
 
-interface Post {
+export interface Post {
     glyphNameIndex?: number[];
     isFixedPitch: number;
     italicAngle: number;
@@ -288,7 +286,7 @@ interface Post {
     version: number;
 }
 
-interface RenderOptions {
+export interface RenderOptions {
     script?: string;
     language?: string;
     kerning?: boolean;
@@ -310,7 +308,7 @@ export interface Metrics {
 
 export interface Contour extends Array<Point> {}
 
-interface Point {
+export interface Point {
     lastPointOfContour?: boolean;
 }
 
@@ -355,7 +353,7 @@ export class Path {
     unitsPerEm: number;
 }
 
-interface PathCommand {
+export interface PathCommand {
     type: string;
     x?: number;
     y?: number;
@@ -369,20 +367,17 @@ interface PathCommand {
  * UTIL CLASSES
  ******************************************/
 
-export class BoundingBox {
-    // TODO add methods
-}
+export type BoundingBox = () => any;
+// TODO add methods
 
-export class Encoding {
+export interface Encoding {
     charset: string;
     charToGlyphIndex(c: string): number;
     font: Font;
 }
 
-export class Substitution {
-    constructor(font: Font);
-    // TODO add methods
-}
+export type Substitution = (font: Font) => any;
+// TODO add methods
 
 /******************************************
  * STATIC
@@ -390,7 +385,7 @@ export class Substitution {
 
 export function load(
     url: string,
-    callback: { (error: any, font?: Font): void }
+    callback: (error: any, font?: Font) => void
 ): void;
 
 export function loadSync(url: string): Font;
diff --git a/types/opentype.js/opentype.js-tests.ts b/types/opentype.js/opentype.js-tests.ts
index 6e1639a1b0..04781d5415 100644
--- a/types/opentype.js/opentype.js-tests.ts
+++ b/types/opentype.js/opentype.js-tests.ts
@@ -1,60 +1,60 @@
-var x = 0;
-var y = 0;
-var fontSize = 72;
-var ctx: CanvasRenderingContext2D;
+const x = 0;
+const y = 0;
+const fontSize = 72;
+let ctx: CanvasRenderingContext2D;
 
-opentype.load('fonts/Roboto-Black.ttf', function(err, font) {
+opentype.load('fonts/Roboto-Black.ttf', (err, font) => {
     if (err) {
         alert('Font could not be loaded: ' + err);
     } else {
-        var path = font.getPath('Hello, World!', 0, 150, 72);
+        const path = font.getPath('Hello, World!', 0, 150, 72);
         // If you just want to draw the text you can also use font.draw(ctx, text, x, y, fontSize).
         path.draw(ctx);
     }
 });
 
-var myBuffer: ArrayBuffer;
-var font = opentype.parse(myBuffer);
+let myBuffer: ArrayBuffer;
+let font = opentype.parse(myBuffer);
 font = opentype.loadSync('fonts/Roboto-Black.ttf');
 
-var notdefGlyph = new opentype.Glyph({
+const notdefGlyph = new opentype.Glyph({
     name: '.notdef',
     unicode: 0,
     advanceWidth: 650,
     path: new opentype.Path()
 });
 
-var aPath = new opentype.Path();
+const aPath = new opentype.Path();
 // more drawing instructions...
-var aGlyph = new opentype.Glyph({
+const aGlyph = new opentype.Glyph({
     name: 'A',
     unicode: 65,
     advanceWidth: 650,
     path: aPath
 });
 
-var glyphs = [notdefGlyph, aGlyph];
-var font = new opentype.Font({
+const glyphs = [notdefGlyph, aGlyph];
+const fontGenerated = new opentype.Font({
     familyName: 'OpenTypeSans',
     styleName: 'Medium',
     unitsPerEm: 1000,
     ascender: 800,
     descender: -200,
 
-    glyphs: glyphs
+    glyphs
 });
 font.download();
 
-var hasChar: boolean = font.hasChar('a');
-var charIndex: number = font.charToGlyphIndex('a');
-var charGlyph: opentype.Glyph = font.charToGlyph('a');
-var charGlyphs: opentype.Glyph[] = font.stringToGlyphs('abc');
-var nameIndex: number = font.nameToGlyphIndex('a');
-var nameGlyph: opentype.Glyph = font.nameToGlyph('a');
-var indexName: string = font.glyphIndexToName(1);
-var kerning: number = font.getKerningValue(notdefGlyph, aGlyph);
+const hasChar: boolean = font.hasChar('a');
+const charIndex: number = font.charToGlyphIndex('a');
+const charGlyph: opentype.Glyph = font.charToGlyph('a');
+const charGlyphs: opentype.Glyph[] = font.stringToGlyphs('abc');
+const nameIndex: number = font.nameToGlyphIndex('a');
+const nameGlyph: opentype.Glyph = font.nameToGlyph('a');
+const indexName: string = font.glyphIndexToName(1);
+const kerning: number = font.getKerningValue(notdefGlyph, aGlyph);
 font.defaultRenderOptions.kerning = false;
-var forEachWidth: number = font.forEachGlyph(
+const forEachWidth: number = font.forEachGlyph(
     'text',
     x,
     y,
@@ -71,32 +71,32 @@ var forEachWidth: number = font.forEachGlyph(
         });
     }
 );
-var fontPath: opentype.Path = font.getPath('text', x, y, fontSize, {});
-var fontPaths: opentype.Path[] = font.getPaths('text', x, y, fontSize, {});
-var fontWidth: number = font.getAdvanceWidth('text', fontSize, { yScale: 0.5 });
+const fontPath: opentype.Path = font.getPath('text', x, y, fontSize, {});
+const fontPaths: opentype.Path[] = font.getPaths('text', x, y, fontSize, {});
+const fontWidth: number = font.getAdvanceWidth('text', fontSize, { yScale: 0.5 });
 font.draw(ctx, 'text');
 font.drawPoints(ctx, 'text', x, y, fontSize, { yScale: 0.5 });
 font.drawMetrics(ctx, 'text', x, y, fontSize, { xScale: 1.1, yScale: 0.5 });
-var engName: string = font.getEnglishName('a');
+const engName: string = font.getEnglishName('a');
 font.validate();
-var tables: opentype.Table = font.toTables();
-var ab: ArrayBuffer = font.toArrayBuffer();
+const tables: opentype.Table = font.toTables();
+const ab: ArrayBuffer = font.toArrayBuffer();
 font.download();
 font.download('fileName.ttf');
 
 aGlyph.bindConstructorValues({ advanceWidth: 1 });
 aGlyph.addUnicode(42);
-var glyphBBox: opentype.BoundingBox = aGlyph.getBoundingBox();
-var glyphPathBasic: opentype.Path = aGlyph.getPath();
-var glyphPathFull: opentype.Path = aGlyph.getPath(
+const glyphBBox: opentype.BoundingBox = aGlyph.getBoundingBox();
+const glyphPathBasic: opentype.Path = aGlyph.getPath();
+const glyphPathFull: opentype.Path = aGlyph.getPath(
     x,
     y,
     fontSize,
     { xScale: 1, yScale: 2 },
     font
 );
-var glyphContours: opentype.Contour = aGlyph.getContours();
-var glyphMetrics: opentype.Metrics = aGlyph.getMetrics();
+const glyphContours: opentype.Contour = aGlyph.getContours();
+const glyphMetrics: opentype.Metrics = aGlyph.getMetrics();
 aGlyph.draw(ctx, x, y, fontSize, {});
 aGlyph.drawPoints(ctx, x, y, fontSize);
 aGlyph.drawMetrics(ctx, x, y, fontSize);
@@ -112,8 +112,8 @@ aPath.closePath();
 aPath.extend(aPath);
 aPath.extend(aPath.commands);
 aPath.extend(aPath.getBoundingBox());
-var pathBBox: opentype.BoundingBox = aPath.getBoundingBox();
+const pathBBox: opentype.BoundingBox = aPath.getBoundingBox();
 aPath.draw(ctx);
-var pathData: string = aPath.toPathData(7);
-var pathSvg: string = aPath.toSVG(7);
-var pathDom: SVGPathElement = aPath.toDOMElement(7);
+const pathData: string = aPath.toPathData(7);
+const pathSvg: string = aPath.toSVG(7);
+const pathDom: SVGPathElement = aPath.toDOMElement(7);
diff --git a/types/opentype.js/tslint.json b/types/opentype.js/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/opentype.js/tslint.json
+++ b/types/opentype.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"
 }

From b31c0d512aad33692c1edcbcf34f8bf010dcdbf5 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Sat, 17 Feb 2018 21:22:06 +0100
Subject: [PATCH 127/388] feature(types): add types for yar, fix boom
 references

---
 types/catbox/index.d.ts                    |  14 +-
 types/hapi/definitions/util/lifecycle.d.ts |   2 +-
 types/yar/index.d.ts                       | 169 +++++++++++++++++++++
 types/yar/tsconfig.json                    |  23 +++
 types/yar/tslint.json                      |   1 +
 types/yar/yar-tests.ts                     |  24 +++
 6 files changed, 225 insertions(+), 8 deletions(-)
 create mode 100644 types/yar/index.d.ts
 create mode 100644 types/yar/tsconfig.json
 create mode 100644 types/yar/tslint.json
 create mode 100644 types/yar/yar-tests.ts

diff --git a/types/catbox/index.d.ts b/types/catbox/index.d.ts
index 826f1f7369..9d84f2204f 100644
--- a/types/catbox/index.d.ts
+++ b/types/catbox/index.d.ts
@@ -6,8 +6,8 @@
 
 import * as Boom from 'boom';
 
-export type CallBackNoResult = (err?: Boom.BoomError) => void;
-export type CallBackWithResult<T> = (err: Boom.BoomError | null | undefined, result: T) => void;
+export type CallBackNoResult = (err?: Boom.Boom) => void;
+export type CallBackWithResult<T> = (err: Boom.Boom | null | undefined, result: T) => void;
 
 /**
  * Client
@@ -50,7 +50,7 @@ export class Client implements ClientApi {
     /** isReady() - returns true if cache engine determines itself as ready, false if it is not ready. */
     isReady(): boolean;
     /** validateSegmentName(segment) - returns null if the segment name is valid (see below), otherwise should return an instance of Error with an appropriate message. */
-    validateSegmentName(segment: string): null | Boom.BoomError;
+    validateSegmentName(segment: string): null | Boom.Boom;
 }
 
 export type EnginePrototypeOrObject = EnginePrototype | ClientApi;
@@ -95,7 +95,7 @@ export interface ClientApi {
     /** isReady() - returns true if cache engine determines itself as ready, false if it is not ready. */
     isReady(): boolean;
     /** validateSegmentName(segment) - returns null if the segment name is valid (see below), otherwise should return an instance of Error with an appropriate message. */
-    validateSegmentName(segment: string): null | Boom.BoomError;
+    validateSegmentName(segment: string): null | Boom.Boom;
 }
 
 /**
@@ -211,7 +211,7 @@ export interface PolicyAPI {
  * @param cached - null if a valid item was not found in the cache, or IPolicyGetCallbackCachedOptions
  * @param report - an object with logging information about the generation operation
  */
-export type PolicyGetCallback = (err: null | Boom.BoomError, value: CacheItem, cached: PolicyGetCallbackCachedOptions, report: PolicyGetCallbackReportLog) => void;
+export type PolicyGetCallback = (err: null | Boom.Boom, value: CacheItem, cached: PolicyGetCallbackCachedOptions, report: PolicyGetCallbackReportLog) => void;
 
 export interface PolicyGetCallbackCachedOptions {
     /** item - the cached value. */
@@ -273,7 +273,7 @@ export interface PolicyOptions {
  *      * ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
  * @see {@link https://github.com/hapijs/catbox#policy}
  */
-export type GenerateFunc = (id: string, next: ((err: null | Boom.BoomError, value: CacheItem, ttl?: number) => void)) => void;
+export type GenerateFunc = (id: string, next: ((err: null | Boom.Boom, value: CacheItem, ttl?: number) => void)) => void;
 
 /**
  * An object with logging information about the generation operation containing the following keys (as relevant):
@@ -288,7 +288,7 @@ export interface PolicyGetCallbackReportLog {
     /** ttl - the cache ttl value for the record. */
     ttl: number;
     /** error - lookup error. */
-    error?: Boom.BoomError;
+    error?: Boom.Boom;
 }
 
 /**
diff --git a/types/hapi/definitions/util/lifecycle.d.ts b/types/hapi/definitions/util/lifecycle.d.ts
index 35f347dcd5..4eda3733bd 100644
--- a/types/hapi/definitions/util/lifecycle.d.ts
+++ b/types/hapi/definitions/util/lifecycle.d.ts
@@ -36,7 +36,7 @@ export namespace Lifecycle {
     export type ReturnValueTypes =
         (null | string | number | boolean) |
         (Buffer) |
-        (Error | Boom.BoomError) |
+        (Error | Boom.Boom) |
         (stream.Stream) |
         (object | object[]) |
         Object |
diff --git a/types/yar/index.d.ts b/types/yar/index.d.ts
new file mode 100644
index 0000000000..87b830cca3
--- /dev/null
+++ b/types/yar/index.d.ts
@@ -0,0 +1,169 @@
+// Type definitions for yar 9.0
+// Project: https://github.com/hapijs/yar#readme
+// Definitions by: Simon Schick <https://github.com/SimonSchick>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+// From https://github.com/hapijs/yar/blob/master/API.md
+
+import {
+    Server,
+    ServerOptionsCache,
+    Request,
+    Plugin,
+} 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.
+         */
+        name?: string;
+
+        /**
+         * maximum cookie size before using server-side storage.
+         * Defaults to 1K. Set to zero to always use server-side storage.
+         */
+        maxCookieSize?: number;
+
+        /**
+         * determines whether to store empty session before they've been modified.
+         * Defaults to true.
+         */
+        storeBlank?: boolean;
+
+        /**
+         * will cause yar to throw an exception if trying to persist to cache when the cache is unavailable.
+         * Setting this to false will allow applications using yar to run uninterrupted if the cache is not ready (however sessions will not be saving).
+         * Defaults to true.
+         */
+        errorOnCacheNotReady?: boolean;
+
+        /**
+         * hapi cache options which includes (among other options):
+         */
+        cache?: ServerOptionsCache;
+
+        /**
+         * server-side storage expiration (defaults to 1 day).
+         */
+        expiresIn?: number;
+        /**
+         * the configuration for cookie-specific features:
+         */
+        cookieOptions: {
+            /**
+             * (Required) used to encrypt and sign the cookie data.
+             * Must be at least 32 chars.
+             */
+            password: string;
+            /**
+             * determines the cookie path.
+             * Defaults to '/'.
+             */
+            path?: string;
+            /**
+             * enables the same-site cookie parameter.
+             * Default to 'Lax'.
+             */
+            isSameSite?: 'Lax' | 'Strict' | false;
+            /**
+             * determines whether or not to transfer using TLS/SSL.
+             * Defaults to true.
+             */
+            isSecure?: boolean;
+            /**
+             * determines whether or not to set HttpOnly option in cookie.
+             * Defaults to false.
+             */
+            isHttpOnly?: boolean;
+            /**
+             * sets the time for the cookie to live in the browser, in milliseconds.
+             * Defaults to null (session time-life - cookies are deleted when the browser is closed).
+             */
+            ttl?: number;
+            /**
+             * an optional function to create custom session IDs.
+             * Must retun a string and have the signature function (request) where:
+             * request - (optional) is the original request received from the client.
+             */
+            customSessionIDGenerator?(req: Request): string;
+        };
+    }
+
+    interface Yar {
+        /**
+         * clears the session and assigns a new session id.
+         */
+        reset(): void;
+        /**
+         * - assigns a value (string, object, etc) to a given key which will persist across requests. Returns the value.
+         */
+        set<T>(key: string, value: T): T;
+        /**
+         *  assigns values to multiple keys using each 'keysObject' top-level property. Returns the keysObject.
+         */
+        set<T extends { [key: string]: any }>(keysObject: T): T;
+
+        /**
+         * retrieve value using a key. If 'clear' is 'true', key is cleared on return.
+         */
+        get(key: string, clear?: boolean): any;
+        /**
+         * clears key.
+         */
+        clear(key: string): void;
+        /**
+         * Manually notify the session of changes (when using get()
+         * and changing the content of the returned reference directly without calling set()).
+         */
+        touch(): void;
+        /**
+         * stores volatile data - data that should be deleted once read.
+         * When given no arguments, it will return all of the flash messages and delete the originals.
+         * When given only a type, it will return all of the flash messages of that type and delete the originals.
+         * When given a type and a message, it will set or append that message to the given type.
+         * 'isOverride' used to indicate that the message provided should replace
+         * any existing value instead of being appended to it (defaults to false).
+         */
+        flash(type: string): any[];
+        flash(type: string, message: any, isOverride?: boolean): void;
+
+        /**
+         * if set to 'true', enables lazy mode.
+         * In lazy mode, request.yar can be modified directly (e.g. setting request.yar.myKey to an object value),
+         * and those keys will be stored and loaded back.
+         * Lazy mode isn't as fast as the normal get/set because
+         * it has to store the session state on every responses regardless of any changes being made.
+         */
+        lazy(enabled: boolean): void;
+    }
+}
+declare const yar: Plugin<yar.YarOptions>;
+export = yar;
+
+declare module 'hapi/definitions/request/request' {
+    interface Request {
+        yar: yar.Yar;
+    }
+}
diff --git a/types/yar/tsconfig.json b/types/yar/tsconfig.json
new file mode 100644
index 0000000000..c2723ded55
--- /dev/null
+++ b/types/yar/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",
+        "yar-tests.ts"
+    ]
+}
diff --git a/types/yar/tslint.json b/types/yar/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/yar/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/yar/yar-tests.ts b/types/yar/yar-tests.ts
new file mode 100644
index 0000000000..997b18f82b
--- /dev/null
+++ b/types/yar/yar-tests.ts
@@ -0,0 +1,24 @@
+import { Server, Request } from 'hapi';
+import * as yar from 'yar';
+
+async function boot() {
+    const server = new Server();
+    await server.register({
+        plugin: yar,
+        options: {
+            cookieOptions: {
+                password: 'test',
+                isSecure: true,
+            },
+        },
+    });
+
+    server.route({
+        path: '/test',
+        method: 'get',
+        handler(request: Request) {
+            const example = request.yar.get('example');
+            return example.key;
+        },
+    });
+}

From 4678a1b1a3a02c52ff2e1942e6750dc3e66554de Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Sat, 17 Feb 2018 21:31:59 +0100
Subject: [PATCH 128/388] undo boom changes, use correct path mapping

---
 types/catbox/index.d.ts                    | 14 +++++++-------
 types/hapi/definitions/util/lifecycle.d.ts |  2 +-
 types/yar/tsconfig.json                    |  5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/types/catbox/index.d.ts b/types/catbox/index.d.ts
index 9d84f2204f..826f1f7369 100644
--- a/types/catbox/index.d.ts
+++ b/types/catbox/index.d.ts
@@ -6,8 +6,8 @@
 
 import * as Boom from 'boom';
 
-export type CallBackNoResult = (err?: Boom.Boom) => void;
-export type CallBackWithResult<T> = (err: Boom.Boom | null | undefined, result: T) => void;
+export type CallBackNoResult = (err?: Boom.BoomError) => void;
+export type CallBackWithResult<T> = (err: Boom.BoomError | null | undefined, result: T) => void;
 
 /**
  * Client
@@ -50,7 +50,7 @@ export class Client implements ClientApi {
     /** isReady() - returns true if cache engine determines itself as ready, false if it is not ready. */
     isReady(): boolean;
     /** validateSegmentName(segment) - returns null if the segment name is valid (see below), otherwise should return an instance of Error with an appropriate message. */
-    validateSegmentName(segment: string): null | Boom.Boom;
+    validateSegmentName(segment: string): null | Boom.BoomError;
 }
 
 export type EnginePrototypeOrObject = EnginePrototype | ClientApi;
@@ -95,7 +95,7 @@ export interface ClientApi {
     /** isReady() - returns true if cache engine determines itself as ready, false if it is not ready. */
     isReady(): boolean;
     /** validateSegmentName(segment) - returns null if the segment name is valid (see below), otherwise should return an instance of Error with an appropriate message. */
-    validateSegmentName(segment: string): null | Boom.Boom;
+    validateSegmentName(segment: string): null | Boom.BoomError;
 }
 
 /**
@@ -211,7 +211,7 @@ export interface PolicyAPI {
  * @param cached - null if a valid item was not found in the cache, or IPolicyGetCallbackCachedOptions
  * @param report - an object with logging information about the generation operation
  */
-export type PolicyGetCallback = (err: null | Boom.Boom, value: CacheItem, cached: PolicyGetCallbackCachedOptions, report: PolicyGetCallbackReportLog) => void;
+export type PolicyGetCallback = (err: null | Boom.BoomError, value: CacheItem, cached: PolicyGetCallbackCachedOptions, report: PolicyGetCallbackReportLog) => void;
 
 export interface PolicyGetCallbackCachedOptions {
     /** item - the cached value. */
@@ -273,7 +273,7 @@ export interface PolicyOptions {
  *      * ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
  * @see {@link https://github.com/hapijs/catbox#policy}
  */
-export type GenerateFunc = (id: string, next: ((err: null | Boom.Boom, value: CacheItem, ttl?: number) => void)) => void;
+export type GenerateFunc = (id: string, next: ((err: null | Boom.BoomError, value: CacheItem, ttl?: number) => void)) => void;
 
 /**
  * An object with logging information about the generation operation containing the following keys (as relevant):
@@ -288,7 +288,7 @@ export interface PolicyGetCallbackReportLog {
     /** ttl - the cache ttl value for the record. */
     ttl: number;
     /** error - lookup error. */
-    error?: Boom.Boom;
+    error?: Boom.BoomError;
 }
 
 /**
diff --git a/types/hapi/definitions/util/lifecycle.d.ts b/types/hapi/definitions/util/lifecycle.d.ts
index 4eda3733bd..35f347dcd5 100644
--- a/types/hapi/definitions/util/lifecycle.d.ts
+++ b/types/hapi/definitions/util/lifecycle.d.ts
@@ -36,7 +36,7 @@ export namespace Lifecycle {
     export type ReturnValueTypes =
         (null | string | number | boolean) |
         (Buffer) |
-        (Error | Boom.Boom) |
+        (Error | Boom.BoomError) |
         (stream.Stream) |
         (object | object[]) |
         Object |
diff --git a/types/yar/tsconfig.json b/types/yar/tsconfig.json
index c2723ded55..3843d1296e 100644
--- a/types/yar/tsconfig.json
+++ b/types/yar/tsconfig.json
@@ -13,6 +13,11 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "boom": [
+                "boom/v4"
+            ]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },

From 53f90b5a96f4eb5fa80e794de117e2e02ab0ee06 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Sat, 17 Feb 2018 21:42:28 +0100
Subject: [PATCH 129/388] fix return type for `flash`

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

diff --git a/types/yar/index.d.ts b/types/yar/index.d.ts
index 87b830cca3..db32834288 100644
--- a/types/yar/index.d.ts
+++ b/types/yar/index.d.ts
@@ -147,7 +147,7 @@ declare namespace yar {
          * any existing value instead of being appended to it (defaults to false).
          */
         flash(type: string): any[];
-        flash(type: string, message: any, isOverride?: boolean): void;
+        flash(type: string, message: any, isOverride?: boolean): any[];
 
         /**
          * if set to 'true', enables lazy mode.

From a282ba5b844fa808d77a09edd1c412eaf25ae376 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Sat, 17 Feb 2018 22:10:28 +0100
Subject: [PATCH 130/388] merge overloads

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

diff --git a/types/yar/index.d.ts b/types/yar/index.d.ts
index db32834288..678d3e49a9 100644
--- a/types/yar/index.d.ts
+++ b/types/yar/index.d.ts
@@ -146,8 +146,7 @@ declare namespace yar {
          * 'isOverride' used to indicate that the message provided should replace
          * any existing value instead of being appended to it (defaults to false).
          */
-        flash(type: string): any[];
-        flash(type: string, message: any, isOverride?: boolean): any[];
+        flash(type: string, message?: any, isOverride?: boolean): any[];
 
         /**
          * if set to 'true', enables lazy mode.

From d2ca629f0aaf6da57a786a2a3397f2c280e8b433 Mon Sep 17 00:00:00 2001
From: Rodrigo Saboya <saboya@users.noreply.github.com>
Date: Sat, 17 Feb 2018 15:08:34 -0200
Subject: [PATCH 131/388] Sync plugin definitions to Hapi 17.

---
 .../hapi-auth-basic/hapi-auth-basic-tests.ts  |  4 ++--
 types/hapi-auth-basic/index.d.ts              |  6 ++---
 types/hapi-auth-basic/tsconfig.json           |  5 +----
 types/nes/index.d.ts                          | 10 ++++-----
 types/nes/test/broadcast-server.ts            |  4 ++--
 types/nes/test/client-require.ts              |  4 ++--
 types/nes/test/nes-tests.ts                   | 10 ++++-----
 types/nes/test/route-authentication-server.ts | 22 ++++++++++++-------
 types/nes/test/route-invocation-server.ts     |  6 ++---
 types/nes/test/subscription-filter-client.ts  |  4 ++--
 types/nes/test/subscription-filter-server.ts  | 10 ++++-----
 types/nes/test/subscriptions-client.ts        |  6 ++---
 types/nes/test/subscriptions-server.ts        |  6 ++---
 types/nes/tsconfig.json                       |  5 +----
 14 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/types/hapi-auth-basic/hapi-auth-basic-tests.ts b/types/hapi-auth-basic/hapi-auth-basic-tests.ts
index 1a7192af6f..875a53c104 100644
--- a/types/hapi-auth-basic/hapi-auth-basic-tests.ts
+++ b/types/hapi-auth-basic/hapi-auth-basic-tests.ts
@@ -2,9 +2,9 @@
 
 import Bcrypt = require('bcrypt');
 import Basic = require('hapi-auth-basic');
-import * as Hapi from 'hapi';
+import { Server } from 'hapi';
 
-const server = new Hapi.Server();
+const server = new Server();
 
 interface User {
     username: string;
diff --git a/types/hapi-auth-basic/index.d.ts b/types/hapi-auth-basic/index.d.ts
index ddf05c348a..b738935862 100644
--- a/types/hapi-auth-basic/index.d.ts
+++ b/types/hapi-auth-basic/index.d.ts
@@ -5,7 +5,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-import * as Hapi from 'hapi';
+import { Plugin, Request, ResponseToolkit } from 'hapi';
 
 declare namespace Basic {
     interface ValidateCustomResponse {
@@ -18,10 +18,10 @@ declare namespace Basic {
     }
 
     interface Validate {
-        (request: Hapi.Request, username: string, password: string, h: object): Promise<ValidateResponse | ValidateCustomResponse>;
+        (request: Request, username: string, password: string, h: ResponseToolkit): Promise<ValidateResponse | ValidateCustomResponse>;
     }
 }
 
-declare var Basic: Hapi.PluginFunction<{}>;
+declare var Basic: Plugin<{}>;
 
 export = Basic;
diff --git a/types/hapi-auth-basic/tsconfig.json b/types/hapi-auth-basic/tsconfig.json
index 9d6132482f..191d992f70 100644
--- a/types/hapi-auth-basic/tsconfig.json
+++ b/types/hapi-auth-basic/tsconfig.json
@@ -16,9 +16,6 @@
         "paths": {
             "boom": [
                 "boom/v4"
-            ],
-            "hapi": [
-                "hapi/v16"
             ]
         },
         "noEmit": true,
@@ -28,4 +25,4 @@
         "index.d.ts",
         "hapi-auth-basic-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/nes/index.d.ts b/types/nes/index.d.ts
index c4d26ecda0..27b9d84dd1 100644
--- a/types/nes/index.d.ts
+++ b/types/nes/index.d.ts
@@ -23,17 +23,19 @@
  *      failing test demonstrating use if so.
  */
 
-import * as Hapi from 'hapi';
+import { Plugin } from 'hapi';
 import NesClient = require('nes/client');
 
-declare module 'hapi' {
+declare module 'hapi/definitions/server/server' {
     interface Server {
         broadcast(message: any, options?: nes.ServerBroadcastOptions): void;
         subscription(path: string, options?: nes.ServerSubscriptionOptions): void;
         publish(path: string, message: any, options?: nes.ServerPublishOptions): void;
         eachSocket(each: (socket: nes.Socket) => void, options?: nes.ServerEachSocketOptions): void;
     }
+}
 
+declare module 'hapi/definitions/request/request' {
     interface Request {
         socket: nes.Socket;
     }
@@ -129,8 +131,6 @@ interface NesClassExports {
     };
 }
 
-interface NesAllExports extends NesClassExports, Hapi.PluginFunction<{}> {}
-
-declare var nes: NesAllExports;
+declare var nes: NesClassExports & Plugin<{}>;
 
 export = nes;
diff --git a/types/nes/test/broadcast-server.ts b/types/nes/test/broadcast-server.ts
index 6ef8f7aafa..8af469f645 100644
--- a/types/nes/test/broadcast-server.ts
+++ b/types/nes/test/broadcast-server.ts
@@ -1,9 +1,9 @@
 // from https://github.com/hapijs/nes#broadcast
 
-import Hapi = require('hapi');
+import { Server } from 'hapi';
 import Nes = require('nes');
 
-var server = new Hapi.Server();
+const server = new Server();
 
 server.register(Nes).then(() => {
 
diff --git a/types/nes/test/client-require.ts b/types/nes/test/client-require.ts
index f5a07ea1d3..5bbc8f8370 100644
--- a/types/nes/test/client-require.ts
+++ b/types/nes/test/client-require.ts
@@ -5,8 +5,8 @@
 
 import Client = require('nes/client');
 
-var options: Client.ClientConnectOptions = {
+const options: Client.ClientConnectOptions = {
     delay: 3
 }
 
-var client: Client = new Client('ws://localhost', options);
+const client: Client = new Client('ws://localhost', options);
diff --git a/types/nes/test/nes-tests.ts b/types/nes/test/nes-tests.ts
index 85cff1e208..b5557adfb9 100644
--- a/types/nes/test/nes-tests.ts
+++ b/types/nes/test/nes-tests.ts
@@ -1,18 +1,18 @@
-import Hapi = require('hapi');
+import { Request, ResponseToolkit, Server } from 'hapi';
 import Nes = require('nes');
 
-var server: Hapi.Server = new Hapi.Server();
+const server = new Server();
 
 server.register(Nes).then(() => {
     // No longer need to cast to Nes.Server as Hapi.Server has been modified directly.
     // let wsServer: Nes.Server = server as Nes.Server;
-    let wsServer: Hapi.Server = server;
+    let wsServer = server;
     wsServer.subscription('/item/{id}');
-    wsServer.route( {
+    wsServer.route({
         method: 'GET',
         path: '/test',
         config: {
-            handler: (request, h) => {
+            handler: (request: Request, h: ResponseToolkit) => {
                 return {test: 'passes ' + request.socket.id};
             }
         }
diff --git a/types/nes/test/route-authentication-server.ts b/types/nes/test/route-authentication-server.ts
index 2080f04ef4..6aab8cf53e 100644
--- a/types/nes/test/route-authentication-server.ts
+++ b/types/nes/test/route-authentication-server.ts
@@ -1,12 +1,18 @@
 // from https://github.com/hapijs/nes#route-authentication
 
-import Hapi = require('hapi');
+import { AuthCredentials, Request, ResponseToolkit, Server } from 'hapi';
 import Basic = require('hapi-auth-basic');
 import Bcrypt = require('bcrypt');
 import Nes = require('nes');
 
-var server = new Hapi.Server();
-server.connection();
+const server = new Server();
+
+declare module 'hapi/definitions/request/request-auth' {
+    interface AuthCredentials {
+        id: string;
+        name: string;
+    }
+}
 
 server.register([Basic, Nes]).then(() => {
 
@@ -19,7 +25,7 @@ server.register([Basic, Nes]).then(() => {
         id: string;
     }
 
-    var users: {[index: string]: User} = {
+    const users: { [index: string]: User } = {
         john: {
             username: 'john',
             password: '$2a$10$iqJSHD.BGr0E2IxQwYgJmeP3NvhPrXAeLSaGCj6IR/XU5QtjVu5Tm',   // 'secret'
@@ -28,9 +34,9 @@ server.register([Basic, Nes]).then(() => {
         }
     };
 
-    var validate: Basic.Validate = async (request, username, password, h) => {
+    const validate: Basic.Validate = async (request, username, password, h) => {
 
-        var user = users[username];
+        const user = users[username];
         if (!user) {
             return { credentials: null, isValid: false };
         }
@@ -40,7 +46,7 @@ server.register([Basic, Nes]).then(() => {
         return { isValid, credentials: { id: user.id, name: user.name } };
     };
 
-    server.auth.strategy('simple', 'basic', { validateFunc: validate });
+    server.auth.strategy('simple', 'basic', {validateFunc: validate});
     server.auth.default('simple');
 
     // Configure route with authentication
@@ -50,7 +56,7 @@ server.register([Basic, Nes]).then(() => {
         path: '/h',
         config: {
             id: 'hello',
-            handler: function (request, h) {
+            handler: function (request: Request, h: ResponseToolkit) {
 
                 return 'Hello ' + request.auth.credentials.name;
             }
diff --git a/types/nes/test/route-invocation-server.ts b/types/nes/test/route-invocation-server.ts
index d6893495c9..eb0ec4bf87 100644
--- a/types/nes/test/route-invocation-server.ts
+++ b/types/nes/test/route-invocation-server.ts
@@ -1,9 +1,9 @@
 // from https://github.com/hapijs/nes#route-invocation
 
-import Hapi = require('hapi');
+import { Request, ResponseToolkit, Server } from 'hapi';
 import Nes = require('nes');
 
-var server = new Hapi.Server();
+const server = new Server();
 
 server.register(Nes).then(() => {
 
@@ -12,7 +12,7 @@ server.register(Nes).then(() => {
         path: '/h',
         config: {
             id: 'hello',
-            handler: (request, h) => {
+            handler: (request: Request, h: ResponseToolkit) => {
 
                 return 'world!';
             }
diff --git a/types/nes/test/subscription-filter-client.ts b/types/nes/test/subscription-filter-client.ts
index 05253539a4..95193be6c8 100644
--- a/types/nes/test/subscription-filter-client.ts
+++ b/types/nes/test/subscription-filter-client.ts
@@ -8,7 +8,7 @@ var client = new Nes.Client('ws://localhost');
 
 client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } } }).then(() => {
 
-    var handler: Nes.Handler = (update) => {
+    const handler: Nes.Handler = (update) => {
 
         // First publish is not received (filtered due to updater key)
         // update -> { id: 6, status: 'initial', updater: 'steve' }
@@ -27,7 +27,7 @@ var client = new NesClient('ws://localhost');
 
 client.connect({ auth: { headers: { authorization: 'Basic am9objpzZWNyZXQ=' } } }).then(() => {
 
-    var handler: NesClient.Handler = (update) => {
+    const handler: NesClient.Handler = (update) => {
 
         // First publish is not received (filtered due to updater key)
         // update -> { id: 6, status: 'initial', updater: 'steve' }
diff --git a/types/nes/test/subscription-filter-server.ts b/types/nes/test/subscription-filter-server.ts
index 7a63abf151..acc124227e 100644
--- a/types/nes/test/subscription-filter-server.ts
+++ b/types/nes/test/subscription-filter-server.ts
@@ -1,11 +1,11 @@
 // from https://github.com/hapijs/nes#subscription-filter
 
-import Hapi = require('hapi');
+import {Server} from 'hapi';
 import Basic = require('hapi-auth-basic');
 import Bcrypt = require('bcrypt');
 import Nes = require('nes');
 
-var server = new Hapi.Server();
+var server = new Server();
 
 server.register([Basic, Nes]).then(() => {
 
@@ -18,7 +18,7 @@ server.register([Basic, Nes]).then(() => {
         id: string;
     }
 
-    var users: {[index: string]: User} = {
+    const users: {[index: string]: User} = {
         john: {
             username: 'john',
             password: '$2a$10$iqJSHD.BGr0E2IxQwYgJmeP3NvhPrXAeLSaGCj6IR/XU5QtjVu5Tm',   // 'secret'
@@ -27,9 +27,9 @@ server.register([Basic, Nes]).then(() => {
         }
     };
 
-    var validate: Basic.Validate = async (request, username, password, h) => {
+    const validate: Basic.Validate = async (request, username, password, h) => {
 
-        var user = users[username];
+        const user = users[username];
         if (!user) {
             return { credentials: null, isValid: false };
         }
diff --git a/types/nes/test/subscriptions-client.ts b/types/nes/test/subscriptions-client.ts
index 9f6150f90c..0203d44ad8 100644
--- a/types/nes/test/subscriptions-client.ts
+++ b/types/nes/test/subscriptions-client.ts
@@ -3,9 +3,9 @@
 import Nes = require('nes');
 
 var client = new Nes.Client('ws://localhost');
-    client.connect().then(() => {;
+client.connect().then(() => {
 
-    var handler: Nes.Handler = (update, flags) => {
+    const handler: Nes.Handler = (update, flags) => {
 
         // update -> { id: 5, status: 'complete' }
         // Second publish is not received (doesn't match)
@@ -21,7 +21,7 @@ import NesClient = require('nes/client');
 var client = new NesClient('ws://localhost');
 client.connect().then(() => {
 
-    var handler: NesClient.Handler = (update, flags) => {
+    const handler: NesClient.Handler = (update, flags) => {
 
         // update -> { id: 5, status: 'complete' }
         // Second publish is not received (doesn't match)
diff --git a/types/nes/test/subscriptions-server.ts b/types/nes/test/subscriptions-server.ts
index 1280f2afd1..390bd50c63 100644
--- a/types/nes/test/subscriptions-server.ts
+++ b/types/nes/test/subscriptions-server.ts
@@ -1,11 +1,11 @@
 // from https://github.com/hapijs/nes#subscriptions
 
-import Hapi = require('hapi');
+import { Server } from 'hapi';
 import Nes = require('nes');
 
-var server = new Hapi.Server();
+var server = new Server();
 
-server.register(Nes).then(() =>{;
+server.register(Nes).then(() => {
 
     server.subscription('/item/{id}');
 
diff --git a/types/nes/tsconfig.json b/types/nes/tsconfig.json
index dc39b99fed..05fc49c647 100644
--- a/types/nes/tsconfig.json
+++ b/types/nes/tsconfig.json
@@ -16,9 +16,6 @@
         "paths": {
             "boom": [
                 "boom/v4"
-            ],
-            "hapi": [
-                "hapi/v16"
             ]
         },
         "noEmit": true,
@@ -41,4 +38,4 @@
         "test/subscriptions-client.ts",
         "test/subscriptions-server.ts"
     ]
-}
\ No newline at end of file
+}

From 723755f032195a4b65dd6690afa792230cb56e60 Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.io>
Date: Sat, 17 Feb 2018 23:54:15 +0100
Subject: [PATCH 132/388] Update vision types to 5.3

---
 types/vision/index.d.ts         | 416 ++++++++++++++++++--------------
 types/vision/tsconfig.json      |   7 +-
 types/vision/tslint.json        |  80 +-----
 types/vision/v4/index.d.ts      | 212 ++++++++++++++++
 types/vision/v4/tsconfig.json   |  34 +++
 types/vision/v4/tslint.json     |  79 ++++++
 types/vision/v4/vision-tests.ts | 125 ++++++++++
 types/vision/vision-tests.ts    | 124 +++-------
 8 files changed, 731 insertions(+), 346 deletions(-)
 create mode 100644 types/vision/v4/index.d.ts
 create mode 100644 types/vision/v4/tsconfig.json
 create mode 100644 types/vision/v4/tslint.json
 create mode 100644 types/vision/v4/vision-tests.ts

diff --git a/types/vision/index.d.ts b/types/vision/index.d.ts
index 5539ad07c2..012bc36d48 100644
--- a/types/vision/index.d.ts
+++ b/types/vision/index.d.ts
@@ -1,212 +1,272 @@
-// Type definitions for vision 4.1
+// Type definitions for vision 5.3
 // Project: https://github.com/hapijs/vision
-// Definitions by: Jason Swearingen <https://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
+// Definitions by: Jason Swearingen <https://github.com/jasonswearingen>
+//                 Alexander James Phillips <https://github.com/AJamesPhillips>
+//                 Silas Rech <https://github.com/lenovouser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-import * as Hapi from 'hapi';
+import {
+    Plugin,
+    Request,
+    ResponseObject,
+} from 'hapi';
 
-declare module 'hapi' {
+declare namespace vision {
+    /**
+     * Options for initialising server views manager
+     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions}
+     */
+    interface ServerViewsConfiguration extends ServerViewsAdditionalOptions {
+        /**
+         * Required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.
+         * Alternatively, the extension can be mapped to an object
+         */
+        engines: {[fileExtension: string]: NpmModule} | ServerViewsEnginesOptions;
+        /** defines the default filename extension to append to template names when multiple engines are configured and no explicit extension is provided for a given template. No default value. */
+        defaultExtension?: string;
+    }
+
+    /**
+     * Includes `module` and any of the views options listed below (@see ServerViewsAdditionalOptions) (except defaultExtension) to override the defaults for a specific engine.
+     */
+    interface ServerViewsEnginesOptions extends ServerViewsAdditionalOptions {
+        /**
+         * The npm module used for rendering the templates. The module object must contain the compile() function
+         * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions} > options > engines > module
+         */
+        module: NpmModule;
+    }
+    interface ServerViewsAdditionalOptions extends ViewHandlerOrReplyOptions {
+        /**
+         * The root file path, or array of file paths, where partials are located.
+         * Partials are small segments of template code that can be nested and reused throughout other templates.
+         * Defaults to no partials support (empty path).
+         */
+        partialsPath?: string | string[];
+        /**
+         * The directory path, or array of directory paths, where helpers are located.
+         * Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.
+         * Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.
+         * The files must export a single method with the signature function(context) and return a string.
+         * Sub-folders are not supported and are ignored. Defaults to no helpers support (empty path).
+         * Note that jade does not support loading helpers this way.
+         */
+        helpersPath?: string | string[];
+        /** if set to false, templates will not be cached (thus will be read from file on every use). Defaults to true. */
+        isCached?: boolean;
+    }
+
+    /**
+     *
+     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#the-view-handler} > options for the list of attributes it can not have (isCached, partialsPath, helpersPath)
+     */
+    interface ViewHandlerOrReplyOptions {
+        /** the root file path, or array of file paths, used to resolve and load the templates identified when calling reply.view(). Defaults to current working directory. */
+        path?: string | string[];
+        /**
+         * a base path used as prefix for path and partialsPath. No default.
+         */
+        relativeTo?: string;
+        /**
+         * If set to true or a layout filename, layout support is enabled.
+         * A layout is a single template file used as the parent template for other view templates in the same engine.
+         * If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension.
+         * Otherwise, the provided filename is suffixed with the engine's extension and loaded.
+         * Disable layout when using Jade as it will handle including any layout files independently.
+         * Defaults to false.
+         */
+        layout?: boolean;
+        /** the root file path, or array of file paths, where layout templates are located (using the relativeTo prefix if present). Defaults to path. */
+        layoutPath?: string | string[];
+        /** the key used by the template engine to denote where primary template content should go. Defaults to 'content'. */
+        layoutKeyword?: string;
+        /** the text encoding used by the templates when reading the files and outputting the result. Defaults to 'utf8'. */
+        encoding?: string;
+        /** if set to true, allows absolute template paths passed to reply.view(). Defaults to false. */
+        allowAbsolutePaths?: boolean;
+        /** if set to true, allows template paths passed to reply.view() to contain '../'. Defaults to false. */
+        allowInsecureAccess?: boolean;
+        /** options object passed to the engine's compile function. Defaults to empty options {}. */
+        compileOptions?: CompileOptions;
+        /** options object passed to the returned function from the compile operation. Defaults to empty options {}. */
+        runtimeOptions?: RuntimeOptions;
+        /** the content type of the engine results. Defaults to 'text/html'. */
+        contentType?: string;
+        /** specify whether the engine compile() method is 'sync' or 'async'. Defaults to 'sync'. */
+        compileMode?: 'sync' | 'async';
+        /**
+         * A global context used with all templates.
+         * The global context option can be either an object or a function that takes the request as its only argument and returns a context object.
+         * The request object is only provided when using the view handler or reply.view().
+         * When using server.render() or request.render(), the request argument will be null.
+         * When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().
+         * When multiple context objects are used, values from the global context always have lowest precedence.
+         */
+        context?: object | ((request: Request) => object);
+    }
+
+    /**
+     * Options passed to module when compiling template.
+     * Cast your options to this interface or extend it with:
+     *      declare module 'hapi' {
+     *          interface CompileOptions {
+     *              noEscape: boolean;
+     *          }
+     *      }
+     */
+    type CompileOptions = object;
+    type RuntimeOptions = object;
+
+    /**
+     * The rendering function. The required function signature depends on the compileMode settings (see below).
+     *
+     * If compileMode is 'sync', the signature is compile(template, options),
+     * the return value is a function with signature function(context, options) (the compiled sync template),
+     * and the method is allowed to throw errors.
+     *
+     * If compileMode is 'async',
+     * the signature is compile(template, options, next) where next has the signature function(err, compiled),
+     * compiled is a function with signature function(context, options, callback) (the compiled async template)
+     * and callback has the signature function(err, rendered).
+     */
+    type ServerViewCompileSync  = (template: string, options: any) => (context: any, options: any) => void;
+    type ServerViewCompileAsync = (template: string, options: any, next: ServerViewCompileNext) => void;
+
+    type ServerViewCompile = ServerViewCompileSync | ServerViewCompileAsync;
+
+    type ServerViewCompileNext = (err: Error | null, compiled: (context: any, options: any, callback: (err: null | Error, rendered: string | null) => void) => void) => void;
+
+    /**
+     * The npm module used for rendering the templates. The module object must contain the compile() function
+     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions} > options > engines > module
+     */
+    interface NpmModule {
+        /**
+         * The rendering function. The required function signature depends on the compileMode settings
+         */
+        compile: ServerViewCompile;
+        /**
+         * Initializes additional engine state.The config object is the engine configuration object allowing updates to be made.
+         * This is useful for engines like Nunjucks that rely on additional state for rendering. next has the signature function(err).
+         */
+        prepare?(config: EngineConfigurationObject, next: (err?: Error) => void): void;
+        /**
+         * Registers a partial for use during template rendering.
+         * The name is the partial path that templates should use to reference the partial and src is the uncompiled template string for the partial.
+         */
+        registerPartial?(name: string, src: string): void;
+        /**
+         * Registers a helper for use during template rendering.
+         * The name is the name that templates should use to reference the helper and helper is the function that will be invoked when the helper is called.
+         */
+        registerHelper?(name: string, helper: (...args: any[]) => any): void;
+    }
+
+    type EngineConfigurationObject = object;
+
+    /**
+     * Renders a template
+     * @param template - the template filename and path, relative to the views manager templates path (path or relativeTo).
+     * @param context - optional object used by the template to render context-specific result. Defaults to no context ({}).
+     * @param options - optional object used to override the views manager configuration.
+     */
+    type RenderMethod = (template: string, context?: any, options?: ServerViewsAdditionalOptions) => Promise<string>;
+
+    /**
+     * View Manager
+     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#view-manager}
+     */
+    interface ViewManager {
+        /**
+         * Registers a helper, on all configured engines that have a registerHelper() method, for use during template rendering.
+         * Engines without a registerHelper() method will be skipped.
+         * The name is the name that templates should use to reference the helper and helper is the function that will be invoked when the helper is called.
+         * @param name
+         * @param helper
+         * @see {@link https://github.com/hapijs/vision/blob/master/API.md#managerregisterhelpername-helper}
+         */
+        registerHelper(name: string, helper: (...args: any[]) => any): void;
+        /**
+         * Renders a template. This is typically not needed and it is usually more convenient to use server.render().
+         * @see {@link https://github.com/hapijs/vision/blob/master/API.md#managerrendertemplate-context-options-callback}
+         */
+        render: RenderMethod;
+    }
+}
+
+declare const vision: Plugin<vision.ServerViewsAdditionalOptions>;
+
+export = vision;
+
+declare module 'hapi/definitions/server/server' {
     interface Server {
         /**
          * Initializes the server views manager
          * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions}
          */
-        views(options: ServerViewsConfiguration): ViewManager;
+        views(options: vision.ServerViewsConfiguration): vision.ViewManager;
         /**
          * Utilizes the server views manager to render a template
          * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverrendertemplate-context-options-callback}
          */
-        render: RenderMethod;
+        render: vision.RenderMethod;
     }
+}
 
+declare module 'hapi/definitions/request/request' {
     interface Request {
         /**
-         * request.render() works the same way as server.render() but is for use inside of request handlers. server.render() does not work inside request handlers when called via request.server.render() if the view manager was created by a plugin. This is because the request.server object does not have access to the plugin realm where the view manager was configured. request.render() gets its realm from the route that the request was bound to.
-         * Note that this will not work in onRequest extensions added by the plugin because the route isn't yet set at this point in the request lifecycle and the request.render() method will produce the same limited results server.render() can.
+         * request.render() works the same way as server.render() but is for use inside of request handlers.
+         * server.render() does not work inside request handlers when called via request.server.render() if the view manager was created by a plugin.
+         * This is because the request.server object does not have access to the plugin realm where the view manager was configured.
+         * request.render() gets its realm from the route that the request was bound to.
+         * Note that this will not work in onRequest extensions added by the plugin because the route isn't yet set at this point in the request
+         * lifecycle and the request.render() method will produce the same limited results server.render() can.
          * @see {@link https://github.com/hapijs/vision/blob/master/API.md#requestrendertemplate-context-options-callback}
          */
-        render: RenderMethod;
+        render: vision.RenderMethod;
     }
+}
 
-    interface RouteHandlerPlugins {
-        /**
-         * The view handler can be used with routes registered in the same realm as the view manager. The handler takes an options parameter that can be either a string or an object. When the options parameter is a string, it should be the filename and path of the template relative to the templates path configured via the views manager. When the options parameter is an object, it may have the following keys:
-         * The rendering context contains the `params`, `payload`, `query`, and `pre` values from the request by default (these can be overriden by values explicitly set via the options).
-         * @see {@link https://github.com/hapijs/vision/blob/master/API.md#the-view-handler}
-         */
-        view?: string | {
-            /** the template filename and path, relative to the templates path configured via the server views manager. */
-            template: string;
-            /** optional object used by the template to render context-specific result. Defaults to no context {}. */
-            context?: Object;
-            /**
-             * optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.
-             * TODO check if it can have `defaultExtension`.
-             */
-            options?: ViewHandlerOrReplyOptions;
-        }
-    }
-
-    interface Base_Reply {
+declare module 'hapi/definitions/response/response-toolkit' {
+    interface ResponseToolkit {
         /**
          * Concludes the handler activity by returning control over to the router with a templatized view response
          * Returns a response object. The generated response will have the variety property set to view.
          * The response flow control rules apply.
          * @param template  the template filename and path, relative to the templates path configured via the server views manager.
          * @param context  optional object used by the template to render context-specific result. Defaults to no context {}.
-         * @param options  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.
+         * @param options  optional object used to override the server's views manager configuration for this response.
+         *                 Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.
          * @see {@link https://github.com/hapijs/vision/blob/master/API.md#replyviewtemplate-context-options}
          */
-        view(templatePath: string, context?: any, options?: ViewHandlerOrReplyOptions): Response;
+        view(templatePath: string, context?: any, options?: vision.ViewHandlerOrReplyOptions): ResponseObject;
     }
 }
 
-/**
- * Options for initialising server views manager
- * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions}
- */
-export interface ServerViewsConfiguration extends ServerViewsAdditionalOptions {
-    /** required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates. Alternatively, the extension can be mapped to an object */
-    engines: {[fileExtension: string]: NpmModule} | ServerViewsEnginesOptions;
-    /** defines the default filename extension to append to template names when multiple engines are configured and no explicit extension is provided for a given template. No default value. */
-    defaultExtension?: string;
+declare module 'hapi/definitions/route/route-options' {
+    interface RouteOptions {
+        /**
+         * The view handler can be used with routes registered in the same realm as the view manager.
+         * The handler takes an options parameter that can be either a string or an object.
+         * When the options parameter is a string, it should be the filename and path of the template relative
+         * to the templates path configured via the views manager. When the options parameter is an object, it may have the following keys:
+         * The rendering context contains the `params`, `payload`, `query`, and `pre` values from the request by default
+         * (these can be overriden by values explicitly set via the options).
+         * @see {@link https://github.com/hapijs/vision/blob/master/API.md#the-view-handler}
+         */
+        view?: string | {
+            /** the template filename and path, relative to the templates path configured via the server views manager. */
+            template: string;
+            /** optional object used by the template to render context-specific result. Defaults to no context {}. */
+            context?: object;
+            /**
+             * optional object used to override the server's views manager configuration for this response.
+             * Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.
+             * TODO check if it can have `defaultExtension`.
+             */
+            options?: vision.ViewHandlerOrReplyOptions;
+        };
+    }
 }
-
-/**
- * Includes `module` and any of the views options listed below (@see ServerViewsAdditionalOptions) (except defaultExtension) to override the defaults for a specific engine.
- */
-export interface ServerViewsEnginesOptions extends ServerViewsAdditionalOptions {
-    /**
-     * The npm module used for rendering the templates. The module object must contain the compile() function
-     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions} > options > engines > module
-     */
-    module: NpmModule
-}
-export interface ServerViewsAdditionalOptions extends ViewHandlerOrReplyOptions {
-    /** the root file path, or array of file paths, where partials are located. Partials are small segments of template code that can be nested and reused throughout other templates. Defaults to no partials support (empty path). */
-    partialsPath?: string | string[];
-    /** the directory path, or array of directory paths, where helpers are located. Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs. Each '.js' file in the helpers directory is loaded and the file name is used as the helper name. The files must export a single method with the signature function(context) and return a string. Sub-folders are not supported and are ignored. Defaults to no helpers support (empty path). Note that jade does not support loading helpers this way. */
-    helpersPath?: string | string[];
-    /** if set to false, templates will not be cached (thus will be read from file on every use). Defaults to true. */
-    isCached?: boolean;
-}
-
-/**
- *
- * @see {@link https://github.com/hapijs/vision/blob/master/API.md#the-view-handler} > options for the list of attributes it can not have (isCached, partialsPath, helpersPath)
- */
-export interface ViewHandlerOrReplyOptions {
-    /** the root file path, or array of file paths, used to resolve and load the templates identified when calling reply.view(). Defaults to current working directory. */
-    path?: string | string[];
-    /**
-     * a base path used as prefix for path and partialsPath. No default.
-     * TODO update if PR for updating docs is accepted.
-     */
-    relativeTo?: string;
-    /** if set to true or a layout filename, layout support is enabled. A layout is a single template file used as the parent template for other view templates in the same engine. If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded. Disable layout when using Jade as it will handle including any layout files independently. Defaults to false. */
-    layout?: boolean;
-    /** the root file path, or array of file paths, where layout templates are located (using the relativeTo prefix if present). Defaults to path. */
-    layoutPath?: string | string[];
-    /** the key used by the template engine to denote where primary template content should go. Defaults to 'content'. */
-    layoutKeyword?: string;
-    /** the text encoding used by the templates when reading the files and outputting the result. Defaults to 'utf8'. */
-    encoding?: string;
-    /** if set to true, allows absolute template paths passed to reply.view(). Defaults to false. */
-    allowAbsolutePaths?: boolean;
-    /** if set to true, allows template paths passed to reply.view() to contain '../'. Defaults to false. */
-    allowInsecureAccess?: boolean;
-    /** options object passed to the engine's compile function. Defaults to empty options {}. */
-    compileOptions?: CompileOptions;
-    /** options object passed to the returned function from the compile operation. Defaults to empty options {}. */
-    runtimeOptions?: RuntimeOptions;
-    /** the content type of the engine results. Defaults to 'text/html'. */
-    contentType?: string;
-    /** specify whether the engine compile() method is 'sync' or 'async'. Defaults to 'sync'. */
-    compileMode?: 'sync' | 'async';
-    /** a global context used with all templates. The global context option can be either an object or a function that takes the request as its only argument and returns a context object. The request object is only provided when using the view handler or reply.view(). When using server.render() or request.render(), the request argument will be null. When rendering views, the global context will be merged with any context object specified on the handler or using reply.view(). When multiple context objects are used, values from the global context always have lowest precedence. */
-    context?: Object | ((request: Hapi.Request) => Object);
-}
-
-/**
- * Options passed to module when compiling template.
- * Cast your options to this interface or extend it with:
- *      declare module 'hapi' {
- *          interface CompileOptions {
- *              noEscape: boolean;
- *          }
- *      }
- */
-export interface CompileOptions {}
-export interface RuntimeOptions {}
-
-/**
- * the rendering function. The required function signature depends on the compileMode settings (see below).
- * If compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options) (the compiled sync template), and the method is allowed to throw errors.
- * If compileMode is 'async', the signature is compile(template, options, next) where next has the signature function(err, compiled), compiled is a function with signature function(context, options, callback) (the compiled async template) and callback has the signature function(err, rendered).
- */
-export interface ServerViewCompile {
-    (template: string, options: any): (context: any, options: any) => void;
-    (template: string, options: any, next: (err: Error | null, compiled: (context: any, options: any, callback: (err: null | Error, rendered: string | null) => void) => void) => void): void;
-}
-
-/**
- * The npm module used for rendering the templates. The module object must contain the compile() function
- * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions} > options > engines > module
- */
-interface NpmModule {
-    /** the rendering function. The required function signature depends on the compileMode settings */
-    compile: ServerViewCompile
-    /** initializes additional engine state. The config object is the engine configuration object allowing updates to be made. This is useful for engines like Nunjucks that rely on additional state for rendering. next has the signature function(err). */
-    prepare(config: EngineConfigurationObject, next: (err?: Error) => void): void;
-    /** registers a partial for use during template rendering. The name is the partial path that templates should use to reference the partial and src is the uncompiled template string for the partial. */
-    registerPartial(name: string, src: string): void;
-    /** registers a helper for use during template rendering. The name is the name that templates should use to reference the helper and helper is the function that will be invoked when the helper is called. */
-    registerHelper(name: string, helper: Function): void;
-}
-export interface EngineConfigurationObject {}
-
-/**
- * Renders a template
- * @param template - the template filename and path, relative to the views manager templates path (path or relativeTo).
- * @param context - optional object used by the template to render context-specific result. Defaults to no context ({}).
- * @param options - optional object used to override the views manager configuration.
- * @param callback - the callback function with signature function (err, rendered, config) where:
- *      * err - the rendering error if any.
- *      * rendered - the result view string or undefined if error.
- *      * config - the configuration used to render the template or undefined if error.
- * If no `callback` is provided, a `Promise` object is returned. The returned promise is resolved with only the rendered content and not the configuration object.
- * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverrendertemplate-context-options-callback}
- * @see {@link https://github.com/hapijs/vision/blob/master/API.md#managerrendertemplate-context-options-callback}
- */
-interface RenderMethod {
-    (template: string, context?: any, options?: ServerViewsAdditionalOptions, callback?: RenderCallBack): void;
-    (template: string, context?: any, options?: ServerViewsAdditionalOptions): Promise<string>;
-}
-export interface RenderCallBack {
-    (err: null | Error, rendered?: string, options?: ServerViewsAdditionalOptions): void;
-}
-
-/**
- * View Manager
- * @see {@link https://github.com/hapijs/vision/blob/master/API.md#view-manager}
- */
-export interface ViewManager {
-    /**
-     * Registers a helper, on all configured engines that have a registerHelper() method, for use during template rendering. Engines without a registerHelper() method will be skipped. The name is the name that templates should use to reference the helper and helper is the function that will be invoked when the helper is called.
-     * @param name
-     * @param helper
-     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#managerregisterhelpername-helper}
-     */
-    registerHelper(name: string, helper: Function): void;
-    /**
-     * Renders a template. This is typically not needed and it is usually more convenient to use server.render().
-     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#managerrendertemplate-context-options-callback}
-     */
-    render: RenderMethod;
-}
-
-// Has no plugin registration options
-declare var visionPlugin: Hapi.PluginFunction<{}>;
-
-export default visionPlugin;
diff --git a/types/vision/tsconfig.json b/types/vision/tsconfig.json
index 594ecb91ae..8f34e356c5 100644
--- a/types/vision/tsconfig.json
+++ b/types/vision/tsconfig.json
@@ -14,11 +14,8 @@
         ],
         "types": [],
         "paths": {
-            "boom": [
+             "boom": [
                 "boom/v4"
-            ],
-            "hapi": [
-                "hapi/v16"
             ]
         },
         "noEmit": true,
@@ -28,4 +25,4 @@
         "index.d.ts",
         "vision-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/vision/tslint.json b/types/vision/tslint.json
index a41bf5d19a..3db14f85ea 100644
--- a/types/vision/tslint.json
+++ b/types/vision/tslint.json
@@ -1,79 +1 @@
-{
-    "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/vision/v4/index.d.ts b/types/vision/v4/index.d.ts
new file mode 100644
index 0000000000..5539ad07c2
--- /dev/null
+++ b/types/vision/v4/index.d.ts
@@ -0,0 +1,212 @@
+// Type definitions for vision 4.1
+// Project: https://github.com/hapijs/vision
+// Definitions by: Jason Swearingen <https://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import * as Hapi from 'hapi';
+
+declare module 'hapi' {
+    interface Server {
+        /**
+         * Initializes the server views manager
+         * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions}
+         */
+        views(options: ServerViewsConfiguration): ViewManager;
+        /**
+         * Utilizes the server views manager to render a template
+         * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverrendertemplate-context-options-callback}
+         */
+        render: RenderMethod;
+    }
+
+    interface Request {
+        /**
+         * request.render() works the same way as server.render() but is for use inside of request handlers. server.render() does not work inside request handlers when called via request.server.render() if the view manager was created by a plugin. This is because the request.server object does not have access to the plugin realm where the view manager was configured. request.render() gets its realm from the route that the request was bound to.
+         * Note that this will not work in onRequest extensions added by the plugin because the route isn't yet set at this point in the request lifecycle and the request.render() method will produce the same limited results server.render() can.
+         * @see {@link https://github.com/hapijs/vision/blob/master/API.md#requestrendertemplate-context-options-callback}
+         */
+        render: RenderMethod;
+    }
+
+    interface RouteHandlerPlugins {
+        /**
+         * The view handler can be used with routes registered in the same realm as the view manager. The handler takes an options parameter that can be either a string or an object. When the options parameter is a string, it should be the filename and path of the template relative to the templates path configured via the views manager. When the options parameter is an object, it may have the following keys:
+         * The rendering context contains the `params`, `payload`, `query`, and `pre` values from the request by default (these can be overriden by values explicitly set via the options).
+         * @see {@link https://github.com/hapijs/vision/blob/master/API.md#the-view-handler}
+         */
+        view?: string | {
+            /** the template filename and path, relative to the templates path configured via the server views manager. */
+            template: string;
+            /** optional object used by the template to render context-specific result. Defaults to no context {}. */
+            context?: Object;
+            /**
+             * optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.
+             * TODO check if it can have `defaultExtension`.
+             */
+            options?: ViewHandlerOrReplyOptions;
+        }
+    }
+
+    interface Base_Reply {
+        /**
+         * Concludes the handler activity by returning control over to the router with a templatized view response
+         * Returns a response object. The generated response will have the variety property set to view.
+         * The response flow control rules apply.
+         * @param template  the template filename and path, relative to the templates path configured via the server views manager.
+         * @param context  optional object used by the template to render context-specific result. Defaults to no context {}.
+         * @param options  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.
+         * @see {@link https://github.com/hapijs/vision/blob/master/API.md#replyviewtemplate-context-options}
+         */
+        view(templatePath: string, context?: any, options?: ViewHandlerOrReplyOptions): Response;
+    }
+}
+
+/**
+ * Options for initialising server views manager
+ * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions}
+ */
+export interface ServerViewsConfiguration extends ServerViewsAdditionalOptions {
+    /** required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates. Alternatively, the extension can be mapped to an object */
+    engines: {[fileExtension: string]: NpmModule} | ServerViewsEnginesOptions;
+    /** defines the default filename extension to append to template names when multiple engines are configured and no explicit extension is provided for a given template. No default value. */
+    defaultExtension?: string;
+}
+
+/**
+ * Includes `module` and any of the views options listed below (@see ServerViewsAdditionalOptions) (except defaultExtension) to override the defaults for a specific engine.
+ */
+export interface ServerViewsEnginesOptions extends ServerViewsAdditionalOptions {
+    /**
+     * The npm module used for rendering the templates. The module object must contain the compile() function
+     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions} > options > engines > module
+     */
+    module: NpmModule
+}
+export interface ServerViewsAdditionalOptions extends ViewHandlerOrReplyOptions {
+    /** the root file path, or array of file paths, where partials are located. Partials are small segments of template code that can be nested and reused throughout other templates. Defaults to no partials support (empty path). */
+    partialsPath?: string | string[];
+    /** the directory path, or array of directory paths, where helpers are located. Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs. Each '.js' file in the helpers directory is loaded and the file name is used as the helper name. The files must export a single method with the signature function(context) and return a string. Sub-folders are not supported and are ignored. Defaults to no helpers support (empty path). Note that jade does not support loading helpers this way. */
+    helpersPath?: string | string[];
+    /** if set to false, templates will not be cached (thus will be read from file on every use). Defaults to true. */
+    isCached?: boolean;
+}
+
+/**
+ *
+ * @see {@link https://github.com/hapijs/vision/blob/master/API.md#the-view-handler} > options for the list of attributes it can not have (isCached, partialsPath, helpersPath)
+ */
+export interface ViewHandlerOrReplyOptions {
+    /** the root file path, or array of file paths, used to resolve and load the templates identified when calling reply.view(). Defaults to current working directory. */
+    path?: string | string[];
+    /**
+     * a base path used as prefix for path and partialsPath. No default.
+     * TODO update if PR for updating docs is accepted.
+     */
+    relativeTo?: string;
+    /** if set to true or a layout filename, layout support is enabled. A layout is a single template file used as the parent template for other view templates in the same engine. If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded. Disable layout when using Jade as it will handle including any layout files independently. Defaults to false. */
+    layout?: boolean;
+    /** the root file path, or array of file paths, where layout templates are located (using the relativeTo prefix if present). Defaults to path. */
+    layoutPath?: string | string[];
+    /** the key used by the template engine to denote where primary template content should go. Defaults to 'content'. */
+    layoutKeyword?: string;
+    /** the text encoding used by the templates when reading the files and outputting the result. Defaults to 'utf8'. */
+    encoding?: string;
+    /** if set to true, allows absolute template paths passed to reply.view(). Defaults to false. */
+    allowAbsolutePaths?: boolean;
+    /** if set to true, allows template paths passed to reply.view() to contain '../'. Defaults to false. */
+    allowInsecureAccess?: boolean;
+    /** options object passed to the engine's compile function. Defaults to empty options {}. */
+    compileOptions?: CompileOptions;
+    /** options object passed to the returned function from the compile operation. Defaults to empty options {}. */
+    runtimeOptions?: RuntimeOptions;
+    /** the content type of the engine results. Defaults to 'text/html'. */
+    contentType?: string;
+    /** specify whether the engine compile() method is 'sync' or 'async'. Defaults to 'sync'. */
+    compileMode?: 'sync' | 'async';
+    /** a global context used with all templates. The global context option can be either an object or a function that takes the request as its only argument and returns a context object. The request object is only provided when using the view handler or reply.view(). When using server.render() or request.render(), the request argument will be null. When rendering views, the global context will be merged with any context object specified on the handler or using reply.view(). When multiple context objects are used, values from the global context always have lowest precedence. */
+    context?: Object | ((request: Hapi.Request) => Object);
+}
+
+/**
+ * Options passed to module when compiling template.
+ * Cast your options to this interface or extend it with:
+ *      declare module 'hapi' {
+ *          interface CompileOptions {
+ *              noEscape: boolean;
+ *          }
+ *      }
+ */
+export interface CompileOptions {}
+export interface RuntimeOptions {}
+
+/**
+ * the rendering function. The required function signature depends on the compileMode settings (see below).
+ * If compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options) (the compiled sync template), and the method is allowed to throw errors.
+ * If compileMode is 'async', the signature is compile(template, options, next) where next has the signature function(err, compiled), compiled is a function with signature function(context, options, callback) (the compiled async template) and callback has the signature function(err, rendered).
+ */
+export interface ServerViewCompile {
+    (template: string, options: any): (context: any, options: any) => void;
+    (template: string, options: any, next: (err: Error | null, compiled: (context: any, options: any, callback: (err: null | Error, rendered: string | null) => void) => void) => void): void;
+}
+
+/**
+ * The npm module used for rendering the templates. The module object must contain the compile() function
+ * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions} > options > engines > module
+ */
+interface NpmModule {
+    /** the rendering function. The required function signature depends on the compileMode settings */
+    compile: ServerViewCompile
+    /** initializes additional engine state. The config object is the engine configuration object allowing updates to be made. This is useful for engines like Nunjucks that rely on additional state for rendering. next has the signature function(err). */
+    prepare(config: EngineConfigurationObject, next: (err?: Error) => void): void;
+    /** registers a partial for use during template rendering. The name is the partial path that templates should use to reference the partial and src is the uncompiled template string for the partial. */
+    registerPartial(name: string, src: string): void;
+    /** registers a helper for use during template rendering. The name is the name that templates should use to reference the helper and helper is the function that will be invoked when the helper is called. */
+    registerHelper(name: string, helper: Function): void;
+}
+export interface EngineConfigurationObject {}
+
+/**
+ * Renders a template
+ * @param template - the template filename and path, relative to the views manager templates path (path or relativeTo).
+ * @param context - optional object used by the template to render context-specific result. Defaults to no context ({}).
+ * @param options - optional object used to override the views manager configuration.
+ * @param callback - the callback function with signature function (err, rendered, config) where:
+ *      * err - the rendering error if any.
+ *      * rendered - the result view string or undefined if error.
+ *      * config - the configuration used to render the template or undefined if error.
+ * If no `callback` is provided, a `Promise` object is returned. The returned promise is resolved with only the rendered content and not the configuration object.
+ * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverrendertemplate-context-options-callback}
+ * @see {@link https://github.com/hapijs/vision/blob/master/API.md#managerrendertemplate-context-options-callback}
+ */
+interface RenderMethod {
+    (template: string, context?: any, options?: ServerViewsAdditionalOptions, callback?: RenderCallBack): void;
+    (template: string, context?: any, options?: ServerViewsAdditionalOptions): Promise<string>;
+}
+export interface RenderCallBack {
+    (err: null | Error, rendered?: string, options?: ServerViewsAdditionalOptions): void;
+}
+
+/**
+ * View Manager
+ * @see {@link https://github.com/hapijs/vision/blob/master/API.md#view-manager}
+ */
+export interface ViewManager {
+    /**
+     * Registers a helper, on all configured engines that have a registerHelper() method, for use during template rendering. Engines without a registerHelper() method will be skipped. The name is the name that templates should use to reference the helper and helper is the function that will be invoked when the helper is called.
+     * @param name
+     * @param helper
+     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#managerregisterhelpername-helper}
+     */
+    registerHelper(name: string, helper: Function): void;
+    /**
+     * Renders a template. This is typically not needed and it is usually more convenient to use server.render().
+     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#managerrendertemplate-context-options-callback}
+     */
+    render: RenderMethod;
+}
+
+// Has no plugin registration options
+declare var visionPlugin: Hapi.PluginFunction<{}>;
+
+export default visionPlugin;
diff --git a/types/vision/v4/tsconfig.json b/types/vision/v4/tsconfig.json
new file mode 100644
index 0000000000..bee5c542c4
--- /dev/null
+++ b/types/vision/v4/tsconfig.json
@@ -0,0 +1,34 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ],
+            "vision": [
+                "vision/v4"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "vision-tests.ts"
+    ]
+}
diff --git a/types/vision/v4/tslint.json b/types/vision/v4/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/vision/v4/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/vision/v4/vision-tests.ts b/types/vision/v4/vision-tests.ts
new file mode 100644
index 0000000000..c31dc6661b
--- /dev/null
+++ b/types/vision/v4/vision-tests.ts
@@ -0,0 +1,125 @@
+import * as Hapi from 'hapi';
+import Vision from 'vision';
+const server = new Hapi.Server();
+server.connection({ port: 80 });
+
+// https://github.com/hapijs/vision/blob/master/API.md#serverrendertemplate-context-options-callback
+
+server.register(Vision, (err) => {
+
+    if (err) {
+        throw err;
+    }
+
+    server.views({
+        engines: { html: require('handlebars') },
+        path: __dirname + '/templates'
+    });
+
+    const context = {
+        title: 'Views Example',
+        message: 'Hello, World'
+    };
+
+    server.render('hello', context, {}, (err, rendered, config) => {
+
+        console.log(rendered);
+    });
+
+    // https://github.com/hapijs/vision/blob/master/API.md#requestrendertemplate-context-options-callback
+
+    server.views({
+        engines: { html: require('handlebars') },
+        path: __dirname + '/templates'
+    });
+
+    server.route({
+        method: 'GET',
+        path: '/view',
+        handler: function (request, reply) {
+
+            request.render('test', { message: 'hello' }, {}, (err, rendered, config) => {
+
+                return reply(rendered);
+            });
+        }
+    });
+
+    // https://github.com/hapijs/vision/blob/master/API.md#the-view-handler
+
+    server.views({
+        engines: { html: require('handlebars') },
+        path: __dirname + '/templates'
+    });
+
+    server.route({
+        method: 'GET',
+        path: '/',
+        handler: {
+            view: {
+                template: 'hello',
+                context: {
+                    title: 'Views Example',
+                    message: 'Hello, World'
+                }
+            }
+        }
+    });
+
+    // https://github.com/hapijs/vision/blob/master/API.md#replyviewtemplate-context-options
+
+    server.views({
+        engines: { html: require('handlebars') },
+        path: __dirname + '/templates'
+    });
+
+    const handler: Hapi.RouteHandler = function (request, reply) {
+
+        const context = {
+            title: 'Views Example',
+            message: 'Hello, World'
+        };
+
+        return reply.view('hello', context);
+    };
+
+    server.route({ method: 'GET', path: '/', handler: handler });
+
+});
+
+// Extending CompileOptions or RuntimeOptions interfaces
+
+server.register(Vision, (err) => {
+
+    if (err) {
+        throw err;
+    }
+
+    server.views({
+        engines: { html: require('handlebars') },
+        path: __dirname + '/templates'
+    });
+
+    var opts: Hapi.CompileOptions = {
+        noEscape: true
+    };
+
+    server.route({
+        method: 'GET',
+        path: '/temp1',
+        handler: {
+            view: {
+                template: 'temp1',
+                options: {
+                    compileOptions: opts
+                }
+            }
+        }
+    });
+});
+
+declare module 'hapi' {
+    interface CompileOptions {
+        noEscape: boolean;
+    }
+}
diff --git a/types/vision/vision-tests.ts b/types/vision/vision-tests.ts
index c31dc6661b..7ca9629e72 100644
--- a/types/vision/vision-tests.ts
+++ b/types/vision/vision-tests.ts
@@ -1,55 +1,43 @@
-import * as Hapi from 'hapi';
-import Vision from 'vision';
-const server = new Hapi.Server();
-server.connection({ port: 80 });
+import {
+    Server,
+    Request,
+    ResponseToolkit,
+} from 'hapi';
 
-// https://github.com/hapijs/vision/blob/master/API.md#serverrendertemplate-context-options-callback
+import * as Vision from 'vision';
+import * as Handlebars from 'handlebars';
 
-server.register(Vision, (err) => {
+const server = new Server({
+    port: 80,
+});
 
-    if (err) {
-        throw err;
-    }
+const provision = async () => {
+    await server.register({
+        plugin: Vision,
+        options: {
+            engines: { hbs: Handlebars },
+            path: __dirname + '/templates',
+        }
+    });
 
     server.views({
-        engines: { html: require('handlebars') },
-        path: __dirname + '/templates'
+        engines: { hbs: Handlebars },
+        path: __dirname + '/templates',
     });
 
     const context = {
         title: 'Views Example',
-        message: 'Hello, World'
+        message: 'Hello, World',
     };
 
-    server.render('hello', context, {}, (err, rendered, config) => {
-
-        console.log(rendered);
-    });
-
-    // https://github.com/hapijs/vision/blob/master/API.md#requestrendertemplate-context-options-callback
-
-    server.views({
-        engines: { html: require('handlebars') },
-        path: __dirname + '/templates'
-    });
+    console.log(await server.render('hello', context));
 
     server.route({
         method: 'GET',
         path: '/view',
-        handler: function (request, reply) {
-
-            request.render('test', { message: 'hello' }, {}, (err, rendered, config) => {
-
-                return reply(rendered);
-            });
-        }
-    });
-
-    // https://github.com/hapijs/vision/blob/master/API.md#the-view-handler
-
-    server.views({
-        engines: { html: require('handlebars') },
-        path: __dirname + '/templates'
+        handler: async (request: Request, h: ResponseToolkit) => {
+            return request.render('test', { message: 'hello' });
+        },
     });
 
     server.route({
@@ -60,49 +48,21 @@ server.register(Vision, (err) => {
                 template: 'hello',
                 context: {
                     title: 'Views Example',
-                    message: 'Hello, World'
-                }
-            }
-        }
+                    message: 'Hello, World',
+                },
+            },
+        },
     });
 
-    // https://github.com/hapijs/vision/blob/master/API.md#replyviewtemplate-context-options
-
-    server.views({
-        engines: { html: require('handlebars') },
-        path: __dirname + '/templates'
-    });
-
-    const handler: Hapi.RouteHandler = function (request, reply) {
-
+    const handler = (request: Request, h: ResponseToolkit) => {
         const context = {
             title: 'Views Example',
-            message: 'Hello, World'
+            message: 'Hello, World',
         };
-
-        return reply.view('hello', context);
+        return h.view('hello', context);
     };
 
-    server.route({ method: 'GET', path: '/', handler: handler });
-
-});
-
-// Extending CompileOptions or RuntimeOptions interfaces
-
-server.register(Vision, (err) => {
-
-    if (err) {
-        throw err;
-    }
-
-    server.views({
-        engines: { html: require('handlebars') },
-        path: __dirname + '/templates'
-    });
-
-    var opts: Hapi.CompileOptions = {
-        noEscape: true
-    };
+    server.route({ method: 'GET', path: '/', handler });
 
     server.route({
         method: 'GET',
@@ -111,15 +71,11 @@ server.register(Vision, (err) => {
             view: {
                 template: 'temp1',
                 options: {
-                    compileOptions: opts
-                }
-            }
-        }
+                    compileOptions: {
+                        noEscape: true,
+                    },
+                },
+            },
+        },
     });
-});
-
-declare module 'hapi' {
-    interface CompileOptions {
-        noEscape: boolean;
-    }
-}
+};

From 8923b0dbcbacff3df0e517cfdb130cb550181cfb Mon Sep 17 00:00:00 2001
From: Rob Moran <rob.moran@arm.com>
Date: Sat, 17 Feb 2018 23:29:47 +0000
Subject: [PATCH 133/388] createImage doesn't return Dockerode.Image

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

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index b38072b69b..1374708677 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -833,10 +833,10 @@ declare class Dockerode {
   createContainer(options: Dockerode.ContainerCreateOptions, callback: Callback<Dockerode.Container>): void;
   createContainer(options: Dockerode.ContainerCreateOptions): Promise<Dockerode.Container>;
 
-  createImage(options: {}, callback: Callback<Dockerode.Image>): void;
-  createImage(auth: any, options: {}, callback: Callback<Dockerode.Image>): void;
-  createImage(options: {}): Promise<Dockerode.Image>;
-  createImage(auth: any, options: {}): Promise<Dockerode.Image>;
+  createImage(options: {}, callback: Callback<any>): void;
+  createImage(auth: any, options: {}, callback: Callback<any>): void;
+  createImage(options: {}): Promise<any>;
+  createImage(auth: any, options: {}): Promise<any>;
 
   loadImage(file: string | NodeJS.ReadableStream, options: {}, callback: Callback<any>): void;
   loadImage(file: string | NodeJS.ReadableStream, callback: Callback<any>): void;

From 322d589b4e166dcc2d75345243c525041e76b36e Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sat, 17 Feb 2018 23:15:03 -0300
Subject: [PATCH 134/388] Types for jquery-lazyload

---
 types/jquery-lazyload/index.d.ts              | 26 +++++++++++++++++++
 .../jquery-lazyload/jquery-lazyload-tests.ts  | 20 ++++++++++++++
 types/jquery-lazyload/tsconfig.json           | 25 ++++++++++++++++++
 types/jquery-lazyload/tslint.json             |  1 +
 4 files changed, 72 insertions(+)
 create mode 100644 types/jquery-lazyload/index.d.ts
 create mode 100644 types/jquery-lazyload/jquery-lazyload-tests.ts
 create mode 100644 types/jquery-lazyload/tsconfig.json
 create mode 100644 types/jquery-lazyload/tslint.json

diff --git a/types/jquery-lazyload/index.d.ts b/types/jquery-lazyload/index.d.ts
new file mode 100644
index 0000000000..a48759dac7
--- /dev/null
+++ b/types/jquery-lazyload/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for jQuery Lazy Load 1.9
+// Project: https://github.com/tuupola/jquery_lazyload
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+declare namespace jQueryLazyLoad {
+    interface Options {
+        threshold?: number;
+        failure_limit?: number;
+        event?: string;
+        effect?: string;
+        container?: JQuery;
+        data_attribute?: string;
+        skip_invisible?: boolean;
+        appear?: null;
+        load?: (elementsLeft?: number, options?: Options) => void;
+        placeholder?: string;
+    }
+}
+interface JQuery {
+    lazyload(options?: jQueryLazyLoad.Options): JQuery;
+    on(event: 'load', callback: ((options?: jQueryLazyLoad.Options) => void)): JQuery;
+}
diff --git a/types/jquery-lazyload/jquery-lazyload-tests.ts b/types/jquery-lazyload/jquery-lazyload-tests.ts
new file mode 100644
index 0000000000..5fee2eec1f
--- /dev/null
+++ b/types/jquery-lazyload/jquery-lazyload-tests.ts
@@ -0,0 +1,20 @@
+$(document).ready(() => {
+    // basic usage
+    $('.lazyload').lazyload();
+
+    // with options
+    const options: jQueryLazyLoad.Options = {
+        threshold: 200,
+        event: 'click',
+        effect: 'fadeIn',
+        container: $('#container'),
+        failure_limit: 10,
+        skip_invisible: true
+    };
+    $('.lazyload').lazyload(options);
+
+    // event on load
+    $('.lazyload').on('load', () => {
+        $("img.lazy").trigger("click");
+    });
+});
diff --git a/types/jquery-lazyload/tsconfig.json b/types/jquery-lazyload/tsconfig.json
new file mode 100644
index 0000000000..857bd1b9f5
--- /dev/null
+++ b/types/jquery-lazyload/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-lazyload-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-lazyload/tslint.json b/types/jquery-lazyload/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-lazyload/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From 18c0620984fa14fca80bc986618f24ecead8bb83 Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Sat, 17 Feb 2018 21:40:04 -0500
Subject: [PATCH 135/388] Update index.d.ts

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

diff --git a/types/passport/index.d.ts b/types/passport/index.d.ts
index 10f5d8ae8f..06c7f0b9db 100644
--- a/types/passport/index.d.ts
+++ b/types/passport/index.d.ts
@@ -26,8 +26,8 @@ declare global {
             isAuthenticated(): boolean;
             isUnauthenticated(): boolean;
         }
-        // tslint:disable-next-line:no-empty-interface
         interface User {
+            [_: string]: any;
         }
     }
 }

From 32ce5226688be7ee04df405f431d410cb7a114cd Mon Sep 17 00:00:00 2001
From: Daniel Perez Alvarez <danielpa9708@gmail.com>
Date: Sat, 17 Feb 2018 21:46:13 -0500
Subject: [PATCH 136/388] Update passport-tests.ts

---
 types/passport/passport-tests.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index 23058684a7..630091afc7 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -151,6 +151,9 @@ app.use((req: express.Request, res: express.Response, next: (err?: any) => void)
         if (req.user.username) {
             req.user.username = "hello user";
         }
+        if (req.user.id) {
+            req.user.id = "123";
+        }
     }
     next();
 });

From dcb61d156cbbee90fb0da4afbe31f99a13a24878 Mon Sep 17 00:00:00 2001
From: Paul Fasola <paul.fasola@gmail.com>
Date: Sun, 18 Feb 2018 03:11:12 +0100
Subject: [PATCH 137/388] Add typings for react-twitter-auth

---
 types/react-twitter-auth/index.d.ts           | 25 +++++++++++++++++++
 .../react-twitter-auth-tests.tsx              | 23 +++++++++++++++++
 types/react-twitter-auth/tsconfig.json        | 25 +++++++++++++++++++
 types/react-twitter-auth/tslint.json          |  1 +
 4 files changed, 74 insertions(+)
 create mode 100644 types/react-twitter-auth/index.d.ts
 create mode 100644 types/react-twitter-auth/react-twitter-auth-tests.tsx
 create mode 100644 types/react-twitter-auth/tsconfig.json
 create mode 100644 types/react-twitter-auth/tslint.json

diff --git a/types/react-twitter-auth/index.d.ts b/types/react-twitter-auth/index.d.ts
new file mode 100644
index 0000000000..7348b10a21
--- /dev/null
+++ b/types/react-twitter-auth/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for react-twitter-auth 0.10
+// Project: https://github.com/GenFirst/react-twitter-auth
+// Definitions by: Paul Fasola <https://github.com/paulfasola>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+interface TwitterLoginProp {
+    tag?: string;
+    text?: string;
+    loginUrl: string;
+    requestTokenUrl: string;
+    onFailure: (msg: string) => void;
+    onSuccess: (response: string) => void;
+    disabled?: boolean;
+    style?: string;
+    className?: string;
+    dialogWidth?: number;
+    dialogHeight?: number;
+    showIcon?: boolean;
+    credentials?: string;
+}
+
+declare var TwitterLogin: React.StatelessComponent<TwitterLoginProp>;
+
+export default TwitterLogin;
diff --git a/types/react-twitter-auth/react-twitter-auth-tests.tsx b/types/react-twitter-auth/react-twitter-auth-tests.tsx
new file mode 100644
index 0000000000..a1d212a726
--- /dev/null
+++ b/types/react-twitter-auth/react-twitter-auth-tests.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import TwitterLogin from 'react-twitter-auth';
+
+const ReactTwitterAuth: React.StatelessComponent = () => {
+    function handleSucess(response: string) {}
+    function handleFailure(msg: string) {}
+
+    return (
+        <TwitterLogin loginUrl="http://server.url/api/v1/auth/twitter"
+                      onSuccess={ handleSucess }
+                      onFailure={ handleFailure }
+                      requestTokenUrl="http://server.url/api/v1/auth/twitter/reverse"
+                      dialogWidth={ 1200 }
+                      dialogHeight={ 800 }
+                      style={ "font-size: 14px;" }
+                      disabled={ false }
+                      text={ "test" }
+                      tag={ "test" }
+                      className={ "test" }
+                      credentials={ "same-origin" }
+                      showIcon={true}/>
+    );
+};
diff --git a/types/react-twitter-auth/tsconfig.json b/types/react-twitter-auth/tsconfig.json
new file mode 100644
index 0000000000..1c73a25222
--- /dev/null
+++ b/types/react-twitter-auth/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "jsx": "react",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-twitter-auth-tests.tsx"
+    ]
+}
diff --git a/types/react-twitter-auth/tslint.json b/types/react-twitter-auth/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-twitter-auth/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 10cb4217caa4924b4a3acb880ad963a5f86b1d8b Mon Sep 17 00:00:00 2001
From: Paul Fasola <paul.fasola@gmail.com>
Date: Sun, 18 Feb 2018 04:17:11 +0100
Subject: [PATCH 138/388] Adjust the required typescript version. (React needs
 2.6 min.)

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

diff --git a/types/react-twitter-auth/index.d.ts b/types/react-twitter-auth/index.d.ts
index 7348b10a21..d9883de45e 100644
--- a/types/react-twitter-auth/index.d.ts
+++ b/types/react-twitter-auth/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/GenFirst/react-twitter-auth
 // Definitions by: Paul Fasola <https://github.com/paulfasola>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 interface TwitterLoginProp {
     tag?: string;

From cbb60b86997c3e848d892ec8c116de3834018e4a Mon Sep 17 00:00:00 2001
From: nju33 <nju33.ki@gmail.com>
Date: Sun, 18 Feb 2018 14:54:12 +0900
Subject: [PATCH 139/388] add types/slackdown

---
 types/slackdown/index.d.ts         |  6 ++++++
 types/slackdown/slackdown-tests.ts |  6 ++++++
 types/slackdown/tsconfig.json      | 23 +++++++++++++++++++++++
 types/slackdown/tslint.json        |  1 +
 4 files changed, 36 insertions(+)
 create mode 100644 types/slackdown/index.d.ts
 create mode 100644 types/slackdown/slackdown-tests.ts
 create mode 100644 types/slackdown/tsconfig.json
 create mode 100644 types/slackdown/tslint.json

diff --git a/types/slackdown/index.d.ts b/types/slackdown/index.d.ts
new file mode 100644
index 0000000000..4086de7bf9
--- /dev/null
+++ b/types/slackdown/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for slackdown 0.1
+// Project: https://github.com/blockmar/slackdown
+// Definitions by: nju33 <https://github.com/nju33>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function parse(text: string): string;
diff --git a/types/slackdown/slackdown-tests.ts b/types/slackdown/slackdown-tests.ts
new file mode 100644
index 0000000000..f6a26b6c7a
--- /dev/null
+++ b/types/slackdown/slackdown-tests.ts
@@ -0,0 +1,6 @@
+import * as slackdown from 'slackdown';
+// tslint:disable-next-line no-duplicate-imports
+import { parse } from 'slackdown';
+
+slackdown.parse('xxx <http://xxxxx.jp|xxxxx.jp>');
+parse('xxx <http://xxxxx.jp|xxxxx.jp>');
diff --git a/types/slackdown/tsconfig.json b/types/slackdown/tsconfig.json
new file mode 100644
index 0000000000..0e630d9279
--- /dev/null
+++ b/types/slackdown/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",
+        "slackdown-tests.ts"
+    ]
+}
diff --git a/types/slackdown/tslint.json b/types/slackdown/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/slackdown/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f124da6d407e5be653d4725510fea94c60e80e2e Mon Sep 17 00:00:00 2001
From: obeliskos <github@obeliskos.com>
Date: Sun, 18 Feb 2018 04:53:13 -0500
Subject: [PATCH 140/388] updated typings to support new ops and updated
 interfaces

- added new js compare ops ($jgt, $jgte, $jlt, $jlte, $jbetween)
- simple interface updated to multipurpose isDesc property with options object
- updated DynamicView.applySimplesort to use same SimplesortOptions interface
- added collection.checkAllIndexes along with 'CheckIndexOptions' interface
- added collection.checkIndex using same 'CheckIndexOptions' interface
---
 types/lokijs/index.d.ts | 52 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/types/lokijs/index.d.ts b/types/lokijs/index.d.ts
index ca6903fa33..f9311c8ce1 100644
--- a/types/lokijs/index.d.ts
+++ b/types/lokijs/index.d.ts
@@ -30,6 +30,11 @@ declare var LokiOps: {
     $lte(a: any, b: any): boolean;
     /** ex : coll.find({'orderCount': {$between: [10, 50]}}); */
     $between(a: any, vals: any/*[any, any]*/): boolean;
+    $jgt(a: any, b: any): boolean;
+    $jgte(a: any, b: any): boolean;
+    $jlt(a: any, b: any): boolean;
+    $jlte(a: any, b: any): boolean;
+    $jbetween(a: any, vals: any/*[any, any]*/): boolean;
     $in(a: any, b: any): boolean;
     $nin(a: any, b: any): boolean;
     $keyin(a: any, b: any): boolean;
@@ -774,6 +779,13 @@ interface GetDataOptions {
 }
 
 
+interface SimplesortOptions {
+    desc: boolean;
+    disableIndexIntersect: boolean;
+    forceIndexIntersect: boolean;
+    useJavascriptSorting: boolean;
+}
+
 /**
  * Resultset class allowing chainable queries.  Intended to be instanced internally.
  *    Collection.find(), Collection.where(), and Collection.chain() instantiate this.
@@ -864,10 +876,14 @@ declare class Resultset<E extends object> {
      *    Sorting based on the same lt/gt helper functions used for binary indices.
      *
      * @param propname - name of property to sort by.
-     * @param isdesc - (Optional) If true, the property will be sorted in descending order
+     * @param options - boolean to specify if sort is descending, or options object
+     * @param [options.desc] - whether to sort descending
+     * @param [options.disableIndexIntersect] - whether we should explicity not use array intersection.
+     * @param [options.forceIndexIntersect] - force array intersection (if binary index exists).
+     * @param [options.useJavascriptSorting] - whether results are sorted via basic javascript sort.
      * @returns Reference to this resultset, sorted, for future chain operations.
      */
-    public simplesort(propname: keyof E, isdesc?: boolean): this;
+    public simplesort(propname: keyof E, options?: boolean | Partial<SimplesortOptions>): this;
 
     /**
      * Allows sorting a resultset based on multiple columns.
@@ -1105,10 +1121,14 @@ declare class DynamicView<E extends object> extends LokiEventEmitter {
      * dv.applySimpleSort("name");
      *
      * @param propname - Name of property by which to sort.
-     * @param [isdesc] - (Optional) If true, the sort will be in descending order.
+     * @param [options] - boolean for sort descending or options object
+     * @param [options.desc] - whether we should sort descending.
+     * @param [options.disableIndexIntersect] - whether we should explicity not use array intersection.
+     * @param [options.forceIndexIntersect] - force array intersection (if binary index exists).
+     * @param [options.useJavascriptSorting] - whether results are sorted via basic javascript sort.
      * @returns this DynamicView object, for further chain ops.
      */
-    public applySimpleSort(propname: keyof E, isdesc?: boolean): this;
+    public applySimpleSort(propname: keyof E,  options?: boolean | Partial<SimplesortOptions>): this;
 
     /**
      * applySortCriteria() - Allows sorting a resultset based on multiple columns.
@@ -1302,6 +1322,11 @@ interface CollectionChange {
     obj: any;
 }
 
+interface CheckIndexOptions {
+  randomSampling: boolean;
+  randomSamplingFactor: number;
+  repair: boolean;
+}
 
 /**
  * Collection class that handles documents of same type
@@ -1450,6 +1475,25 @@ declare class Collection<E extends object> extends LokiEventEmitter {
      * @param [force] - (Optional) flag indicating whether to construct index immediately
      */
     public ensureIndex(property: keyof E, force?: boolean): void;
+    
+    /**
+     * Perform checks to determine validity/consistency of all binary indices
+     * @param [options] - optional configuration object
+     * @param [options.randomSampling] - whether (faster) random sampling should be used
+     * @param [options.randomSamplingFactor] - percentage of total rows to randomly sample
+     * @param [options.repair] - whether to fix problems if they are encountered
+     */
+    public checkAllIndexes(options?: Partial<CheckIndexOptions>): string[];
+    
+    /**
+     * Perform checks to determine validity/consistency of a binary index
+     * @param property - name of the binary-indexed property to check
+     * @param [options] optional configuration object
+     * @param [options.randomSampling] - whether (faster) random sampling should be used
+     * @param [options.randomSamplingFactor] - percentage of total rows to randomly sample
+     * @param [options.repair] - whether to fix problems if they are encountered
+     */
+    public checkIndex(property: keyof E, options?: Partial<CheckIndexOptions>): boolean;
 
     public getSequencedIndexValues(property: string): string;
 

From 60bb4e0774b8145e9b05fe97a768fba509d05b86 Mon Sep 17 00:00:00 2001
From: obeliskos <github@obeliskos.com>
Date: Sun, 18 Feb 2018 05:00:38 -0500
Subject: [PATCH 141/388] updated version

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

diff --git a/types/lokijs/index.d.ts b/types/lokijs/index.d.ts
index f9311c8ce1..308cbb4842 100644
--- a/types/lokijs/index.d.ts
+++ b/types/lokijs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for lokijs v1.5.1
+// Type definitions for lokijs v1.5.3
 // Project: https://github.com/techfort/LokiJS
 // Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
 //                 Thomas Conner <https://github.com/thomasconner>

From c2aeb9799da924b23d2ea5cb924d82355c5f76ee Mon Sep 17 00:00:00 2001
From: Rob Moran <rob.moran@arm.com>
Date: Sun, 18 Feb 2018 10:10:16 +0000
Subject: [PATCH 142/388] Fix some of the generic response types

---
 types/dockerode/index.d.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index 1374708677..188643dc28 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -833,25 +833,25 @@ declare class Dockerode {
   createContainer(options: Dockerode.ContainerCreateOptions, callback: Callback<Dockerode.Container>): void;
   createContainer(options: Dockerode.ContainerCreateOptions): Promise<Dockerode.Container>;
 
-  createImage(options: {}, callback: Callback<any>): void;
-  createImage(auth: any, options: {}, callback: Callback<any>): void;
-  createImage(options: {}): Promise<any>;
-  createImage(auth: any, options: {}): Promise<any>;
+  createImage(options: {}, callback: Callback<NodeJS.ReadableStream>): void;
+  createImage(auth: any, options: {}, callback: Callback<NodeJS.ReadableStream>): void;
+  createImage(options: {}): Promise<NodeJS.ReadableStream>;
+  createImage(auth: any, options: {}): Promise<NodeJS.ReadableStream>;
 
-  loadImage(file: string | NodeJS.ReadableStream, options: {}, callback: Callback<any>): void;
-  loadImage(file: string | NodeJS.ReadableStream, callback: Callback<any>): void;
-  loadImage(file: string | NodeJS.ReadableStream, options?: {}): Promise<any>;
+  loadImage(file: string | NodeJS.ReadableStream, options: {}, callback: Callback<NodeJS.ReadableStream>): void;
+  loadImage(file: string | NodeJS.ReadableStream, callback: Callback<NodeJS.ReadableStream>): void;
+  loadImage(file: string | NodeJS.ReadableStream, options?: {}): Promise<NodeJS.ReadableStream>;
 
-  importImage(file: string | NodeJS.ReadableStream, options: {}, callback: Callback<any>): void;
-  importImage(file: string | NodeJS.ReadableStream, callback: Callback<any>): void;
-  importImage(file: string | NodeJS.ReadableStream, options?: {}): Promise<any>;
+  importImage(file: string | NodeJS.ReadableStream, options: {}, callback: Callback<NodeJS.ReadableStream>): void;
+  importImage(file: string | NodeJS.ReadableStream, callback: Callback<NodeJS.ReadableStream>): void;
+  importImage(file: string | NodeJS.ReadableStream, options?: {}): Promise<NodeJS.ReadableStream>;
 
   checkAuth(options: any, callback: Callback<any>): void;
   checkAuth(options: any): Promise<any>;
 
-  buildImage(file: string | NodeJS.ReadableStream | Dockerode.ImageBuildContext, options: {}, callback: Callback<any>): void;
-  buildImage(file: string | NodeJS.ReadableStream | Dockerode.ImageBuildContext, callback: Callback<any>): void;
-  buildImage(file: string | NodeJS.ReadableStream | Dockerode.ImageBuildContext, options?: {}): Promise<any>;
+  buildImage(file: string | NodeJS.ReadableStream | Dockerode.ImageBuildContext, options: {}, callback: Callback<NodeJS.ReadableStream>): void;
+  buildImage(file: string | NodeJS.ReadableStream | Dockerode.ImageBuildContext, callback: Callback<NodeJS.ReadableStream>): void;
+  buildImage(file: string | NodeJS.ReadableStream | Dockerode.ImageBuildContext, options?: {}): Promise<NodeJS.ReadableStream>;
 
   getContainer(id: string): Dockerode.Container;
 

From 8931cb93ce230cf88a7cd16af996fc8abb39d2a6 Mon Sep 17 00:00:00 2001
From: chenyang <cyupdev@gmail.com>
Date: Sun, 18 Feb 2018 19:38:32 +0800
Subject: [PATCH 143/388] pref: use strict null checking mode

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

diff --git a/types/app-root-dir/tsconfig.json b/types/app-root-dir/tsconfig.json
index 9fc4a91fff..f378c094db 100644
--- a/types/app-root-dir/tsconfig.json
+++ b/types/app-root-dir/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [

From cee689fc2cb2672f1b3fc401447772f988767938 Mon Sep 17 00:00:00 2001
From: Paul Fasola <paul.fasola@gmail.com>
Date: Sun, 18 Feb 2018 16:32:51 +0100
Subject: [PATCH 144/388] Adjusts some types

---
 types/react-twitter-auth/index.d.ts                   | 7 +++----
 types/react-twitter-auth/react-twitter-auth-tests.tsx | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/types/react-twitter-auth/index.d.ts b/types/react-twitter-auth/index.d.ts
index d9883de45e..58684d5350 100644
--- a/types/react-twitter-auth/index.d.ts
+++ b/types/react-twitter-auth/index.d.ts
@@ -5,19 +5,18 @@
 // TypeScript Version: 2.6
 
 interface TwitterLoginProp {
-    tag?: string;
+    tag?: React.ReactType;
     text?: string;
     loginUrl: string;
     requestTokenUrl: string;
     onFailure: (msg: string) => void;
     onSuccess: (response: string) => void;
     disabled?: boolean;
-    style?: string;
-    className?: string;
+    style?: React.CSSProperties;
     dialogWidth?: number;
     dialogHeight?: number;
     showIcon?: boolean;
-    credentials?: string;
+    credentials?: "omit" | "same-origin" | "include";
 }
 
 declare var TwitterLogin: React.StatelessComponent<TwitterLoginProp>;
diff --git a/types/react-twitter-auth/react-twitter-auth-tests.tsx b/types/react-twitter-auth/react-twitter-auth-tests.tsx
index a1d212a726..3bb1e8812d 100644
--- a/types/react-twitter-auth/react-twitter-auth-tests.tsx
+++ b/types/react-twitter-auth/react-twitter-auth-tests.tsx
@@ -12,12 +12,11 @@ const ReactTwitterAuth: React.StatelessComponent = () => {
                       requestTokenUrl="http://server.url/api/v1/auth/twitter/reverse"
                       dialogWidth={ 1200 }
                       dialogHeight={ 800 }
-                      style={ "font-size: 14px;" }
+                      style={{display: "initial"}}
                       disabled={ false }
                       text={ "test" }
-                      tag={ "test" }
-                      className={ "test" }
-                      credentials={ "same-origin" }
+                      tag="button"
+                      credentials="same-origin"
                       showIcon={true}/>
     );
 };

From 699778708558e79438071272958c572480b97693 Mon Sep 17 00:00:00 2001
From: Umoxfo <ycco34vx@gmail.com>
Date: Sun, 18 Feb 2018 12:05:04 -0800
Subject: [PATCH 145/388] Add support for vnu-jar

---
 types/vnu-jar/index.d.ts       |  8 ++++++++
 types/vnu-jar/tsconfig.json    | 24 ++++++++++++++++++++++++
 types/vnu-jar/tslint.json      |  1 +
 types/vnu-jar/vnu-jar-tests.ts | 15 +++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 types/vnu-jar/index.d.ts
 create mode 100644 types/vnu-jar/tsconfig.json
 create mode 100644 types/vnu-jar/tslint.json
 create mode 100644 types/vnu-jar/vnu-jar-tests.ts

diff --git a/types/vnu-jar/index.d.ts b/types/vnu-jar/index.d.ts
new file mode 100644
index 0000000000..2e2e2a1ac9
--- /dev/null
+++ b/types/vnu-jar/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for vnu-jar 17.11
+// Project: https://github.com/validator/validator#readme
+// Definitions by: Umoxfo <https://github.com/Umoxfo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = vnu_jar;
+
+declare const vnu_jar: string;
diff --git a/types/vnu-jar/tsconfig.json b/types/vnu-jar/tsconfig.json
new file mode 100644
index 0000000000..8468e98846
--- /dev/null
+++ b/types/vnu-jar/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",
+        "vnu-jar-tests.ts"
+    ]
+}
diff --git a/types/vnu-jar/tslint.json b/types/vnu-jar/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/vnu-jar/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/vnu-jar/vnu-jar-tests.ts b/types/vnu-jar/vnu-jar-tests.ts
new file mode 100644
index 0000000000..776ccd9d4a
--- /dev/null
+++ b/types/vnu-jar/vnu-jar-tests.ts
@@ -0,0 +1,15 @@
+// Imported from: https://github.com/soywiz/typescript-node-definitions/d.ts
+
+/// <reference types="node" />
+
+import { exec } from "child_process";
+import vnu = require("vnu-jar");
+
+exec(`java -jar ${vnu} --version`, (error, stdout) => {
+    if (error) {
+        console.error(`exec error: ${error}`);
+        return;
+    }
+
+    console.log(stdout);
+});

From 5cdd12a85372038e5f1cec3ed43806d2addadf6a Mon Sep 17 00:00:00 2001
From: Paul Fasola <paul.fasola@gmail.com>
Date: Mon, 19 Feb 2018 09:29:19 +0100
Subject: [PATCH 146/388] Fix targeted package version + typo

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

diff --git a/types/react-twitter-auth/index.d.ts b/types/react-twitter-auth/index.d.ts
index 58684d5350..46dc5e7aa7 100644
--- a/types/react-twitter-auth/index.d.ts
+++ b/types/react-twitter-auth/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for react-twitter-auth 0.10
+// Type definitions for react-twitter-auth 0.0
 // Project: https://github.com/GenFirst/react-twitter-auth
 // Definitions by: Paul Fasola <https://github.com/paulfasola>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-interface TwitterLoginProp {
+interface TwitterLoginProps {
     tag?: React.ReactType;
     text?: string;
     loginUrl: string;
@@ -19,6 +19,6 @@ interface TwitterLoginProp {
     credentials?: "omit" | "same-origin" | "include";
 }
 
-declare var TwitterLogin: React.StatelessComponent<TwitterLoginProp>;
+declare var TwitterLogin: React.StatelessComponent<TwitterLoginProps>;
 
 export default TwitterLogin;

From ad69dad27843c004581b1d1be3b11a998fff44fd Mon Sep 17 00:00:00 2001
From: nju33 <nju33.ki@gmail.com>
Date: Mon, 19 Feb 2018 18:40:01 +0900
Subject: [PATCH 147/388] fix: Delete tslint comment and the second import

https://github.com/DefinitelyTyped/DefinitelyTyped/pull/23750#pullrequestreview-97448636
---
 types/slackdown/slackdown-tests.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/slackdown/slackdown-tests.ts b/types/slackdown/slackdown-tests.ts
index f6a26b6c7a..f04e88a218 100644
--- a/types/slackdown/slackdown-tests.ts
+++ b/types/slackdown/slackdown-tests.ts
@@ -1,6 +1,3 @@
 import * as slackdown from 'slackdown';
-// tslint:disable-next-line no-duplicate-imports
-import { parse } from 'slackdown';
 
 slackdown.parse('xxx <http://xxxxx.jp|xxxxx.jp>');
-parse('xxx <http://xxxxx.jp|xxxxx.jp>');

From 5251c1ca8b36397e1ca3d9022558cb12898d5a3e Mon Sep 17 00:00:00 2001
From: Stan Goldmann <goldmann@traum-ferienwohnungen.de>
Date: Mon, 19 Feb 2018 12:03:22 +0100
Subject: [PATCH 148/388] Address requested reviewer changes

---
 types/anybar/anybar-tests.ts |  6 +--
 types/anybar/index.d.ts      |  7 ++--
 types/anybar/tsconfig.json   |  2 +-
 types/anybar/tslint.json     | 78 +-----------------------------------
 4 files changed, 9 insertions(+), 84 deletions(-)

diff --git a/types/anybar/anybar-tests.ts b/types/anybar/anybar-tests.ts
index 9577c6a7de..dbc7a5edd6 100644
--- a/types/anybar/anybar-tests.ts
+++ b/types/anybar/anybar-tests.ts
@@ -1,5 +1,5 @@
-import anybar from 'anybar'
+import anybar = require('anybar');
 
-anybar('red', { port: 123 })
+anybar('red', { port: 123 });
 
-anybar('green')
+anybar('green');
diff --git a/types/anybar/index.d.ts b/types/anybar/index.d.ts
index 083dff9b44..a9a2452b06 100644
--- a/types/anybar/index.d.ts
+++ b/types/anybar/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for anybar 3.0.0
+// Type definitions for anybar 2.0
 // Project: https://github.com/sindresorhus/anybar
 // Definitions by: Chris Khoo <https://github.com/khoomeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-declare namespace anybar { }
+declare function anybar(color: string, options?: { port: number }): void;
 
-export default function anybar(color: string, options?: { port: number }): void
+export = anybar;
diff --git a/types/anybar/tsconfig.json b/types/anybar/tsconfig.json
index 1dd62548e6..2f04506e12 100644
--- a/types/anybar/tsconfig.json
+++ b/types/anybar/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "anybar-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/anybar/tslint.json b/types/anybar/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/anybar/tslint.json
+++ b/types/anybar/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 76fb5a78b15e6a2aad562266a53beb38f1661849 Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Mon, 19 Feb 2018 07:37:16 -0400
Subject: [PATCH 149/388] Adjustments

---
 types/jquery-lazyload/index.d.ts               | 8 ++++----
 types/jquery-lazyload/jquery-lazyload-tests.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/jquery-lazyload/index.d.ts b/types/jquery-lazyload/index.d.ts
index a48759dac7..5505c247f5 100644
--- a/types/jquery-lazyload/index.d.ts
+++ b/types/jquery-lazyload/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jQuery Lazy Load 1.9
+// Type definitions for JQuery Lazy Load 1.9
 // Project: https://github.com/tuupola/jquery_lazyload
 // Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,7 +6,7 @@
 
 /// <reference types="jquery" />
 
-declare namespace jQueryLazyLoad {
+declare namespace JQueryLazyLoad {
     interface Options {
         threshold?: number;
         failure_limit?: number;
@@ -21,6 +21,6 @@ declare namespace jQueryLazyLoad {
     }
 }
 interface JQuery {
-    lazyload(options?: jQueryLazyLoad.Options): JQuery;
-    on(event: 'load', callback: ((options?: jQueryLazyLoad.Options) => void)): JQuery;
+    lazyload(options?: JQueryLazyLoad.Options): JQuery;
+    on(event: 'load', callback: ((options?: JQueryLazyLoad.Options) => void)): JQuery;
 }
diff --git a/types/jquery-lazyload/jquery-lazyload-tests.ts b/types/jquery-lazyload/jquery-lazyload-tests.ts
index 5fee2eec1f..086069d11d 100644
--- a/types/jquery-lazyload/jquery-lazyload-tests.ts
+++ b/types/jquery-lazyload/jquery-lazyload-tests.ts
@@ -3,7 +3,7 @@ $(document).ready(() => {
     $('.lazyload').lazyload();
 
     // with options
-    const options: jQueryLazyLoad.Options = {
+    const options: JQueryLazyLoad.Options = {
         threshold: 200,
         event: 'click',
         effect: 'fadeIn',

From 953de5068d34098f137ee05a65ec038cfdab8d4d Mon Sep 17 00:00:00 2001
From: Jonathan Siebern <jsiebern88@gmail.com>
Date: Mon, 19 Feb 2018 16:07:17 +0100
Subject: [PATCH 150/388] Revert Version

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

diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index 2275e331f0..0d66b9750c 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for luxon 0.4.0
+// Type definitions for luxon 0.2
 // Project: https://github.com/moment/luxon#readme
 // Definitions by: Colby DeHart <https://github.com/colbydehart>
 //                 Hyeonseok Yang <https://github.com/FourwingsY>

From 3e54d1924efd893231ab7db8362a69d40eafa069 Mon Sep 17 00:00:00 2001
From: Derek Wickern <dwickern@gmail.com>
Date: Mon, 19 Feb 2018 10:39:28 -0800
Subject: [PATCH 151/388] ember-data: improve snapshot typings and add test

---
 types/ember-data/index.d.ts         | 64 +++++++++++++++++------------
 types/ember-data/test/serializer.ts | 56 +++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 27 deletions(-)

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index e3917b1a8b..2a2fdab7bd 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -13,6 +13,32 @@ declare module 'ember-data' {
     export interface ModelRegistry {}
     export interface AdapterRegistry {}
     export interface SerializerRegistry {}
+    export interface TransformRegistry {
+        'string': string;
+        'boolean': boolean;
+        'number': number;
+        'date': Date;
+    }
+
+    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)
+
+    interface AttributeMeta<Model extends DS.Model> {
+        type: keyof TransformRegistry;
+        options: object;
+        name: AttributesFor<Model>;
+        parentType: Model;
+        isAttribute: true;
+    }
+    interface RelationshipMeta<Model extends DS.Model> {
+        key: RelationshipsFor<Model>;
+        kind: 'belongsTo' | 'hasMany';
+        type: keyof ModelRegistry;
+        options: object;
+        name: string;
+        parentType: Model;
+        isRelationship: true;
+    }
 
     namespace DS {
         /**
@@ -82,27 +108,11 @@ declare module 'ember-data' {
          * `boolean` and `date`. You can define your own transforms by subclassing
          * [DS.Transform](/api/data/classes/DS.Transform.html).
          */
-        function attr(
-            type: 'string',
-            options?: AttrOptions<string>
-        ): Ember.ComputedProperty<string>;
-        function attr(
-            type: 'boolean',
-            options?: AttrOptions<boolean>
-        ): Ember.ComputedProperty<boolean>;
-        function attr(
-            type: 'number',
-            options?: AttrOptions<number>
-        ): Ember.ComputedProperty<number>;
-        function attr(
-            type: 'date',
-            options?: AttrOptions<Date>
-        ): Ember.ComputedProperty<Date>;
-        function attr<T>(
-            type: string,
-            options?: AttrOptions<T>
-        ): Ember.ComputedProperty<T>;
-        function attr<T>(options?: AttrOptions<T>): Ember.ComputedProperty<T>;
+        function attr<K extends keyof TransformRegistry>(
+            type: K,
+            options?: AttrOptions<TransformRegistry[K]>
+        ): Ember.ComputedProperty<TransformRegistry[K]>;
+        function attr(options?: AttrOptions): Ember.ComputedProperty<any>;
         /**
          * WARNING: This interface is likely to change in order to accomodate https://github.com/emberjs/rfcs/pull/4
          * ## Using BuildURLMixin
@@ -942,7 +952,7 @@ declare module 'ember-data' {
             /**
              * Returns the value of an attribute.
              */
-            attr<L extends keyof ModelRegistry[K]>(keyName: L): ModelRegistry[K][L];
+            attr<L extends AttributesFor<ModelRegistry[K]>>(keyName: L): ModelRegistry[K][L];
             /**
              * Returns all attributes and their corresponding values.
              */
@@ -954,18 +964,18 @@ declare module 'ember-data' {
             /**
              * Returns the current value of a belongsTo relationship.
              */
-            belongsTo<L extends keyof ModelRegistry[K]>(
+            belongsTo<L extends RelationshipsFor<ModelRegistry[K]>>(
                 keyName: L,
                 options?: {}
             ): Snapshot<K>['record'][L] | string | null | undefined;
             /**
              * Returns the current value of a hasMany relationship.
              */
-            hasMany<L extends keyof ModelRegistry[K]>(
+            hasMany<L extends RelationshipsFor<ModelRegistry[K]>>(
                 keyName: L,
                 options?: { ids: false }
             ): Array<Snapshot<K>['record'][L]> | undefined;
-            hasMany<L extends keyof ModelRegistry[K]>(
+            hasMany<L extends RelationshipsFor<ModelRegistry[K]>>(
                 keyName: L,
                 options: { ids: true }
             ): string[] | undefined;
@@ -973,12 +983,12 @@ declare module 'ember-data' {
              * Iterates through all the attributes of the model, calling the passed
              * function on each attribute.
              */
-            eachAttribute(callback: Function, binding: {}): any;
+            eachAttribute<M extends ModelRegistry[K]>(callback: (key: keyof M, meta: AttributeMeta<M>) => void, binding?: {}): any;
             /**
              * Iterates through all the relationships of the model, calling the passed
              * function on each relationship.
              */
-            eachRelationship(callback: Function, binding: {}): any;
+            eachRelationship<M extends ModelRegistry[K]>(callback: (key: keyof M, meta: RelationshipMeta<M>) => void, binding?: {}): any;
             /**
              * Serializes the snapshot using the serializer for the model.
              */
diff --git a/types/ember-data/test/serializer.ts b/types/ember-data/test/serializer.ts
index baaa65ae9e..b694b38b89 100644
--- a/types/ember-data/test/serializer.ts
+++ b/types/ember-data/test/serializer.ts
@@ -37,3 +37,59 @@ const EmbeddedRecordMixin = DS.JSONSerializer.extend(DS.EmbeddedRecordsMixin, {
         }
     }
 });
+
+class Message extends DS.Model.extend({
+    title: DS.attr(),
+    body: DS.attr(),
+
+    author: DS.belongsTo('user'),
+    comments: DS.belongsTo('comment')
+}) {}
+
+declare module 'ember-data' {
+    interface ModelRegistry {
+        'message-for-serializer': Message;
+    }
+}
+
+interface CustomSerializerOptions {
+    includeId: boolean;
+}
+
+const SerializerUsingSnapshots = DS.RESTSerializer.extend({
+    serialize(snapshot: DS.Snapshot<'message-for-serializer'>, options: CustomSerializerOptions) {
+        let json: any = {
+            POST_TTL: snapshot.attr('title'),
+            POST_BDY: snapshot.attr('body'),
+            POST_CMS: snapshot.hasMany('comments', { ids: true })
+        };
+
+        if (options.includeId) {
+            json.POST_ID_ = snapshot.id;
+        }
+
+        return json;
+    }
+});
+
+DS.Serializer.extend({
+    serialize(snapshot: DS.Snapshot<'message-for-serializer'>, options: {}) {
+        let json: any = {
+            id: snapshot.id
+        };
+
+        snapshot.eachAttribute((key, attribute) => {
+            json[key] = snapshot.attr(key);
+        });
+
+        snapshot.eachRelationship((key, relationship) => {
+            if (relationship.kind === 'belongsTo') {
+                json[key] = snapshot.belongsTo(key, { id: true });
+            } else if (relationship.kind === 'hasMany') {
+                json[key] = snapshot.hasMany(key, { ids: true });
+            }
+        });
+
+        return json;
+    },
+});

From f5b80c3221cd5a01a89fa0532815a9f26049a5af Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Mon, 19 Feb 2018 14:32:11 -0700
Subject: [PATCH 152/388] Ember: `isEvery` has optional second arg.

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

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index bb268646be..1c3ca479a5 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1182,7 +1182,7 @@ declare module 'ember' {
              * argument for all items in the enumerable. This method is often simpler/faster
              * than using a callback.
              */
-            isEvery(key: string, value: boolean): boolean;
+            isEvery(key: string, value?: boolean): boolean;
             /**
              * Returns `true` if the passed function returns true for any item in the
              * enumeration.
diff --git a/types/ember/test/ember-tests.ts b/types/ember/test/ember-tests.ts
index 94de3bf259..bc869948d7 100755
--- a/types/ember/test/ember-tests.ts
+++ b/types/ember/test/ember-tests.ts
@@ -130,6 +130,7 @@ const isHappy = (person: typeof Person3.prototype): boolean => {
 };
 people2.every(isHappy);
 people2.any(isHappy);
+people2.isEvery('isHappy');
 people2.isEvery('isHappy', true);
 people2.isAny('isHappy', true);
 people2.isAny('isHappy');

From af0fdeeab0fb2d0bc8089897dcd003a8aa5a370a Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 19:45:47 +0900
Subject: [PATCH 153/388] validator (v7.0): remove isDate()

---
 types/validator/index.d.ts         | 11 ++---------
 types/validator/validator-tests.ts |  6 ------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index e27b1e70c0..34de2ee9f9 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for validator.js v6.3
+// Type definitions for validator.js v7.0
 // Project: https://github.com/chriso/validator.js
 // Definitions by: tgfjt <https://github.com/tgfjt>
 //                 Ilya Mochalov <https://github.com/chrootsu>
@@ -6,6 +6,7 @@
 //                 Louy Alakkad <https://github.com/louy>
 //                 Kacper Polak <https://github.com/kacepe>
 //                 Bonggyun Lee <https://github.com/deptno>
+//                 Naoto Yokoyama <https://github.com/builtinnya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ValidatorJS {
@@ -66,9 +67,6 @@ declare namespace ValidatorJS {
     // check if the string is a data uri format (https://developer.mozilla.org/en-US/docs/Web/HTTP/data_URIs)
     isDataURI(str: string): boolean;
 
-    // check if the string is a date.
-    isDate(str: string): boolean;
-
     // check if the string represents a decimal number, such as 0.1, .3, 1.1, 1.00003, 4.0, etc.
     isDecimal(str: string): boolean;
 
@@ -406,11 +404,6 @@ declare module "validator/lib/isDataURI" {
   export = isDataURI;
 }
 
-declare module "validator/lib/isDate" {
-  const isDate: typeof validator.isDate;
-  export = isDate;
-}
-
 declare module "validator/lib/isDecimal" {
   const isDecimal: typeof validator.isDecimal;
   export = isDecimal;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 2bda229ea6..92acf504c4 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -20,7 +20,6 @@ import isByteLengthFunc = require('validator/lib/isByteLength');
 import isCreditCardFunc = require('validator/lib/isCreditCard');
 import isCurrencyFunc = require('validator/lib/isCurrency');
 import isDataURIFunc = require('validator/lib/isDataURI');
-import isDateFunc = require('validator/lib/isDate');
 import isDecimalFunc = require('validator/lib/isDecimal');
 import isDivisibleByFunc = require('validator/lib/isDivisibleBy');
 import isEmailFunc = require('validator/lib/isEmail');
@@ -113,9 +112,6 @@ import whitelistFunc = require('validator/lib/whitelist');
   let _isDataURI = validator.isDataURI;
   _isDataURI = isDataURIFunc;
 
-  let _isDate = validator.isDate;
-  _isDate = isDateFunc;
-
   let _isDecimal = validator.isDecimal;
   _isDecimal = isDecimalFunc;
 
@@ -378,8 +374,6 @@ let any: any;
 
   result = validator.isDataURI('sample');
 
-  result = validator.isDate('sample');
-
   result = validator.isDecimal('sample');
 
   result = validator.isDivisibleBy('sample', 2);

From caf5db5ccf11fa02e016f175a2f40e0c096e6267 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 20:05:26 +0900
Subject: [PATCH 154/388] validator (v7.1): add isISRC() and mobile phone
 locales

Added locales are:
  - id-ID (https://github.com/chriso/validator.js/pull/647)
  - lt-LT (https://github.com/chriso/validator.js/pull/667)
  - fa-IR (https://github.com/chriso/validator.js/pull/671)

ko-KR (https://github.com/chriso/validator.js/pull/668) has already
been added.
---
 types/validator/index.d.ts         | 18 +++++++++++++-----
 types/validator/validator-tests.ts |  9 +++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index 34de2ee9f9..22fe951788 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for validator.js v7.0
+// Type definitions for validator.js v7.1
 // Project: https://github.com/chriso/validator.js
 // Definitions by: tgfjt <https://github.com/tgfjt>
 //                 Ilya Mochalov <https://github.com/chrootsu>
@@ -12,7 +12,7 @@
 declare namespace ValidatorJS {
   type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "nl-NL" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR";
   type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "fr-BE" | "hu-HU" | "nl-BE" | "nl-NL" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR";
-  type MobilePhoneLocale = "ar-DZ" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fi-FI" | "fr-FR" | "hu-HU" | "it-IT" | "ja-JP" | "ko-KR" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ru-RU" | "sr-RS" | "tr-TR" | "vi-VN" | "zh-CN" | "zh-TW" | "any";
+  type MobilePhoneLocale = "ar-DZ" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fr-FR" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ru-RU" | "sr-RS" | "tr-TR" | "vi-VN" | "zh-CN" | "zh-TW" | "any";
   type PostalCodeLocale = "AT" | "AU" | "BE" | "CA" | "CH" | "CZ" | "DE" | "DK" | "DZ" | "ES" | "FI" | "FR" | "GB" | "GR" | "IL" | "IN" | "IS" | "IT" | "JP" | "KE" | "LI" | "MX" | "NL" | "NO" | "PL" | "PT" | "RO" | "RU" | "SA" | "SE" | "TW" | "US" | "ZA" | "ZM" | "any"
 
   interface ValidatorStatic {
@@ -110,6 +110,9 @@ declare namespace ValidatorJS {
     // check if the string is a valid ISO 8601 (https://en.wikipedia.org/wiki/ISO_8601) date.
     isISO8601(str: string): boolean;
 
+    // check if the string is a ISRC (https://en.wikipedia.org/wiki/International_Standard_Recording_Code).
+    isISRC(str: string): boolean;
+
     // check if the string is in a array of allowed values.
     isIn(str: string, values: any[]): boolean;
 
@@ -135,9 +138,9 @@ declare namespace ValidatorJS {
 
     // check if the string is a mobile phone number, (locale is one of
     // ['ar-DZ', 'ar-SA', 'ar-SY', 'cs-CZ', 'de-DE', 'da-DK', 'el-GR', 'en-AU', 'en-GB', 'en-HK',
-    // 'en-IN', 'en-NZ', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fi-FI', 'fr-FR', 'hu-HU',
-    // 'it-IT', 'ja-JP', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL', 'pt-PT', 'ru-RU', 'sr-RS', 'tr-TR',
-    // 'vi-VN', 'zh-CN', 'zh-TW']).
+    // 'en-IN', 'en-NZ', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fr-FR',
+    // 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'ko-KR', lt-LT', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL',
+    // 'pt-PT', 'ru-RU', 'sr-RS', 'tr-TR', 'vi-VN', 'zh-CN', 'zh-TW']).
     isMobilePhone(str: string, locale: MobilePhoneLocale): boolean;
 
     // check if the string is a valid hex-encoded representation of a MongoDB ObjectId
@@ -474,6 +477,11 @@ declare module "validator/lib/isISO8601" {
   export = isISO8601;
 }
 
+declare module "validator/lib/isISRC" {
+  const isISRC: typeof validator.isISRC;
+  export = isISRC;
+}
+
 declare module "validator/lib/isIn" {
   const isIn: typeof validator.isIn;
   export = isIn;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 92acf504c4..76d08c1c6c 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -34,6 +34,7 @@ import isIPFunc = require('validator/lib/isIP');
 import isISBNFunc = require('validator/lib/isISBN');
 import isISINFunc = require('validator/lib/isISIN');
 import isISO8601Func = require('validator/lib/isISO8601');
+import isISRCFunc = require('validator/lib/isISRC');
 import isInFunc = require('validator/lib/isIn');
 import isIntFunc = require('validator/lib/isInt');
 import isJSONFunc = require('validator/lib/isJSON');
@@ -154,6 +155,9 @@ import whitelistFunc = require('validator/lib/whitelist');
   let _isISO8601 = validator.isISO8601;
   _isISO8601 = isISO8601Func;
 
+  let _isISRC = validator.isISRC;
+  _isISRC = isISRCFunc;
+
   let _isIn = validator.isIn;
   _isIn = isInFunc;
 
@@ -408,6 +412,8 @@ let any: any;
 
   result = validator.isISO8601('sample');
 
+  result = validator.isISRC('sample');
+
   result = validator.isIn('sample', []);
 
   let isIntOptions: ValidatorJS.IsIntOptions;
@@ -444,12 +450,15 @@ let any: any;
   result = validator.isMobilePhone('sample', 'en-ZA');
   result = validator.isMobilePhone('sample', 'en-ZM');
   result = validator.isMobilePhone('sample', 'es-ES');
+  result = validator.isMobilePhone('sample', 'fa-IR');
   result = validator.isMobilePhone('sample', 'fi-FI');
   result = validator.isMobilePhone('sample', 'fr-FR');
   result = validator.isMobilePhone('sample', 'hu-HU');
+  result = validator.isMobilePhone('sample', 'id-ID');
   result = validator.isMobilePhone('sample', 'it-IT');
   result = validator.isMobilePhone('sample', 'ja-JP');
   result = validator.isMobilePhone('sample', 'ko-KR');
+  result = validator.isMobilePhone('sample', 'lt-LT');
   result = validator.isMobilePhone('sample', 'ms-MY');
   result = validator.isMobilePhone('sample', 'nb-NO');
   result = validator.isMobilePhone('sample', 'nn-NO');

From a948fb3eb7bc6b3605efd87e9d31c3c078989fe3 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 20:57:38 +0900
Subject: [PATCH 155/388] validator (v7.2): update a bunch of locales

Locales added in v7.2:
  - any (https://github.com/chriso/validator.js/pull/663)
  - en-KE (https://github.com/chriso/validator.js/pull/673)
  - en-UG, en-RW, en-TZ (https://github.com/chriso/validator.js/pull/676)

Missing locales (but added in this commit):
  - da-DK (https://github.com/chriso/validator.js/pull/601)
  - uk-UA (https://github.com/chriso/validator.js/pull/585)
  - en-NG (https://github.com/chriso/validator.js/pull/616)
  - en-PK (https://github.com/chriso/validator.js/pull/630)
  - he-IL (https://github.com/chriso/validator.js/pull/610)
  - ro-RO (https://github.com/chriso/validator.js/pull/627)
  - zh-HK (https://github.com/chriso/validator.js/pull/622)

Non-existent locales:
  - fr-BE, nl-BE (https://github.com/chriso/validator.js/pull/700)
---
 types/validator/index.d.ts         | 27 ++++++++++++++-------------
 types/validator/validator-tests.ts | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index 22fe951788..bfb1e5d4ad 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for validator.js v7.1
+// Type definitions for validator.js v7.2
 // Project: https://github.com/chriso/validator.js
 // Definitions by: tgfjt <https://github.com/tgfjt>
 //                 Ilya Mochalov <https://github.com/chrootsu>
@@ -10,9 +10,9 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ValidatorJS {
-  type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "nl-NL" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR";
-  type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "fr-BE" | "hu-HU" | "nl-BE" | "nl-NL" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR";
-  type MobilePhoneLocale = "ar-DZ" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fr-FR" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ru-RU" | "sr-RS" | "tr-TR" | "vi-VN" | "zh-CN" | "zh-TW" | "any";
+  type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "nl-NL" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR" | "uk-UA";
+  type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "nl-NL" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR" | "uk-UA";
+  type MobilePhoneLocale = "ar-DZ" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sr-RS" | "tr-TR" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
   type PostalCodeLocale = "AT" | "AU" | "BE" | "CA" | "CH" | "CZ" | "DE" | "DK" | "DZ" | "ES" | "FI" | "FR" | "GB" | "GR" | "IL" | "IN" | "IS" | "IT" | "JP" | "KE" | "LI" | "MX" | "NL" | "NO" | "PL" | "PT" | "RO" | "RU" | "SA" | "SE" | "TW" | "US" | "ZA" | "ZM" | "any"
 
   interface ValidatorStatic {
@@ -32,14 +32,14 @@ declare namespace ValidatorJS {
 
     // check if the string contains only letters (a-zA-Z). Locale is one of ['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG',
     // 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE',
-    // 'cs-CZ', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR', 'hu-HU',
-    // 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'tr-TR']) and defaults to en-US
+    // 'cs-CZ', 'da-DK', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR',
+    // 'hu-HU', 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'tr-TR' 'uk-UA']) and defaults to en-US
     isAlpha(str: string, locale?: AlphaLocale): boolean;
 
     // check if the string contains only letters and numbers. Locale is one of ['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG',
     // 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE',
-    // 'cs-CZ', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR', 'hu-HU',
-    // 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'tr-TR']) and defaults to en-US
+    // 'cs-CZ', 'da-DK', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR',
+    // 'hu-HU', 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'tr-TR', 'uk-UA']) and defaults to en-US
     isAlphanumeric(str: string, locale?: AlphanumericLocale): boolean;
 
     // check if the string contains ASCII chars only.
@@ -138,9 +138,10 @@ declare namespace ValidatorJS {
 
     // check if the string is a mobile phone number, (locale is one of
     // ['ar-DZ', 'ar-SA', 'ar-SY', 'cs-CZ', 'de-DE', 'da-DK', 'el-GR', 'en-AU', 'en-GB', 'en-HK',
-    // 'en-IN', 'en-NZ', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fr-FR',
-    // 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'ko-KR', lt-LT', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL',
-    // 'pt-PT', 'ru-RU', 'sr-RS', 'tr-TR', 'vi-VN', 'zh-CN', 'zh-TW']).
+    // 'en-IN', 'en-KE', 'en-NG', 'en-NZ', 'en-UG', 'en-RW', 'en-TZ', 'en-PK', 'en-US', 'en-CA',
+    // 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fr-FR', 'he-IL', 'hu-HU', 'id-ID', 'it-IT',
+    // 'ja-JP', 'ko-KR', lt-LT', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL', 'pt-PT', 'ro-RO', 'ru-RU',
+    // 'sr-RS', 'tr-TR', 'vi-VN', 'zh-CN', 'zh-HK', 'zh-TW']).
     isMobilePhone(str: string, locale: MobilePhoneLocale): boolean;
 
     // check if the string is a valid hex-encoded representation of a MongoDB ObjectId
@@ -157,8 +158,8 @@ declare namespace ValidatorJS {
     isNumeric(str: string): boolean;
 
     // check if the string is a postal code, (locale is one of
-    // [ 'AT', 'AU', 'BE', 'CA', 'CH', 'CZ', 'DE', 'DK', 'DZ', 'ES', 'FI', 'FR', 'GB', 'GR', 'IL', 
-    // 'IN', 'IS', 'IT', 'JP', 'KE', 'LI', 'MX', 'NL', 'NO', 'PL', 'PT', 'RO', 'RU', 'SA', 'SE', 
+    // [ 'AT', 'AU', 'BE', 'CA', 'CH', 'CZ', 'DE', 'DK', 'DZ', 'ES', 'FI', 'FR', 'GB', 'GR', 'IL',
+    // 'IN', 'IS', 'IT', 'JP', 'KE', 'LI', 'MX', 'NL', 'NO', 'PL', 'PT', 'RO', 'RU', 'SA', 'SE',
     // 'TW', 'US', 'ZA', 'ZM' ]) OR 'any'. If 'any' is used, function will check if any of the
     // locales match).
     isPostalCode(str: string, locale: PostalCodeLocale): boolean;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 76d08c1c6c..b6d44b04bf 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -293,6 +293,7 @@ let any: any;
   result = validator.isAlpha('sample', 'ar-TN');
   result = validator.isAlpha('sample', 'ar-YE');
   result = validator.isAlpha('sample', 'cs-CZ');
+  result = validator.isAlpha('sample', 'da-DK');
   result = validator.isAlpha('sample', 'de-DE');
   result = validator.isAlpha('sample', 'en-AU');
   result = validator.isAlpha('sample', 'en-GB');
@@ -313,6 +314,7 @@ let any: any;
   result = validator.isAlpha('sample', 'sr-RS');
   result = validator.isAlpha('sample', 'sr-RS@latin');
   result = validator.isAlpha('sample', 'tr-TR');
+  result = validator.isAlpha('sample', 'uk-UA');
 
   result = validator.isAlphanumeric('sample', 'ar');
   result = validator.isAlphanumeric('sample', 'ar-AE');
@@ -333,6 +335,7 @@ let any: any;
   result = validator.isAlphanumeric('sample', 'ar-TN');
   result = validator.isAlphanumeric('sample', 'ar-YE');
   result = validator.isAlphanumeric('sample', 'cs-CZ');
+  result = validator.isAlphanumeric('sample', 'da-DK');
   result = validator.isAlphanumeric('sample', 'de-DE');
   result = validator.isAlphanumeric('sample', 'en-AU');
   result = validator.isAlphanumeric('sample', 'en-GB');
@@ -344,9 +347,7 @@ let any: any;
   result = validator.isAlphanumeric('sample', 'en-ZM');
   result = validator.isAlphanumeric('sample', 'es-ES');
   result = validator.isAlphanumeric('sample', 'fr-FR');
-  result = validator.isAlphanumeric('sample', 'fr-BE');
   result = validator.isAlphanumeric('sample', 'hu-HU');
-  result = validator.isAlphanumeric('sample', 'nl-BE');
   result = validator.isAlphanumeric('sample', 'nl-NL');
   result = validator.isAlphanumeric('sample', 'pl-PL');
   result = validator.isAlphanumeric('sample', 'pt-BR');
@@ -355,6 +356,7 @@ let any: any;
   result = validator.isAlphanumeric('sample', 'sr-RS');
   result = validator.isAlphanumeric('sample', 'sr-RS@latin');
   result = validator.isAlphanumeric('sample', 'tr-TR');
+  result = validator.isAlphanumeric('sample', 'uk-UA');
 
   result = validator.isAscii('sample');
 
@@ -444,7 +446,13 @@ let any: any;
   result = validator.isMobilePhone('sample', 'en-GB');
   result = validator.isMobilePhone('sample', 'en-HK');
   result = validator.isMobilePhone('sample', 'en-IN');
+  result = validator.isMobilePhone('sample', 'en-KE');
+  result = validator.isMobilePhone('sample', 'en-NG');
   result = validator.isMobilePhone('sample', 'en-NZ');
+  result = validator.isMobilePhone('sample', 'en-UG');
+  result = validator.isMobilePhone('sample', 'en-RW');
+  result = validator.isMobilePhone('sample', 'en-TZ');
+  result = validator.isMobilePhone('sample', 'en-PK');
   result = validator.isMobilePhone('sample', 'en-US');
   result = validator.isMobilePhone('sample', 'en-CA');
   result = validator.isMobilePhone('sample', 'en-ZA');
@@ -453,6 +461,7 @@ let any: any;
   result = validator.isMobilePhone('sample', 'fa-IR');
   result = validator.isMobilePhone('sample', 'fi-FI');
   result = validator.isMobilePhone('sample', 'fr-FR');
+  result = validator.isMobilePhone('sample', 'he-IL');
   result = validator.isMobilePhone('sample', 'hu-HU');
   result = validator.isMobilePhone('sample', 'id-ID');
   result = validator.isMobilePhone('sample', 'it-IT');
@@ -464,12 +473,15 @@ let any: any;
   result = validator.isMobilePhone('sample', 'nn-NO');
   result = validator.isMobilePhone('sample', 'pl-PL');
   result = validator.isMobilePhone('sample', 'pt-PT');
+  result = validator.isMobilePhone('sample', 'ro-RO');
   result = validator.isMobilePhone('sample', 'ru-RU');
   result = validator.isMobilePhone('sample', 'sr-RS');
   result = validator.isMobilePhone('sample', 'tr-TR');
   result = validator.isMobilePhone('sample', 'vi-VN');
   result = validator.isMobilePhone('sample', 'zh-CN');
+  result = validator.isMobilePhone('sample', 'zh-HK');
   result = validator.isMobilePhone('sample', 'zh-TW');
+  result = validator.isMobilePhone('sample', 'any');
 
   result = validator.isMongoId('sample');
 

From a4551084b2b6a13971aacbb80fc8def71614c9d9 Mon Sep 17 00:00:00 2001
From: Robin Franken <franken@lequest.nl>
Date: Tue, 20 Feb 2018 13:09:30 +0100
Subject: [PATCH 156/388] Updated react-truncate definition

Added `trimWhitespace` prop.
---
 types/react-truncate/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-truncate/index.d.ts b/types/react-truncate/index.d.ts
index cb97ccafe7..70cdd4b25d 100644
--- a/types/react-truncate/index.d.ts
+++ b/types/react-truncate/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-truncate 2.1
+// Type definitions for react-truncate 2.3
 // Project: https://github.com/One-com/react-truncate
 // Definitions by: Matt Perry <https://github.com/mattvperry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,6 +10,7 @@ export interface TruncateProps extends React.HTMLProps<Truncate> {
     lines?: number | false;
     ellipsis?: React.ReactNode;
     onTruncate?(isTruncated: boolean): void;
+    trimWhitespace?: boolean;
 }
 
 declare class Truncate extends React.Component<TruncateProps> { }

From b80e170556371c63fe4f20fcb82fb7112fd83cef Mon Sep 17 00:00:00 2001
From: Robin Franken <franken@lequest.nl>
Date: Tue, 20 Feb 2018 13:11:09 +0100
Subject: [PATCH 157/388] Added test for prop

---
 types/react-truncate/react-truncate-tests.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/react-truncate/react-truncate-tests.tsx b/types/react-truncate/react-truncate-tests.tsx
index c73d5a2ad7..5a97f7183f 100644
--- a/types/react-truncate/react-truncate-tests.tsx
+++ b/types/react-truncate/react-truncate-tests.tsx
@@ -14,5 +14,9 @@ const TruncateTest: React.SFC = _ => (
         <Truncate lines={false} ellipsis={<span>Read more</span>} id="identifier">
             <div>Test string</div>
         </Truncate>
+
+	<Truncate trimWhitespace={true}>
+            <div>Test string</div>
+	</Truncate>
     </div>
 );

From 659358ae4b2a2ac30d58db64bd5b955d1c241804 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 21:23:46 +0900
Subject: [PATCH 158/388] validator (v8.1): add isLatLong() and locales (nb-NO
 and nn-NO)

isPostalCode() has already been added.
---
 types/validator/index.d.ts         | 18 +++++++++++++-----
 types/validator/validator-tests.ts | 10 ++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index bfb1e5d4ad..a4b19606b9 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for validator.js v7.2
+// Type definitions for validator.js v8.1
 // Project: https://github.com/chriso/validator.js
 // Definitions by: tgfjt <https://github.com/tgfjt>
 //                 Ilya Mochalov <https://github.com/chrootsu>
@@ -10,8 +10,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ValidatorJS {
-  type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "nl-NL" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR" | "uk-UA";
-  type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "nl-NL" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR" | "uk-UA";
+  type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR" | "uk-UA";
+  type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR" | "uk-UA";
   type MobilePhoneLocale = "ar-DZ" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sr-RS" | "tr-TR" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
   type PostalCodeLocale = "AT" | "AU" | "BE" | "CA" | "CH" | "CZ" | "DE" | "DK" | "DZ" | "ES" | "FI" | "FR" | "GB" | "GR" | "IL" | "IN" | "IS" | "IT" | "JP" | "KE" | "LI" | "MX" | "NL" | "NO" | "PL" | "PT" | "RO" | "RU" | "SA" | "SE" | "TW" | "US" | "ZA" | "ZM" | "any"
 
@@ -33,13 +33,13 @@ declare namespace ValidatorJS {
     // check if the string contains only letters (a-zA-Z). Locale is one of ['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG',
     // 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE',
     // 'cs-CZ', 'da-DK', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR',
-    // 'hu-HU', 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'tr-TR' 'uk-UA']) and defaults to en-US
+    // 'hu-HU', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'tr-TR' 'uk-UA']) and defaults to en-US
     isAlpha(str: string, locale?: AlphaLocale): boolean;
 
     // check if the string contains only letters and numbers. Locale is one of ['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG',
     // 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE',
     // 'cs-CZ', 'da-DK', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR',
-    // 'hu-HU', 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'tr-TR', 'uk-UA']) and defaults to en-US
+    // 'hu-HU', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'tr-TR', 'uk-UA']) and defaults to en-US
     isAlphanumeric(str: string, locale?: AlphanumericLocale): boolean;
 
     // check if the string contains ASCII chars only.
@@ -122,6 +122,9 @@ declare namespace ValidatorJS {
     // check if the string is valid JSON (note: uses JSON.parse).
     isJSON(str: string): boolean;
 
+    // check if the string is a valid latitude-longitude coordinate in the format lat,long or lat, long.
+    isLatLong(str: string): boolean;
+
     // check if the string's length falls in a range.
     // Note: this function takes into account surrogate pairs.
     isLength(str: string, options: IsLengthOptions): boolean;
@@ -498,6 +501,11 @@ declare module "validator/lib/isJSON" {
   export = isJSON;
 }
 
+declare module "validator/lib/isLatLong" {
+  const isLatLong: typeof validator.isLatLong;
+  export = isLatLong;
+}
+
 declare module "validator/lib/isLength" {
   const isLength: typeof validator.isLength;
   export = isLength;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index b6d44b04bf..2be484cf0a 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -38,6 +38,7 @@ import isISRCFunc = require('validator/lib/isISRC');
 import isInFunc = require('validator/lib/isIn');
 import isIntFunc = require('validator/lib/isInt');
 import isJSONFunc = require('validator/lib/isJSON');
+import isLatLongFunc = require('validator/lib/isLatLong');
 import isLengthFunc = require('validator/lib/isLength');
 import isLowercaseFunc = require('validator/lib/isLowercase');
 import isMACAddressFunc = require('validator/lib/isMACAddress');
@@ -167,6 +168,9 @@ import whitelistFunc = require('validator/lib/whitelist');
   let _isJSON = validator.isJSON;
   _isJSON = isJSONFunc;
 
+  let _isLatLong = validator.isLatLong;
+  _isLatLong = isLatLongFunc;
+
   let _isLength = validator.isLength;
   _isLength = isLengthFunc;
 
@@ -306,7 +310,9 @@ let any: any;
   result = validator.isAlpha('sample', 'es-ES');
   result = validator.isAlpha('sample', 'fr-FR');
   result = validator.isAlpha('sample', 'hu-HU');
+  result = validator.isAlpha('sample', 'nb-NO');
   result = validator.isAlpha('sample', 'nl-NL');
+  result = validator.isAlpha('sample', 'nn-NO');
   result = validator.isAlpha('sample', 'pl-PL');
   result = validator.isAlpha('sample', 'pt-BR');
   result = validator.isAlpha('sample', 'pt-PT');
@@ -348,7 +354,9 @@ let any: any;
   result = validator.isAlphanumeric('sample', 'es-ES');
   result = validator.isAlphanumeric('sample', 'fr-FR');
   result = validator.isAlphanumeric('sample', 'hu-HU');
+  result = validator.isAlphanumeric('sample', 'nb-NO');
   result = validator.isAlphanumeric('sample', 'nl-NL');
+  result = validator.isAlphanumeric('sample', 'nn-NO');
   result = validator.isAlphanumeric('sample', 'pl-PL');
   result = validator.isAlphanumeric('sample', 'pt-BR');
   result = validator.isAlphanumeric('sample', 'pt-PT');
@@ -424,6 +432,8 @@ let any: any;
 
   result = validator.isJSON('sample');
 
+  result = validator.isLatLong('sample');
+
   let isLengthOptions: ValidatorJS.IsLengthOptions;
   result = validator.isLength('sample', isLengthOptions);
   result = validator.isLength('sample', 3);

From e7c58c631710f2e6bc9d631a68235bad289ebfba Mon Sep 17 00:00:00 2001
From: Josh Farrant <josh@farrant.me>
Date: Tue, 20 Feb 2018 12:37:42 +0000
Subject: [PATCH 159/388] Added missing optional tagName prop

https://github.com/malte-wessel/react-custom-scrollbars/blob/master/src/Scrollbars/index.js#L498
---
 types/react-custom-scrollbars/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-custom-scrollbars/index.d.ts b/types/react-custom-scrollbars/index.d.ts
index a55675ed8d..7f60cc8a2a 100644
--- a/types/react-custom-scrollbars/index.d.ts
+++ b/types/react-custom-scrollbars/index.d.ts
@@ -32,6 +32,7 @@ declare module "react-custom-scrollbars" {
         renderThumbHorizontal?: React.StatelessComponent<any>;
         renderThumbVertical?: React.StatelessComponent<any>;
 
+        tagName?: string;
         hideTracksWhenNotNeeded?: boolean;
 
         autoHide?: boolean;

From 9318ba8c9bd8a2a4e285c966a05b02a75184f4c9 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 21:51:40 +0900
Subject: [PATCH 160/388] validator (v8.2): add isHash(), isCurrency() options,
 and locales

Added isCurrency() options are:
  - allow_decimal
  - require_decimal
  - digits_after_decimal

Added locales are:
  - it-IT (https://github.com/chriso/validator.js/pull/700)
  - sv-SE (https://github.com/chriso/validator.js/pull/714)
  - ar-AE, ar-EG (https://github.com/chriso/validator.js/pull/718)
  - ar-JO (https://github.com/chriso/validator.js/pull/701)
  - sk-SK (https://github.com/chriso/validator.js/pull/715)
---
 types/validator/index.d.ts         | 38 +++++++++++++++++++++---------
 types/validator/validator-tests.ts | 26 ++++++++++++++++++++
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index a4b19606b9..6588570a1a 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for validator.js v8.1
+// Type definitions for validator.js v8.2
 // Project: https://github.com/chriso/validator.js
 // Definitions by: tgfjt <https://github.com/tgfjt>
 //                 Ilya Mochalov <https://github.com/chrootsu>
@@ -10,10 +10,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ValidatorJS {
-  type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR" | "uk-UA";
-  type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "tr-TR" | "uk-UA";
-  type MobilePhoneLocale = "ar-DZ" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sr-RS" | "tr-TR" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
+  type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
+  type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
+  type MobilePhoneLocale = "ar-AE" | "ar-DZ" | "ar-EG" | "ar-JO" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sk-SK" | "sr-RS" | "tr-TR" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
   type PostalCodeLocale = "AT" | "AU" | "BE" | "CA" | "CH" | "CZ" | "DE" | "DK" | "DZ" | "ES" | "FI" | "FR" | "GB" | "GR" | "IL" | "IN" | "IS" | "IT" | "JP" | "KE" | "LI" | "MX" | "NL" | "NO" | "PL" | "PT" | "RO" | "RU" | "SA" | "SE" | "TW" | "US" | "ZA" | "ZM" | "any"
+  type HashAlgorithm = "md4" | "md5" | "sha1" | "sha256" | "sha384" | "sha512" | "ripemd128" | "ripemd160" | "tiger128" | "tiger160" | "tiger192" | "crc32" | "crc32b";
 
   interface ValidatorStatic {
 
@@ -33,13 +34,15 @@ declare namespace ValidatorJS {
     // check if the string contains only letters (a-zA-Z). Locale is one of ['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG',
     // 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE',
     // 'cs-CZ', 'da-DK', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR',
-    // 'hu-HU', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'tr-TR' 'uk-UA']) and defaults to en-US
+    // 'hu-HU', 'it-IT' 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'sv-SE',
+    // 'tr-TR', 'uk-UA']) and defaults to en-US
     isAlpha(str: string, locale?: AlphaLocale): boolean;
 
     // check if the string contains only letters and numbers. Locale is one of ['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG',
     // 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE',
     // 'cs-CZ', 'da-DK', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR',
-    // 'hu-HU', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'tr-TR', 'uk-UA']) and defaults to en-US
+    // 'hu-HU', 'it-IT', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'sv-SE',
+    // 'tr-TR', 'uk-UA']) and defaults to en-US
     isAlphanumeric(str: string, locale?: AlphanumericLocale): boolean;
 
     // check if the string contains ASCII chars only.
@@ -91,6 +94,11 @@ declare namespace ValidatorJS {
     // check if the string contains any half-width chars.
     isHalfWidth(str: string): boolean;
 
+    // check if the string is a hash of type algorithm.
+    // Algorithm is one of ['md4', 'md5', 'sha1', 'sha256', 'sha384', 'sha512', 'ripemd128', 'ripemd160', 'tiger128',
+    // 'tiger160', 'tiger192', 'crc32', 'crc32b']
+    isHash(str: string, algorithm: HashAlgorithm): boolean;
+
     // check if the string is a hexadecimal color.
     isHexColor(str: string): boolean;
 
@@ -140,11 +148,11 @@ declare namespace ValidatorJS {
     isMD5(str: string): boolean;
 
     // check if the string is a mobile phone number, (locale is one of
-    // ['ar-DZ', 'ar-SA', 'ar-SY', 'cs-CZ', 'de-DE', 'da-DK', 'el-GR', 'en-AU', 'en-GB', 'en-HK',
-    // 'en-IN', 'en-KE', 'en-NG', 'en-NZ', 'en-UG', 'en-RW', 'en-TZ', 'en-PK', 'en-US', 'en-CA',
-    // 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fr-FR', 'he-IL', 'hu-HU', 'id-ID', 'it-IT',
-    // 'ja-JP', 'ko-KR', lt-LT', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL', 'pt-PT', 'ro-RO', 'ru-RU',
-    // 'sr-RS', 'tr-TR', 'vi-VN', 'zh-CN', 'zh-HK', 'zh-TW']).
+    // ['ar-AE', ar-DZ', 'ar-EG', 'ar-JO', 'ar-SA', 'ar-SY', 'cs-CZ', 'de-DE', 'da-DK', 'el-GR',
+    // 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-KE', 'en-NG', 'en-NZ', 'en-UG', 'en-RW', 'en-TZ',
+    // 'en-PK', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fr-FR', 'he-IL',
+    // 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'ko-KR', lt-LT', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL',
+    // 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'tr-TR', 'vi-VN', 'zh-CN', 'zh-HK', 'zh-TW']).
     isMobilePhone(str: string, locale: MobilePhoneLocale): boolean;
 
     // check if the string is a valid hex-encoded representation of a MongoDB ObjectId
@@ -267,6 +275,9 @@ declare namespace ValidatorJS {
     allow_negative_sign_placeholder?: boolean;
     thousands_separator?: string;
     decimal_separator?: string;
+    allow_decimal?: boolean;
+    require_decimal?: boolean;
+    digits_after_decimal?: number[];
     allow_space_after_digits?: boolean;
   }
 
@@ -451,6 +462,11 @@ declare module "validator/lib/isHalfWidth" {
   export = isHalfWidth;
 }
 
+declare module "validator/lib/isHash" {
+  const isHash: typeof validator.isHash;
+  export = isHash;
+}
+
 declare module "validator/lib/isHexColor" {
   const isHexColor: typeof validator.isHexColor;
   export = isHexColor;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 2be484cf0a..bf3d74cb78 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -28,6 +28,7 @@ import isFQDNFunc = require('validator/lib/isFQDN');
 import isFloatFunc = require('validator/lib/isFloat');
 import isFullWidthFunc = require('validator/lib/isFullWidth');
 import isHalfWidthFunc = require('validator/lib/isHalfWidth');
+import isHashFunc = require('validator/lib/isHash');
 import isHexColorFunc = require('validator/lib/isHexColor');
 import isHexadecimalFunc = require('validator/lib/isHexadecimal');
 import isIPFunc = require('validator/lib/isIP');
@@ -138,6 +139,9 @@ import whitelistFunc = require('validator/lib/whitelist');
   let _isHalfWidth = validator.isHalfWidth;
   _isHalfWidth = isHalfWidthFunc;
 
+  let _isHash = validator.isHash;
+  _isHash = isHashFunc;
+
   let _isHexColor = validator.isHexColor;
   _isHexColor = isHexColorFunc;
 
@@ -310,6 +314,7 @@ let any: any;
   result = validator.isAlpha('sample', 'es-ES');
   result = validator.isAlpha('sample', 'fr-FR');
   result = validator.isAlpha('sample', 'hu-HU');
+  result = validator.isAlpha('sample', 'it-IT');
   result = validator.isAlpha('sample', 'nb-NO');
   result = validator.isAlpha('sample', 'nl-NL');
   result = validator.isAlpha('sample', 'nn-NO');
@@ -319,6 +324,7 @@ let any: any;
   result = validator.isAlpha('sample', 'ru-RU');
   result = validator.isAlpha('sample', 'sr-RS');
   result = validator.isAlpha('sample', 'sr-RS@latin');
+  result = validator.isAlpha('sample', 'sv-SE');
   result = validator.isAlpha('sample', 'tr-TR');
   result = validator.isAlpha('sample', 'uk-UA');
 
@@ -354,6 +360,7 @@ let any: any;
   result = validator.isAlphanumeric('sample', 'es-ES');
   result = validator.isAlphanumeric('sample', 'fr-FR');
   result = validator.isAlphanumeric('sample', 'hu-HU');
+  result = validator.isAlphanumeric('sample', 'it-IT');
   result = validator.isAlphanumeric('sample', 'nb-NO');
   result = validator.isAlphanumeric('sample', 'nl-NL');
   result = validator.isAlphanumeric('sample', 'nn-NO');
@@ -363,6 +370,7 @@ let any: any;
   result = validator.isAlphanumeric('sample', 'ru-RU');
   result = validator.isAlphanumeric('sample', 'sr-RS');
   result = validator.isAlphanumeric('sample', 'sr-RS@latin');
+  result = validator.isAlphanumeric('sample', 'sv-SE');
   result = validator.isAlphanumeric('sample', 'tr-TR');
   result = validator.isAlphanumeric('sample', 'uk-UA');
 
@@ -408,6 +416,20 @@ let any: any;
 
   result = validator.isHalfWidth('sample');
 
+  result = validator.isHash('sample', 'md4');
+  result = validator.isHash('sample', 'md5');
+  result = validator.isHash('sample', 'sha1');
+  result = validator.isHash('sample', 'sha256');
+  result = validator.isHash('sample', 'sha384');
+  result = validator.isHash('sample', 'sha512');
+  result = validator.isHash('sample', 'ripemd128');
+  result = validator.isHash('sample', 'ripemd160');
+  result = validator.isHash('sample', 'tiger128');
+  result = validator.isHash('sample', 'tiger160');
+  result = validator.isHash('sample', 'tiger192');
+  result = validator.isHash('sample', 'crc32');
+  result = validator.isHash('sample', 'crc32b');
+
   result = validator.isHexColor('sample');
 
   result = validator.isHexadecimal('sample');
@@ -445,7 +467,10 @@ let any: any;
 
   result = validator.isMD5('sample');
 
+  result = validator.isMobilePhone('sample', 'ar-AE');
   result = validator.isMobilePhone('sample', 'ar-DZ');
+  result = validator.isMobilePhone('sample', 'ar-EG');
+  result = validator.isMobilePhone('sample', 'ar-JO');
   result = validator.isMobilePhone('sample', 'ar-SA');
   result = validator.isMobilePhone('sample', 'ar-SY');
   result = validator.isMobilePhone('sample', 'cs-CZ');
@@ -486,6 +511,7 @@ let any: any;
   result = validator.isMobilePhone('sample', 'ro-RO');
   result = validator.isMobilePhone('sample', 'ru-RU');
   result = validator.isMobilePhone('sample', 'sr-RS');
+  result = validator.isMobilePhone('sample', 'sk-SK');
   result = validator.isMobilePhone('sample', 'tr-TR');
   result = validator.isMobilePhone('sample', 'vi-VN');
   result = validator.isMobilePhone('sample', 'zh-CN');

From 0b926af02dc124f610d5ff592ad47aaec1320eaa Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 22:11:22 +0900
Subject: [PATCH 161/388] validator (v9.0): add isPort(), some options, and
 locales

Added option for isFloat():
  - locale

Added options for isDecimal():
  - locale
  - force_decimal
  - decimal_digits

Added locales:
  - uk-UA (https://github.com/chriso/validator.js/pull/731)
---
 types/validator/index.d.ts         | 27 +++++++++++++++++++++++----
 types/validator/validator-tests.ts |  9 +++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index 6588570a1a..c4dd7a59c3 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for validator.js v8.2
+// Type definitions for validator.js v9.0
 // Project: https://github.com/chriso/validator.js
 // Definitions by: tgfjt <https://github.com/tgfjt>
 //                 Ilya Mochalov <https://github.com/chrootsu>
@@ -12,7 +12,9 @@
 declare namespace ValidatorJS {
   type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
   type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
-  type MobilePhoneLocale = "ar-AE" | "ar-DZ" | "ar-EG" | "ar-JO" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sk-SK" | "sr-RS" | "tr-TR" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
+  type DecimalLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
+  type FloatLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
+  type MobilePhoneLocale = "ar-AE" | "ar-DZ" | "ar-EG" | "ar-JO" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sk-SK" | "sr-RS" | "tr-TR" | "uk-UA" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
   type PostalCodeLocale = "AT" | "AU" | "BE" | "CA" | "CH" | "CZ" | "DE" | "DK" | "DZ" | "ES" | "FI" | "FR" | "GB" | "GR" | "IL" | "IN" | "IS" | "IT" | "JP" | "KE" | "LI" | "MX" | "NL" | "NO" | "PL" | "PT" | "RO" | "RU" | "SA" | "SE" | "TW" | "US" | "ZA" | "ZM" | "any"
   type HashAlgorithm = "md4" | "md5" | "sha1" | "sha256" | "sha384" | "sha512" | "ripemd128" | "ripemd160" | "tiger128" | "tiger160" | "tiger192" | "crc32" | "crc32b";
 
@@ -71,7 +73,7 @@ declare namespace ValidatorJS {
     isDataURI(str: string): boolean;
 
     // check if the string represents a decimal number, such as 0.1, .3, 1.1, 1.00003, 4.0, etc.
-    isDecimal(str: string): boolean;
+    isDecimal(str: string, options?: IsDecimalOptions): boolean;
 
     // check if the string is a number that's divisible by another.
     isDivisibleBy(str: string, number: number): boolean;
@@ -152,7 +154,8 @@ declare namespace ValidatorJS {
     // 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-KE', 'en-NG', 'en-NZ', 'en-UG', 'en-RW', 'en-TZ',
     // 'en-PK', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fr-FR', 'he-IL',
     // 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'ko-KR', lt-LT', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL',
-    // 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'tr-TR', 'vi-VN', 'zh-CN', 'zh-HK', 'zh-TW']).
+    // 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'tr-TR', 'uk-UA', 'vi-VN', 'zh-CN', 'zh-HK',
+    // 'zh-TW']).
     isMobilePhone(str: string, locale: MobilePhoneLocale): boolean;
 
     // check if the string is a valid hex-encoded representation of a MongoDB ObjectId
@@ -168,6 +171,9 @@ declare namespace ValidatorJS {
     // check if the string contains only numbers.
     isNumeric(str: string): boolean;
 
+    // check if the string is a valid port number.
+    isPort(str: string): boolean;
+
     // check if the string is a postal code, (locale is one of
     // [ 'AT', 'AU', 'BE', 'CA', 'CH', 'CZ', 'DE', 'DK', 'DZ', 'ES', 'FI', 'FR', 'GB', 'GR', 'IL',
     // 'IN', 'IS', 'IT', 'JP', 'KE', 'LI', 'MX', 'NL', 'NO', 'PL', 'PT', 'RO', 'RU', 'SA', 'SE',
@@ -281,6 +287,13 @@ declare namespace ValidatorJS {
     allow_space_after_digits?: boolean;
   }
 
+  // options for isDecimal
+  interface IsDecimalOptions {
+    force_decimal?: boolean;
+    decimal_digits?: string;
+    locale?: DecimalLocale;
+  }
+
   // options for isEmail
   interface IsEmailOptions {
     allow_display_name?: boolean;
@@ -299,6 +312,7 @@ declare namespace ValidatorJS {
   interface IsFloatOptions {
     min?: number;
     max?: number;
+    locale?: FloatLocale;
   }
 
   // options for IsInt
@@ -572,6 +586,11 @@ declare module "validator/lib/isNumeric" {
   export = isNumeric;
 }
 
+declare module "validator/lib/isPort" {
+  const isPort: typeof validator.isPort;
+  export = isPort;
+}
+
 declare module "validator/lib/isSurrogatePair" {
   const isSurrogatePair: typeof validator.isSurrogatePair;
   export = isSurrogatePair;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index bf3d74cb78..02d0510be2 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -49,6 +49,7 @@ import isMongoIdFunc = require('validator/lib/isMongoId');
 import isMultibyteFunc = require('validator/lib/isMultibyte');
 import isNullFunc = require('validator/lib/isNull');
 import isNumericFunc = require('validator/lib/isNumeric');
+import isPortFunc = require('validator/lib/isPort');
 import isPostalCodeFunc = require('validator/lib/isPostalCode');
 import isSurrogatePairFunc = require('validator/lib/isSurrogatePair');
 import isURLFunc = require('validator/lib/isURL');
@@ -202,6 +203,9 @@ import whitelistFunc = require('validator/lib/whitelist');
   let _isNumeric = validator.isNumeric;
   _isNumeric = isNumericFunc;
 
+  let _isPort = validator.isPort;
+  _isPort = isPortFunc;
+
   let _isPostalCode = validator.isPostalCode;
   _isPostalCode = isPostalCodeFunc;
 
@@ -396,7 +400,9 @@ let any: any;
 
   result = validator.isDataURI('sample');
 
+  let isDecimalOptions: ValidatorJS.IsDecimalOptions;
   result = validator.isDecimal('sample');
+  result = validator.isDecimal('sample', isDecimalOptions);
 
   result = validator.isDivisibleBy('sample', 2);
 
@@ -513,6 +519,7 @@ let any: any;
   result = validator.isMobilePhone('sample', 'sr-RS');
   result = validator.isMobilePhone('sample', 'sk-SK');
   result = validator.isMobilePhone('sample', 'tr-TR');
+  result = validator.isMobilePhone('sample', 'uk-UA');
   result = validator.isMobilePhone('sample', 'vi-VN');
   result = validator.isMobilePhone('sample', 'zh-CN');
   result = validator.isMobilePhone('sample', 'zh-HK');
@@ -527,6 +534,8 @@ let any: any;
 
   result = validator.isNumeric('sample');
 
+  result = validator.isPort('sample');
+
   result = validator.isPostalCode('sample', 'AT');
   result = validator.isPostalCode('sample', 'AU');
   result = validator.isPostalCode('sample', 'BE');

From 54ee80024f2a04cd56c82601c25e88f77c7f4823 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 22:21:59 +0900
Subject: [PATCH 162/388] validator (v9.1): add isISO31661Alpha2() and some
 locales

Added locales are:
  - fo-FO, kl-GL (https://github.com/chriso/validator.js/pull/735)
---
 types/validator/index.d.ts         | 21 +++++++++++++++------
 types/validator/validator-tests.ts |  8 ++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index c4dd7a59c3..4b06aa9bf8 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for validator.js v9.0
+// Type definitions for validator.js v9.1
 // Project: https://github.com/chriso/validator.js
 // Definitions by: tgfjt <https://github.com/tgfjt>
 //                 Ilya Mochalov <https://github.com/chrootsu>
@@ -14,7 +14,7 @@ declare namespace ValidatorJS {
   type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
   type DecimalLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
   type FloatLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
-  type MobilePhoneLocale = "ar-AE" | "ar-DZ" | "ar-EG" | "ar-JO" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sk-SK" | "sr-RS" | "tr-TR" | "uk-UA" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
+  type MobilePhoneLocale = "ar-AE" | "ar-DZ" | "ar-EG" | "ar-JO" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fo-FO" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "kl-GL" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sk-SK" | "sr-RS" | "tr-TR" | "uk-UA" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
   type PostalCodeLocale = "AT" | "AU" | "BE" | "CA" | "CH" | "CZ" | "DE" | "DK" | "DZ" | "ES" | "FI" | "FR" | "GB" | "GR" | "IL" | "IN" | "IS" | "IT" | "JP" | "KE" | "LI" | "MX" | "NL" | "NO" | "PL" | "PT" | "RO" | "RU" | "SA" | "SE" | "TW" | "US" | "ZA" | "ZM" | "any"
   type HashAlgorithm = "md4" | "md5" | "sha1" | "sha256" | "sha384" | "sha512" | "ripemd128" | "ripemd160" | "tiger128" | "tiger160" | "tiger192" | "crc32" | "crc32b";
 
@@ -120,6 +120,10 @@ declare namespace ValidatorJS {
     // check if the string is a valid ISO 8601 (https://en.wikipedia.org/wiki/ISO_8601) date.
     isISO8601(str: string): boolean;
 
+    // check if the string is a valid ISO 3166-1 alpha-2 (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) officially assigned
+    // country code.
+    isISO31661Alpha2(str: string): boolean;
+
     // check if the string is a ISRC (https://en.wikipedia.org/wiki/International_Standard_Recording_Code).
     isISRC(str: string): boolean;
 
@@ -152,10 +156,10 @@ declare namespace ValidatorJS {
     // check if the string is a mobile phone number, (locale is one of
     // ['ar-AE', ar-DZ', 'ar-EG', 'ar-JO', 'ar-SA', 'ar-SY', 'cs-CZ', 'de-DE', 'da-DK', 'el-GR',
     // 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-KE', 'en-NG', 'en-NZ', 'en-UG', 'en-RW', 'en-TZ',
-    // 'en-PK', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fr-FR', 'he-IL',
-    // 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'ko-KR', lt-LT', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL',
-    // 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'tr-TR', 'uk-UA', 'vi-VN', 'zh-CN', 'zh-HK',
-    // 'zh-TW']).
+    // 'en-PK', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fo-FO', 'fr-FR',
+    // 'he-IL', 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'kl-GL', 'ko-KR', lt-LT', 'ms-MY', 'nb-NO',
+    // 'nn-NO', 'pl-PL', 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'tr-TR', 'uk-UA', 'vi-VN',
+    // 'zh-CN', 'zh-HK', 'zh-TW']).
     isMobilePhone(str: string, locale: MobilePhoneLocale): boolean;
 
     // check if the string is a valid hex-encoded representation of a MongoDB ObjectId
@@ -511,6 +515,11 @@ declare module "validator/lib/isISO8601" {
   export = isISO8601;
 }
 
+declare module "validator/lib/isISO31661Alpha2" {
+  const isISO31661Alpha2: typeof validator.isISO31661Alpha2;
+  export = isISO31661Alpha2;
+}
+
 declare module "validator/lib/isISRC" {
   const isISRC: typeof validator.isISRC;
   export = isISRC;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 02d0510be2..bcc7418b6f 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -35,6 +35,7 @@ import isIPFunc = require('validator/lib/isIP');
 import isISBNFunc = require('validator/lib/isISBN');
 import isISINFunc = require('validator/lib/isISIN');
 import isISO8601Func = require('validator/lib/isISO8601');
+import isISO31661Alpha2Func = require('validator/lib/isISO31661Alpha2');
 import isISRCFunc = require('validator/lib/isISRC');
 import isInFunc = require('validator/lib/isIn');
 import isIntFunc = require('validator/lib/isInt');
@@ -161,6 +162,9 @@ import whitelistFunc = require('validator/lib/whitelist');
   let _isISO8601 = validator.isISO8601;
   _isISO8601 = isISO8601Func;
 
+  let _isISO31661Alpha2 = validator.isISO31661Alpha2;
+  _isISO31661Alpha2 = isISO31661Alpha2Func;
+
   let _isISRC = validator.isISRC;
   _isISRC = isISRCFunc;
 
@@ -450,6 +454,8 @@ let any: any;
 
   result = validator.isISO8601('sample');
 
+  result = validator.isISO31661Alpha2('sample');
+
   result = validator.isISRC('sample');
 
   result = validator.isIn('sample', []);
@@ -501,12 +507,14 @@ let any: any;
   result = validator.isMobilePhone('sample', 'es-ES');
   result = validator.isMobilePhone('sample', 'fa-IR');
   result = validator.isMobilePhone('sample', 'fi-FI');
+  result = validator.isMobilePhone('sample', 'fo-FO');
   result = validator.isMobilePhone('sample', 'fr-FR');
   result = validator.isMobilePhone('sample', 'he-IL');
   result = validator.isMobilePhone('sample', 'hu-HU');
   result = validator.isMobilePhone('sample', 'id-ID');
   result = validator.isMobilePhone('sample', 'it-IT');
   result = validator.isMobilePhone('sample', 'ja-JP');
+  result = validator.isMobilePhone('sample', 'kl-GL');
   result = validator.isMobilePhone('sample', 'ko-KR');
   result = validator.isMobilePhone('sample', 'lt-LT');
   result = validator.isMobilePhone('sample', 'ms-MY');

From 282306be55de77880feb515f56185b5ed88affb9 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 22:33:42 +0900
Subject: [PATCH 163/388] validator (v9.2): add isMimeType() and locales (el-GR
 and en-SG)

---
 types/validator/index.d.ts         | 38 ++++++++++++++++++------------
 types/validator/validator-tests.ts |  9 +++++++
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index 4b06aa9bf8..5976ce7982 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for validator.js v9.1
+// Type definitions for validator.js v9.2
 // Project: https://github.com/chriso/validator.js
 // Definitions by: tgfjt <https://github.com/tgfjt>
 //                 Ilya Mochalov <https://github.com/chrootsu>
@@ -10,11 +10,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ValidatorJS {
-  type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
-  type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
+  type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
+  type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
   type DecimalLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
   type FloatLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
-  type MobilePhoneLocale = "ar-AE" | "ar-DZ" | "ar-EG" | "ar-JO" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fo-FO" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "kl-GL" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sk-SK" | "sr-RS" | "tr-TR" | "uk-UA" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
+  type MobilePhoneLocale = "ar-AE" | "ar-DZ" | "ar-EG" | "ar-JO" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-SG" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fo-FO" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "kl-GL" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sk-SK" | "sr-RS" | "tr-TR" | "uk-UA" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
   type PostalCodeLocale = "AT" | "AU" | "BE" | "CA" | "CH" | "CZ" | "DE" | "DK" | "DZ" | "ES" | "FI" | "FR" | "GB" | "GR" | "IL" | "IN" | "IS" | "IT" | "JP" | "KE" | "LI" | "MX" | "NL" | "NO" | "PL" | "PT" | "RO" | "RU" | "SA" | "SE" | "TW" | "US" | "ZA" | "ZM" | "any"
   type HashAlgorithm = "md4" | "md5" | "sha1" | "sha256" | "sha384" | "sha512" | "ripemd128" | "ripemd160" | "tiger128" | "tiger160" | "tiger192" | "crc32" | "crc32b";
 
@@ -35,16 +35,16 @@ declare namespace ValidatorJS {
 
     // check if the string contains only letters (a-zA-Z). Locale is one of ['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG',
     // 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE',
-    // 'cs-CZ', 'da-DK', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR',
-    // 'hu-HU', 'it-IT' 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'sv-SE',
-    // 'tr-TR', 'uk-UA']) and defaults to en-US
+    // 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES',
+    // 'fr-FR', 'hu-HU', 'it-IT' 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin',
+    // 'sv-SE', 'tr-TR', 'uk-UA']) and defaults to en-US
     isAlpha(str: string, locale?: AlphaLocale): boolean;
 
     // check if the string contains only letters and numbers. Locale is one of ['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG',
     // 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE',
-    // 'cs-CZ', 'da-DK', 'de-DE', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES', 'fr-FR',
-    // 'hu-HU', 'it-IT', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin', 'sv-SE',
-    // 'tr-TR', 'uk-UA']) and defaults to en-US
+    // 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES',
+    // 'fr-FR', 'hu-HU', 'it-IT', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin',
+    // 'sv-SE', 'tr-TR', 'uk-UA']) and defaults to en-US
     isAlphanumeric(str: string, locale?: AlphanumericLocale): boolean;
 
     // check if the string contains ASCII chars only.
@@ -153,13 +153,16 @@ declare namespace ValidatorJS {
     // check if the string is a MD5 hash.
     isMD5(str: string): boolean;
 
+    // check if the string matches to a valid MIME type (https://en.wikipedia.org/wiki/Media_type) format
+    isMimeType(str: string): boolean;
+
     // check if the string is a mobile phone number, (locale is one of
     // ['ar-AE', ar-DZ', 'ar-EG', 'ar-JO', 'ar-SA', 'ar-SY', 'cs-CZ', 'de-DE', 'da-DK', 'el-GR',
-    // 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-KE', 'en-NG', 'en-NZ', 'en-UG', 'en-RW', 'en-TZ',
-    // 'en-PK', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fo-FO', 'fr-FR',
-    // 'he-IL', 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'kl-GL', 'ko-KR', lt-LT', 'ms-MY', 'nb-NO',
-    // 'nn-NO', 'pl-PL', 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'tr-TR', 'uk-UA', 'vi-VN',
-    // 'zh-CN', 'zh-HK', 'zh-TW']).
+    // 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-KE', 'en-NG', 'en-NZ', 'en-UG', 'en-RW', 'en-SG',
+    // 'en-TZ', 'en-PK', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fo-FO',
+    // 'fr-FR', 'he-IL', 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'kl-GL', 'ko-KR', lt-LT', 'ms-MY',
+    // 'nb-NO', 'nn-NO', 'pl-PL', 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'tr-TR', 'uk-UA',
+    // 'vi-VN', 'zh-CN', 'zh-HK', 'zh-TW']).
     isMobilePhone(str: string, locale: MobilePhoneLocale): boolean;
 
     // check if the string is a valid hex-encoded representation of a MongoDB ObjectId
@@ -565,6 +568,11 @@ declare module "validator/lib/isMD5" {
   export = isMD5;
 }
 
+declare module "validator/lib/isMimeType" {
+  const isMimeType: typeof validator.isMimeType;
+  export = isMimeType;
+}
+
 declare module "validator/lib/isMobilePhone" {
   const isMobilePhone: typeof validator.isMobilePhone;
   export = isMobilePhone;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index bcc7418b6f..4709453e14 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -45,6 +45,7 @@ import isLengthFunc = require('validator/lib/isLength');
 import isLowercaseFunc = require('validator/lib/isLowercase');
 import isMACAddressFunc = require('validator/lib/isMACAddress');
 import isMD5Func = require('validator/lib/isMD5');
+import isMimeTypeFunc = require('validator/lib/isMimeType');
 import isMobilePhoneFunc = require('validator/lib/isMobilePhone');
 import isMongoIdFunc = require('validator/lib/isMongoId');
 import isMultibyteFunc = require('validator/lib/isMultibyte');
@@ -192,6 +193,9 @@ import whitelistFunc = require('validator/lib/whitelist');
   let _isMD5 = validator.isMD5;
   _isMD5 = isMD5Func;
 
+  let _isMimeType = validator.isMimeType;
+  _isMimeType = isMimeTypeFunc;
+
   let _isMobilePhone = validator.isMobilePhone;
   _isMobilePhone = isMobilePhoneFunc;
 
@@ -311,6 +315,7 @@ let any: any;
   result = validator.isAlpha('sample', 'cs-CZ');
   result = validator.isAlpha('sample', 'da-DK');
   result = validator.isAlpha('sample', 'de-DE');
+  result = validator.isAlpha('sample', 'el-GR');
   result = validator.isAlpha('sample', 'en-AU');
   result = validator.isAlpha('sample', 'en-GB');
   result = validator.isAlpha('sample', 'en-HK');
@@ -357,6 +362,7 @@ let any: any;
   result = validator.isAlphanumeric('sample', 'cs-CZ');
   result = validator.isAlphanumeric('sample', 'da-DK');
   result = validator.isAlphanumeric('sample', 'de-DE');
+  result = validator.isAlphanumeric('sample', 'el-GR');
   result = validator.isAlphanumeric('sample', 'en-AU');
   result = validator.isAlphanumeric('sample', 'en-GB');
   result = validator.isAlphanumeric('sample', 'en-HK');
@@ -479,6 +485,8 @@ let any: any;
 
   result = validator.isMD5('sample');
 
+  result = validator.isMimeType('sample');
+
   result = validator.isMobilePhone('sample', 'ar-AE');
   result = validator.isMobilePhone('sample', 'ar-DZ');
   result = validator.isMobilePhone('sample', 'ar-EG');
@@ -498,6 +506,7 @@ let any: any;
   result = validator.isMobilePhone('sample', 'en-NZ');
   result = validator.isMobilePhone('sample', 'en-UG');
   result = validator.isMobilePhone('sample', 'en-RW');
+  result = validator.isMobilePhone('sample', 'en-SG');
   result = validator.isMobilePhone('sample', 'en-TZ');
   result = validator.isMobilePhone('sample', 'en-PK');
   result = validator.isMobilePhone('sample', 'en-US');

From a01ac1b2caf8a51d88ab2f8b05876429bb6656ae Mon Sep 17 00:00:00 2001
From: Matthew Bull <matt_wings@hotmail.com>
Date: Tue, 20 Feb 2018 13:39:48 +0000
Subject: [PATCH 164/388] Correctly type fluent returns for extension

---
 types/agenda/agenda-tests.ts |  7 ++++++-
 types/agenda/index.d.ts      | 18 +++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/types/agenda/agenda-tests.ts b/types/agenda/agenda-tests.ts
index 5cd18baf76..bbf945bd62 100644
--- a/types/agenda/agenda-tests.ts
+++ b/types/agenda/agenda-tests.ts
@@ -1,10 +1,10 @@
 import Agenda = require("agenda");
+import { Db, Server } from "mongodb";
 
 var mongoConnectionString = "mongodb://127.0.0.1/agenda";
 
 var agenda = new Agenda({ db: { address: mongoConnectionString } });
 
-
 agenda.define('delete old users', (job, done) => {
 
 });
@@ -102,4 +102,9 @@ job.remove(function(err) {
     if (!err) console.log("Successfully removed job from collection");
 })
 
+class ExtendedAgenda extends Agenda {
+    async start() {  }
+}
 
+const extendedAgenda: ExtendedAgenda = new ExtendedAgenda()
+    .mongo(new Db('some-database', new Server('host.name', 0)))
diff --git a/types/agenda/index.d.ts b/types/agenda/index.d.ts
index 426b187d7c..12b0b76c38 100644
--- a/types/agenda/index.d.ts
+++ b/types/agenda/index.d.ts
@@ -31,57 +31,57 @@ declare class Agenda extends EventEmitter {
     /**
      * Connect to the specified MongoDB server and database.
      */
-    database(url: string, collection?: string, options?: any, cb?: ResultCallback<Collection>): Agenda;
+    database(url: string, collection?: string, options?: any, cb?: ResultCallback<Collection>): this;
 
     /**
      * Initialize agenda with an existing MongoDB connection.
      */
-    mongo(db: Db, collection?: string, cb?: ResultCallback<Collection>): Agenda;
+    mongo(db: Db, collection?: string, cb?: ResultCallback<Collection>): this;
 
     /**
      * Sets the agenda name.
      */
-    name(value: string): Agenda;
+    name(value: string): this;
 
     /**
      * Sets the interval with which the queue is checked. A number in milliseconds or a frequency string.
      */
-    processEvery(interval: string | number): Agenda;
+    processEvery(interval: string | number): this;
 
     /**
      * Takes a number which specifies the max number of jobs that can be running at any given moment. By default it
      * is 20.
      * @param value The value to set.
      */
-    maxConcurrency(value: number): Agenda;
+    maxConcurrency(value: number): this;
 
     /**
      * Takes a number which specifies the default number of a specific job that can be running at any given moment.
      * By default it is 5.
      * @param value The value to set.
      */
-    defaultConcurrency(value: number): Agenda;
+    defaultConcurrency(value: number): this;
 
     /**
      * Takes a number shich specifies the max number jobs that can be locked at any given moment. By default it is
      * 0 for no max.
      * @param value The value to set.
      */
-    lockLimit(value: number): Agenda;
+    lockLimit(value: number): this;
 
     /**
      * Takes a number which specifies the default number of a specific job that can be locked at any given moment.
      * By default it is 0 for no max.
      * @param value The value to set.
      */
-    defaultLockLimit(value: number): Agenda;
+    defaultLockLimit(value: number): this;
 
     /**
      * Takes a number which specifies the default lock lifetime in milliseconds. By default it is 10 minutes. This
      * can be overridden by specifying the lockLifetime option to a defined job.
      * @param value The value to set.
      */
-    defaultLockLifetime(value: number): Agenda;
+    defaultLockLifetime(value: number): this;
 
     /**
      * Returns an instance of a jobName with data. This does NOT save the job in the database. See below to learn

From d29b1a2fe175a2f778c80ed4f5f9025bd650aa2c Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 22:49:38 +0900
Subject: [PATCH 165/388] validator (v9.3): add a bunch of locales

Added locales are:
  - bg-BG (https://github.com/chriso/validator.js/pull/779)
  - sk-SK (https://github.com/chriso/validator.js/pull/763)
  - be-BY, kk-KZ (https://github.com/chriso/validator.js/pull/774)
  - th-TH (https://github.com/chriso/validator.js/pull/777)
---
 types/validator/index.d.ts         | 44 +++++++++++++++---------------
 types/validator/validator-tests.ts |  9 ++++++
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index 5976ce7982..1df66cf1d5 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for validator.js v9.2
+// Type definitions for validator.js v9.3
 // Project: https://github.com/chriso/validator.js
 // Definitions by: tgfjt <https://github.com/tgfjt>
 //                 Ilya Mochalov <https://github.com/chrootsu>
@@ -10,12 +10,12 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ValidatorJS {
-  type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
-  type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
-  type DecimalLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
-  type FloatLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
-  type MobilePhoneLocale = "ar-AE" | "ar-DZ" | "ar-EG" | "ar-JO" | "ar-SA" | "ar-SY" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-SG" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fo-FO" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "kl-GL" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sk-SK" | "sr-RS" | "tr-TR" | "uk-UA" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
-  type PostalCodeLocale = "AT" | "AU" | "BE" | "CA" | "CH" | "CZ" | "DE" | "DK" | "DZ" | "ES" | "FI" | "FR" | "GB" | "GR" | "IL" | "IN" | "IS" | "IT" | "JP" | "KE" | "LI" | "MX" | "NL" | "NO" | "PL" | "PT" | "RO" | "RU" | "SA" | "SE" | "TW" | "US" | "ZA" | "ZM" | "any"
+  type AlphaLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "bg-BG" | "cs-CZ" | "da-DK" | "de-DE" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sk-SK" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
+  type AlphanumericLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "bg-BG"| "cs-CZ" | "da-DK" | "de-DE" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sk-SK" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
+  type DecimalLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "bg-BG" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
+  type FloatLocale = "ar" | "ar-AE" | "ar-BH" | "ar-DZ" | "ar-EG" | "ar-IQ" | "ar-JO" | "ar-KW" | "ar-LB" | "ar-LY" | "ar-MA" | "ar-QA" | "ar-QM" | "ar-SA" | "ar-SD" | "ar-SY" | "ar-TN" | "ar-YE" | "bg-BG" | "cs-CZ" | "da-DK" | "de-DE" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-NZ" | "en-US" | "en-ZA" | "en-ZM" | "es-ES" | "fr-FR" | "hu-HU" | "it-IT" | "nb-NO" | "nl-NL" | "nn-NO" | "pl-PL" | "pt-BR" | "pt-PT" | "ru-RU" | "sr-RS" | "sr-RS@latin" | "sv-SE" | "tr-TR" | "uk-UA";
+  type MobilePhoneLocale = "ar-AE" | "ar-DZ" | "ar-EG" | "ar-JO" | "ar-SA" | "ar-SY" | "be-BY" | "bg-BG" | "cs-CZ" | "de-DE" | "da-DK" | "el-GR" | "en-AU" | "en-GB" | "en-HK" | "en-IN" | "en-KE" | "en-NG" | "en-NZ" | "en-UG" | "en-RW" | "en-SG" | "en-TZ" | "en-PK" | "en-US" | "en-CA" | "en-ZA" | "en-ZM" | "es-ES" | "fa-IR" | "fi-FI" | "fo-FO" | "fr-FR" | "he-IL" | "hu-HU" | "id-ID" | "it-IT" | "ja-JP" | "kk-KZ" | "kl-GL" | "ko-KR" | "lt-LT" | "ms-MY" | "nb-NO" | "nn-NO" | "pl-PL" | "pt-PT" | "ro-RO" | "ru-RU" | "sk-SK" | "sr-RS" | "th-TH" | "tr-TR" | "uk-UA" | "vi-VN" | "zh-CN" | "zh-HK" | "zh-TW" | "any";
+  type PostalCodeLocale = "AT" | "AU" | "BE" | "BG" | "CA" | "CH" | "CZ" | "DE" | "DK" | "DZ" | "ES" | "FI" | "FR" | "GB" | "GR" | "IL" | "IN" | "IS" | "IT" | "JP" | "KE" | "LI" | "MX" | "NL" | "NO" | "PL" | "PT" | "RO" | "RU" | "SA" | "SE" | "TW" | "US" | "ZA" | "ZM" | "any"
   type HashAlgorithm = "md4" | "md5" | "sha1" | "sha256" | "sha384" | "sha512" | "ripemd128" | "ripemd160" | "tiger128" | "tiger160" | "tiger192" | "crc32" | "crc32b";
 
   interface ValidatorStatic {
@@ -35,16 +35,16 @@ declare namespace ValidatorJS {
 
     // check if the string contains only letters (a-zA-Z). Locale is one of ['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG',
     // 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE',
-    // 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES',
-    // 'fr-FR', 'hu-HU', 'it-IT' 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin',
-    // 'sv-SE', 'tr-TR', 'uk-UA']) and defaults to en-US
+    // 'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM',
+    // 'es-ES', 'fr-FR', 'hu-HU', 'it-IT', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sk-SK', 'sr-RS',
+    // 'sr-RS@latin', 'sv-SE', 'tr-TR', 'uk-UA']) and defaults to en-US
     isAlpha(str: string, locale?: AlphaLocale): boolean;
 
     // check if the string contains only letters and numbers. Locale is one of ['ar', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG',
     // 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB', 'ar-LY', 'ar-MA', 'ar-QA', 'ar-QM', 'ar-SA', 'ar-SD', 'ar-SY', 'ar-TN', 'ar-YE',
-    // 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM', 'es-ES',
-    // 'fr-FR', 'hu-HU', 'it-IT', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sr-RS', 'sr-RS@latin',
-    // 'sv-SE', 'tr-TR', 'uk-UA']) and defaults to en-US
+    // 'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-NZ', 'en-US', 'en-ZA', 'en-ZM',
+    // 'es-ES', 'fr-FR', 'hu-HU', 'it-IT', 'nb-NO', 'nl-NL', 'nn-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sk-SK', 'sr-RS',
+    // 'sr-RS@latin', 'sv-SE', 'tr-TR', 'uk-UA']) and defaults to en-US
     isAlphanumeric(str: string, locale?: AlphanumericLocale): boolean;
 
     // check if the string contains ASCII chars only.
@@ -157,12 +157,12 @@ declare namespace ValidatorJS {
     isMimeType(str: string): boolean;
 
     // check if the string is a mobile phone number, (locale is one of
-    // ['ar-AE', ar-DZ', 'ar-EG', 'ar-JO', 'ar-SA', 'ar-SY', 'cs-CZ', 'de-DE', 'da-DK', 'el-GR',
-    // 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-KE', 'en-NG', 'en-NZ', 'en-UG', 'en-RW', 'en-SG',
-    // 'en-TZ', 'en-PK', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR', 'fi-FI', 'fo-FO',
-    // 'fr-FR', 'he-IL', 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'kl-GL', 'ko-KR', lt-LT', 'ms-MY',
-    // 'nb-NO', 'nn-NO', 'pl-PL', 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'tr-TR', 'uk-UA',
-    // 'vi-VN', 'zh-CN', 'zh-HK', 'zh-TW']).
+    // ['ar-AE', ar-DZ', 'ar-EG', 'ar-JO', 'ar-SA', 'ar-SY', 'be-BY', 'bg-BG', 'cs-CZ', 'de-DE',
+    // 'da-DK', 'el-GR', 'en-AU', 'en-GB', 'en-HK', 'en-IN', 'en-KE', 'en-NG', 'en-NZ', 'en-UG',
+    // 'en-RW', 'en-SG', 'en-TZ', 'en-PK', 'en-US', 'en-CA', 'en-ZA', 'en-ZM', 'es-ES', 'fa-IR',
+    // 'fi-FI', 'fo-FO', 'fr-FR', 'he-IL', 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'kk-KZ', 'kl-GL',
+    // 'ko-KR', 'lt-LT', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL', 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK',
+    // 'sr-RS', 'th-TH', 'tr-TR', 'uk-UA', 'vi-VN', 'zh-CN', 'zh-HK', 'zh-TW']).
     isMobilePhone(str: string, locale: MobilePhoneLocale): boolean;
 
     // check if the string is a valid hex-encoded representation of a MongoDB ObjectId
@@ -182,9 +182,9 @@ declare namespace ValidatorJS {
     isPort(str: string): boolean;
 
     // check if the string is a postal code, (locale is one of
-    // [ 'AT', 'AU', 'BE', 'CA', 'CH', 'CZ', 'DE', 'DK', 'DZ', 'ES', 'FI', 'FR', 'GB', 'GR', 'IL',
-    // 'IN', 'IS', 'IT', 'JP', 'KE', 'LI', 'MX', 'NL', 'NO', 'PL', 'PT', 'RO', 'RU', 'SA', 'SE',
-    // 'TW', 'US', 'ZA', 'ZM' ]) OR 'any'. If 'any' is used, function will check if any of the
+    // [ 'AT', 'AU', 'BE', 'BG', 'CA', 'CH', 'CZ', 'DE', 'DK', 'DZ', 'ES', 'FI', 'FR', 'GB', 'GR',
+    // 'IL', 'IN', 'IS', 'IT', 'JP', 'KE', 'LI', 'MX', 'NL', 'NO', 'PL', 'PT', 'RO', 'RU', 'SA',
+    // 'SE', 'TW', 'US', 'ZA', 'ZM' ]) OR 'any'. If 'any' is used, function will check if any of the
     // locales match).
     isPostalCode(str: string, locale: PostalCodeLocale): boolean;
 
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 4709453e14..49d864cb43 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -312,6 +312,7 @@ let any: any;
   result = validator.isAlpha('sample', 'ar-SY');
   result = validator.isAlpha('sample', 'ar-TN');
   result = validator.isAlpha('sample', 'ar-YE');
+  result = validator.isAlpha('sample', 'bg-BG');
   result = validator.isAlpha('sample', 'cs-CZ');
   result = validator.isAlpha('sample', 'da-DK');
   result = validator.isAlpha('sample', 'de-DE');
@@ -335,6 +336,7 @@ let any: any;
   result = validator.isAlpha('sample', 'pt-BR');
   result = validator.isAlpha('sample', 'pt-PT');
   result = validator.isAlpha('sample', 'ru-RU');
+  result = validator.isAlpha('sample', 'sk-SK');
   result = validator.isAlpha('sample', 'sr-RS');
   result = validator.isAlpha('sample', 'sr-RS@latin');
   result = validator.isAlpha('sample', 'sv-SE');
@@ -359,6 +361,7 @@ let any: any;
   result = validator.isAlphanumeric('sample', 'ar-SY');
   result = validator.isAlphanumeric('sample', 'ar-TN');
   result = validator.isAlphanumeric('sample', 'ar-YE');
+  result = validator.isAlphanumeric('sample', 'bg-BG');
   result = validator.isAlphanumeric('sample', 'cs-CZ');
   result = validator.isAlphanumeric('sample', 'da-DK');
   result = validator.isAlphanumeric('sample', 'de-DE');
@@ -382,6 +385,7 @@ let any: any;
   result = validator.isAlphanumeric('sample', 'pt-BR');
   result = validator.isAlphanumeric('sample', 'pt-PT');
   result = validator.isAlphanumeric('sample', 'ru-RU');
+  result = validator.isAlphanumeric('sample', 'sk-SK');
   result = validator.isAlphanumeric('sample', 'sr-RS');
   result = validator.isAlphanumeric('sample', 'sr-RS@latin');
   result = validator.isAlphanumeric('sample', 'sv-SE');
@@ -493,6 +497,8 @@ let any: any;
   result = validator.isMobilePhone('sample', 'ar-JO');
   result = validator.isMobilePhone('sample', 'ar-SA');
   result = validator.isMobilePhone('sample', 'ar-SY');
+  result = validator.isMobilePhone('sample', 'be-BY');
+  result = validator.isMobilePhone('sample', 'bg-BG');
   result = validator.isMobilePhone('sample', 'cs-CZ');
   result = validator.isMobilePhone('sample', 'de-DE');
   result = validator.isMobilePhone('sample', 'da-DK');
@@ -523,6 +529,7 @@ let any: any;
   result = validator.isMobilePhone('sample', 'id-ID');
   result = validator.isMobilePhone('sample', 'it-IT');
   result = validator.isMobilePhone('sample', 'ja-JP');
+  result = validator.isMobilePhone('sample', 'kk-KZ');
   result = validator.isMobilePhone('sample', 'kl-GL');
   result = validator.isMobilePhone('sample', 'ko-KR');
   result = validator.isMobilePhone('sample', 'lt-LT');
@@ -535,6 +542,7 @@ let any: any;
   result = validator.isMobilePhone('sample', 'ru-RU');
   result = validator.isMobilePhone('sample', 'sr-RS');
   result = validator.isMobilePhone('sample', 'sk-SK');
+  result = validator.isMobilePhone('sample', 'th-TH');
   result = validator.isMobilePhone('sample', 'tr-TR');
   result = validator.isMobilePhone('sample', 'uk-UA');
   result = validator.isMobilePhone('sample', 'vi-VN');
@@ -556,6 +564,7 @@ let any: any;
   result = validator.isPostalCode('sample', 'AT');
   result = validator.isPostalCode('sample', 'AU');
   result = validator.isPostalCode('sample', 'BE');
+  result = validator.isPostalCode('sample', 'BG');
   result = validator.isPostalCode('sample', 'CA');
   result = validator.isPostalCode('sample', 'CH');
   result = validator.isPostalCode('sample', 'CZ');

From f8af9626d7cab665dbc7a7693adee2fe58851719 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 22:56:58 +0900
Subject: [PATCH 166/388] validator (v9.4): add options for isMobilePhone()

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

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index 1df66cf1d5..ee3cf460de 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for validator.js v9.3
+// Type definitions for validator.js v9.4
 // Project: https://github.com/chriso/validator.js
 // Definitions by: tgfjt <https://github.com/tgfjt>
 //                 Ilya Mochalov <https://github.com/chrootsu>
@@ -163,7 +163,7 @@ declare namespace ValidatorJS {
     // 'fi-FI', 'fo-FO', 'fr-FR', 'he-IL', 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'kk-KZ', 'kl-GL',
     // 'ko-KR', 'lt-LT', 'ms-MY', 'nb-NO', 'nn-NO', 'pl-PL', 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK',
     // 'sr-RS', 'th-TH', 'tr-TR', 'uk-UA', 'vi-VN', 'zh-CN', 'zh-HK', 'zh-TW']).
-    isMobilePhone(str: string, locale: MobilePhoneLocale): boolean;
+    isMobilePhone(str: string, locale: MobilePhoneLocale, options?: IsMobilePhoneOptions): boolean;
 
     // check if the string is a valid hex-encoded representation of a MongoDB ObjectId
     // (http://docs.mongodb.org/manual/reference/object-id/).
@@ -337,6 +337,11 @@ declare namespace ValidatorJS {
     max?: number;
   }
 
+  // options for isMobilePhone
+  interface IsMobilePhoneOptions {
+    strictMode?: boolean;
+  }
+
   // options for isURL
   interface IsURLOptions {
     protocols?: string[];
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 49d864cb43..4172d80751 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -491,6 +491,8 @@ let any: any;
 
   result = validator.isMimeType('sample');
 
+  let isMobilePhoneOptions: ValidatorJS.IsMobilePhoneOptions;
+  result = validator.isMobilePhone('sample', 'any', isMobilePhoneOptions);
   result = validator.isMobilePhone('sample', 'ar-AE');
   result = validator.isMobilePhone('sample', 'ar-DZ');
   result = validator.isMobilePhone('sample', 'ar-EG');

From c7e42dc2301f79de2a97ab5c69f32735476c3a9d Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 23:02:49 +0900
Subject: [PATCH 167/388] validator: add a test for isAlphanumeric()

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

diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 4172d80751..8ee42c6572 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -343,6 +343,7 @@ let any: any;
   result = validator.isAlpha('sample', 'tr-TR');
   result = validator.isAlpha('sample', 'uk-UA');
 
+  result = validator.isAlphanumeric('sample');
   result = validator.isAlphanumeric('sample', 'ar');
   result = validator.isAlphanumeric('sample', 'ar-AE');
   result = validator.isAlphanumeric('sample', 'ar-BH');

From ed2827423c2bdaec1ab5625b273a8020410a9bdb Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 23:07:03 +0900
Subject: [PATCH 168/388] validator: add require_display_name option for
 isEmail()

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

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index ee3cf460de..e22386e343 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -304,6 +304,7 @@ declare namespace ValidatorJS {
   // options for isEmail
   interface IsEmailOptions {
     allow_display_name?: boolean;
+    require_display_name?: boolean;
     allow_utf8_local_part?: boolean;
     require_tld?: boolean;
   }

From dac0f9d0d15f58862fd374fada7ca0a12cccda72 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 23:09:10 +0900
Subject: [PATCH 169/388] validator: add a test for isEmpty()

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

diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 8ee42c6572..626f51671e 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -425,6 +425,8 @@ let any: any;
   result = validator.isEmail('sample');
   result = validator.isEmail('sample', isEmailOptions);
 
+  result = validator.isEmpty('sample');
+
   let isFQDNOptions: ValidatorJS.IsFQDNOptions;
   result = validator.isFQDN('sample');
   result = validator.isFQDN('sample', isFQDNOptions);

From 4553192408b0e12f1ef59b5a8ec4ff359c99c0e4 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 23:12:41 +0900
Subject: [PATCH 170/388] validator: add gt and lt option to isFloat()

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

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index e22386e343..228090f62c 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -320,6 +320,8 @@ declare namespace ValidatorJS {
   interface IsFloatOptions {
     min?: number;
     max?: number;
+    gt?: number;
+    lt?: number;
     locale?: FloatLocale;
   }
 

From 7e9f8baca4e307555ade863df0369e5c89cf6465 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 23:18:37 +0900
Subject: [PATCH 171/388] validator: add isISSN()

---
 types/validator/index.d.ts         | 14 ++++++++++++++
 types/validator/validator-tests.ts |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index 228090f62c..0806d34f2a 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -113,6 +113,9 @@ declare namespace ValidatorJS {
     // check if the string is an ISBN (version 10 or 13).
     isISBN(str: string, version?: number): boolean;
 
+    // check if the string is an ISSN (https://en.wikipedia.org/wiki/International_Standard_Serial_Number).
+    isISSN(str: string, options?: IsISSNOptions): boolean;
+
     // check if the string is an ISIN (https://en.wikipedia.org/wiki/International_Securities_Identification_Number)
     // (stock/security identifier).
     isISIN(str: string): boolean;
@@ -325,6 +328,12 @@ declare namespace ValidatorJS {
     locale?: FloatLocale;
   }
 
+  // options for isISSN
+  interface IsISSNOptions {
+    case_sensitive?: boolean;
+    require_hyphen?: boolean;
+  }
+
   // options for IsInt
   interface IsIntOptions {
     min?: number;
@@ -516,6 +525,11 @@ declare module "validator/lib/isISBN" {
   export = isISBN;
 }
 
+declare module "validator/lib/isISSN" {
+  const isISSN: typeof validator.isISSN;
+  export = isISSN;
+}
+
 declare module "validator/lib/isISIN" {
   const isISIN: typeof validator.isISIN;
   export = isISIN;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 626f51671e..0aaf7f1f10 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -33,6 +33,7 @@ import isHexColorFunc = require('validator/lib/isHexColor');
 import isHexadecimalFunc = require('validator/lib/isHexadecimal');
 import isIPFunc = require('validator/lib/isIP');
 import isISBNFunc = require('validator/lib/isISBN');
+import isISSNFunc = require('validator/lib/isISSN');
 import isISINFunc = require('validator/lib/isISIN');
 import isISO8601Func = require('validator/lib/isISO8601');
 import isISO31661Alpha2Func = require('validator/lib/isISO31661Alpha2');
@@ -157,6 +158,9 @@ import whitelistFunc = require('validator/lib/whitelist');
   let _isISBN = validator.isISBN;
   _isISBN = isISBNFunc;
 
+  let _isISSN = validator.isISSN;
+  _isISSN = isISSNFunc;
+
   let _isISIN = validator.isISIN;
   _isISIN = isISINFunc;
 
@@ -463,6 +467,10 @@ let any: any;
   result = validator.isISBN('sample');
   result = validator.isISBN('sample', 13);
 
+  let isISSNOptions: ValidatorJS.IsISSNOptions;
+  result = validator.isISSN('sample');
+  result = validator.isISSN('sample', isISSNOptions);
+
   result = validator.isISIN('sample');
 
   result = validator.isISO8601('sample');

From 4958f3ea59e6e09286d02ff62bd2abb0ab1900a0 Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 23:21:44 +0900
Subject: [PATCH 172/388] validator: remove isNull(), which was renamed to
 isEmpty()

---
 types/validator/index.d.ts         | 8 --------
 types/validator/validator-tests.ts | 6 ------
 2 files changed, 14 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index 0806d34f2a..204b032ba5 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -175,9 +175,6 @@ declare namespace ValidatorJS {
     // check if the string contains one or more multibyte chars.
     isMultibyte(str: string): boolean;
 
-    // check if the string is null.
-    isNull(str: string): boolean;
-
     // check if the string contains only numbers.
     isNumeric(str: string): boolean;
 
@@ -615,11 +612,6 @@ declare module "validator/lib/isMultibyte" {
   export = isMultibyte;
 }
 
-declare module "validator/lib/isNull" {
-  const isNull: typeof validator.isNull;
-  export = isNull;
-}
-
 declare module "validator/lib/isNumeric" {
   const isNumeric: typeof validator.isNumeric;
   export = isNumeric;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 0aaf7f1f10..c3d4327d84 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -50,7 +50,6 @@ import isMimeTypeFunc = require('validator/lib/isMimeType');
 import isMobilePhoneFunc = require('validator/lib/isMobilePhone');
 import isMongoIdFunc = require('validator/lib/isMongoId');
 import isMultibyteFunc = require('validator/lib/isMultibyte');
-import isNullFunc = require('validator/lib/isNull');
 import isNumericFunc = require('validator/lib/isNumeric');
 import isPortFunc = require('validator/lib/isPort');
 import isPostalCodeFunc = require('validator/lib/isPostalCode');
@@ -209,9 +208,6 @@ import whitelistFunc = require('validator/lib/whitelist');
   let _isMultibyte = validator.isMultibyte;
   _isMultibyte = isMultibyteFunc;
 
-  let _isNull = validator.isNull;
-  _isNull = isNullFunc;
-
   let _isNumeric = validator.isNumeric;
   _isNumeric = isNumericFunc;
 
@@ -568,8 +564,6 @@ let any: any;
 
   result = validator.isMultibyte('sample');
 
-  result = validator.isNull('sample');
-
   result = validator.isNumeric('sample');
 
   result = validator.isPort('sample');

From f27bed9d456267a323061645c81d34b7f49bb41c Mon Sep 17 00:00:00 2001
From: Naoto Yokoyama <builtinnya@gmail.com>
Date: Tue, 20 Feb 2018 23:34:48 +0900
Subject: [PATCH 173/388] validator: update options for normalizeEmail()

See: https://github.com/chriso/validator.js/pull/583
---
 types/validator/index.d.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index 204b032ba5..e91bd36ce2 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -367,9 +367,17 @@ declare namespace ValidatorJS {
 
   // options for normalizeEmail
   interface NormalizeEmailOptions {
-    lowercase?: boolean;
-    remove_dots?: boolean;
-    remove_extension?: boolean;
+    all_lowercase?: boolean;
+    gmail_lowercase?: boolean;
+    gmail_remove_dots?: boolean;
+    gmail_remove_subaddress?: boolean;
+    gmail_convert_googlemaildotcom?: boolean;
+    outlookdotcom_lowercase?: boolean;
+    outlookdotcom_remove_subaddress?: boolean;
+    yahoo_lowercase?: boolean;
+    yahoo_remove_subaddress?: boolean;
+    icloud_lowercase?: boolean;
+    icloud_remove_subaddress?: boolean;
   }
 }
 

From 7bfb5873fcdb7a5625e8baea12b51aa2564b557c Mon Sep 17 00:00:00 2001
From: Perceval Archimbaud <perceval@archimbaud.io>
Date: Tue, 20 Feb 2018 16:41:56 +0100
Subject: [PATCH 174/388] Update ParseObject interface by adding revert()
 method

---
 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 d186211983..260f3fb4a0 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -377,6 +377,7 @@ declare namespace Parse {
         previousAttributes(): any;
         relation(attr: string): Relation<this, Object>;
         remove(attr: string, item: any): any;
+        revert(): void;
         save(attrs?: { [key: string]: any } | null, options?: Object.SaveOptions): Promise<this>;
         save(key: string, value: any, options?: Object.SaveOptions): Promise<this>;
         save(attrs: object, options?: Object.SaveOptions): Promise<this>;

From 93802181103133e68bdb85eabb460c6104eea694 Mon Sep 17 00:00:00 2001
From: Perceval Archimbaud <perceval@archimbaud.io>
Date: Tue, 20 Feb 2018 17:22:09 +0100
Subject: [PATCH 175/388] Update test with revert

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

diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index 06ec062880..9f08c3530b 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -288,7 +288,13 @@ function test_user_acl_roles() {
     game.setACL(new Parse.ACL(Parse.User.current()));
     game.save().then((game: Game) => { });
     game.save(null, { useMasterKey: true });
-    game.save({ score: '10' }, { useMasterKey: true });
+    game.save({ score: '10' }, { useMasterKey: true }).then(function (game) {
+        // Update game then revert it to the last saved state.
+        game.set("score", '20');
+        game.revert();
+    }, function (error) {
+        // The save failed
+    });
 
     const groupACL = new Parse.ACL();
 

From 38a16c7ac7a23708e5bcb0b40239ccf08ac136bb Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Tue, 20 Feb 2018 08:34:40 -0800
Subject: [PATCH 176/388] bull: Remove duplicate getWaiting definition (#23715)

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

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 8a12db0fd7..a7a9ea350b 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -456,11 +456,6 @@ declare namespace Bull {
      */
     getFailed(start?: number, end?: number): Promise<Job[]>;
 
-    /**
-     * Returns a promise that will return an array with the waiting jobs between start and end.
-     */
-    getWaiting(start?: number, end?: number): Promise<Job[]>;
-
     /**
      * Returns JobInformation of repeatable jobs (ordered descending). Provide a start and/or an end
      * index to limit the number of results. Start defaults to 0, end to -1 and asc to false.

From 38c8148560c717b8270b65de8d5d49f79b4a15df Mon Sep 17 00:00:00 2001
From: Andrew Goodale <andrewgoodale@upserve.com>
Date: Tue, 20 Feb 2018 13:19:34 -0500
Subject: [PATCH 177/388] Add `onScrollToIndexFailed` prop for
 `VirtualizedList`

---
 types/react-native/index.d.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 656b1c2e0d..395ce9af45 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3909,6 +3909,17 @@ export interface VirtualizedListProperties<ItemT> extends ScrollViewProperties {
      */
     onRefresh?: (() => void) | null;
 
+    /**
+     * Used to handle failures when scrolling to an index that has not been measured yet.
+     * Recommended action is to either compute your own offset and `scrollTo` it, or scroll as far
+     * as possible and then try again after more items have been rendered.
+     */
+    onScrollToIndexFailed?: (info: {
+        index: number,
+        highestMeasuredFrameIndex: number,
+        averageItemLength: number
+    }) => void;
+
     /**
      * Called when the viewability of rows changes, as defined by the
      * `viewabilityConfig` prop.

From db733db724f96135eef250342aef3c592d71576a Mon Sep 17 00:00:00 2001
From: Andrew Goodale <andrewgoodale@upserve.com>
Date: Tue, 20 Feb 2018 13:26:41 -0500
Subject: [PATCH 178/388] Add HTMLDialogElement to globals for projects without
 DOM

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

diff --git a/types/react/global.d.ts b/types/react/global.d.ts
index 23af6dc7a3..2103069854 100644
--- a/types/react/global.d.ts
+++ b/types/react/global.d.ts
@@ -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 { }

From cc7eb445d2e30f5ff61764802327ca0b599109aa Mon Sep 17 00:00:00 2001
From: fhelwanger <fhelwanger@gmail.com>
Date: Tue, 20 Feb 2018 13:30:52 -0300
Subject: [PATCH 179/388] Update react-router-native types

* Fix AndroidBackButton children
* Add BackButton component
* Add initialEntries and initialIndex to NativeRouter
---
 types/react-router-native/index.d.ts          | 12 ++++++---
 .../react-router-native-tests.tsx             | 27 ++++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index 4a14dce8dc..7b299be3e9 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for React Router Native 4.0
+// Type definitions for React Router Native 4.2
 // Project: https://github.com/ReactTraining/react-router-native
 // Definitions by: Eduard Zintz <https://github.com/ezintz>
+//                 Fernando Helwanger <https://github.com/fhelwanger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -22,11 +23,12 @@ export {
 import * as React from 'react';
 import * as H from 'history';
 
-export interface AndroidBackButtonProps {
-  children: React.Component[];
+export interface BackButtonProps {
+  children?: React.ReactNode;
 }
 
-export class AndroidBackButton extends React.Component<AndroidBackButtonProps> {}
+export class BackButton extends React.Component<BackButtonProps> {}
+export class AndroidBackButton extends React.Component<BackButtonProps> {}
 
 export class DeepLinking extends React.Component {}
 
@@ -42,6 +44,8 @@ export class Link extends React.Component<LinkProps> {}
 export interface NativeRouterProps {
   getUserConfirmation?: Function;
   keyLength?: number;
+  initialEntries?: string[];
+  initialIndex?: number;
 }
 
 export class NativeRouter extends React.Component<NativeRouterProps> {}
diff --git a/types/react-router-native/react-router-native-tests.tsx b/types/react-router-native/react-router-native-tests.tsx
index db52c10299..2cbdfac1b2 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 } from 'react-router-native';
+import { NativeRouter as Router, Route, Link, AndroidBackButton, BackButton } from 'react-router-native';
 
 const Home: React.SFC = () => {
   return (
@@ -27,19 +27,22 @@ const About: React.SFC = () => {
 export default class App extends React.Component {
   render() {
     return (
-      <Router>
-        <View style={styles.container}>
-          <View style={styles.nav}>
-            <Link to="/" style={styles.navItem}>
-              <Text>Home</Text>
-            </Link>
-            <Link to="/about" style={styles.navItem}>
+      <Router initialEntries={['/']} initialIndex={0}>
+        <BackButton />
+        <AndroidBackButton>
+          <View style={styles.container}>
+            <View style={styles.nav}>
+              <Link to="/" style={styles.navItem}>
+                <Text>Home</Text>
+              </Link>
+              <Link to="/about" style={styles.navItem}>
                 <Text>About</Text>
-            </Link>
+              </Link>
+            </View>
+            <Route exact path="/" component={Home} />
+            <Route path="/about" component={About} />
           </View>
-          <Route exact path="/" component={Home}/>
-          <Route path="/about" component={About}/>
-        </View>
+        </AndroidBackButton>
       </Router>
     );
   }

From 39d94c080d6c3002fa78313a9ca55bbe42246010 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Tue, 20 Feb 2018 12:39:00 -0800
Subject: [PATCH 180/388] Make `import { fabric } from "fabric";` work (2)
 (#23787)

---
 types/fabric/fabric-impl.d.ts                 | 4428 +++++++++++++++++
 types/fabric/index.d.ts                       | 4427 +---------------
 types/fabric/test/import.ts                   |    2 +
 .../fabric/{fabric-tests.ts => test/index.ts} |    0
 types/fabric/tsconfig.json                    |    3 +-
 5 files changed, 4433 insertions(+), 4427 deletions(-)
 create mode 100644 types/fabric/fabric-impl.d.ts
 create mode 100644 types/fabric/test/import.ts
 rename types/fabric/{fabric-tests.ts => test/index.ts} (100%)

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
new file mode 100644
index 0000000000..f2570b9542
--- /dev/null
+++ b/types/fabric/fabric-impl.d.ts
@@ -0,0 +1,4428 @@
+// This module does not really exist.
+// This is just to get `export as namespace fabric;` to work and to be re-exportable from `index.d.ts`.
+
+export as namespace fabric;
+
+export const isLikelyNode: boolean;
+export const isTouchSupported: boolean;
+
+/////////////////////////////////////////////////////////////
+// farbic Functions
+/////////////////////////////////////////////////////////////
+
+export function createCanvasForNode(width: number, height: number): Canvas;
+
+// Parse
+// ----------------------------------------------------------
+/**
+ * Creates markup containing SVG referenced elements like patterns, gradients etc.
+ * @param canvas instance of fabric.Canvas
+ */
+export function createSVGRefElementsMarkup(canvas: StaticCanvas): string;
+/**
+ * Creates markup containing SVG font faces
+ * @param objects Array of fabric objects
+ */
+export function createSVGFontFacesMarkup(objects: Object[]): string;
+/**
+ * Takes string corresponding to an SVG document, and parses it into a set of fabric objects
+ * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
+ */
+export function loadSVGFromString(string: string, callback: (results: Object[], options: any) => void, reviver?: Function): void;
+/**
+ * Takes url corresponding to an SVG document, and parses it into a set of fabric objects.
+ * Note that SVG is fetched via XMLHttpRequest, so it needs to conform to SOP (Same Origin Policy)
+ * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
+ */
+export function loadSVGFromURL(url: string, callback: (results: Object[], options: any) => void, reviver?: Function): void;
+/**
+ * Returns CSS rules for a given SVG document
+ * @param doc SVG document to parse
+ */
+export function getCSSRules(doc: SVGElement): any;
+
+export function parseElements(elements: any[], callback: Function, options: any, reviver?: Function): void;
+/**
+ * Parses "points" attribute, returning an array of values
+ * @param points points attribute string
+ */
+export function parsePointsAttribute(points: string): any[];
+/**
+ * Parses "style" attribute, retuning an object with values
+ * @param element Element to parse
+ */
+export function parseStyleAttribute(element: SVGElement): any;
+/**
+ * Transforms an array of svg elements to corresponding fabric.* instances
+ * @param elements Array of elements to parse
+ * @param callback Being passed an array of fabric instances (transformed from SVG elements)
+ * @param [options] Options object
+ * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
+ */
+export function parseElements(elements: SVGElement[], callback: Function, options?: any, reviver?: Function): void;
+/**
+ * Returns an object of attributes' name/value, given element and an array of attribute names;
+ * Parses parent "g" nodes recursively upwards.
+ * @param element Element to parse
+ * @param attributes Array of attributes to parse
+ */
+export function parseAttributes(element: HTMLElement, attributes: string[], svgUid?: string): { [key: string]: string };
+/**
+ * Parses an SVG document, returning all of the gradient declarations found in it
+ * @param doc SVG document to parse
+ */
+export function getGradientDefs(doc: SVGElement): { [key: string]: any };
+/**
+ * Parses a short font declaration, building adding its properties to a style object
+ * @param value font declaration
+ * @param oStyle definition
+ */
+export function parseFontDeclaration(value: string, oStyle: any): void;
+/**
+ * Parses an SVG document, converts it to an array of corresponding fabric.* instances and passes them to a callback
+ * @param doc SVG document to parse
+ * @param callback Callback to call when parsing is finished; It's being passed an array of elements (parsed from a document).
+ * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
+ */
+export function parseSVGDocument(doc: SVGElement, callback: (results: Object[], options: any) => void, reviver?: Function): void;
+/**
+ * Parses "transform" attribute, returning an array of values
+ * @param attributeValue String containing attribute value
+ */
+export function parseTransformAttribute(attributeValue: string): number[];
+
+// fabric Log
+// ---------------
+/**
+ * Wrapper around `console.log` (when available)
+ */
+export function log(...values: any[]): void;
+/**
+ * Wrapper around `console.warn` (when available)
+ */
+export function warn(...values: any[]): void;
+
+///////////////////////////////////////////////////////////////////////////////
+// Data Object Interfaces - These intrface are not specific part of fabric,
+// They are just helpful for for defining function paramters
+//////////////////////////////////////////////////////////////////////////////
+interface IDataURLOptions {
+	/**
+	 * The format of the output image. Either "jpeg" or "png"
+	 */
+	format?: string;
+	/**
+	 * Quality level (0..1). Only used for jpeg
+	 */
+	quality?: number;
+	/**
+	 * Multiplier to scale by
+	 */
+	multiplier?: number;
+	/**
+	 * Cropping left offset. Introduced in v1.2.14
+	 */
+	left?: number;
+	/**
+	 * Cropping top offset. Introduced in v1.2.14
+	 */
+	top?: number;
+	/**
+	 * Cropping width. Introduced in v1.2.14
+	 */
+	width?: number;
+	/**
+	 * Cropping height. Introduced in v1.2.14
+	 */
+	height?: number;
+}
+
+interface IEvent {
+	e: Event;
+	target?: Object;
+}
+
+interface IFillOptions {
+	/**
+	 * options.source Pattern source
+	 */
+	source: string | HTMLImageElement;
+	/**
+	 * Repeat property of a pattern (one of repeat, repeat-x, repeat-y or no-repeat)
+	 */
+	repeat?: string;
+	/**
+	 * Pattern horizontal offset from object's left/top corner
+	 */
+	offsetX?: number;
+	/**
+	 * Pattern vertical offset from object's left/top corner
+	 */
+	offsetY?: number;
+}
+
+interface IToSVGOptions {
+	/**
+	 * If true xml tag is not included
+	 */
+	suppressPreamble: boolean;
+	/**
+	 * SVG viewbox object
+	 */
+	viewBox: IViewBox;
+	/**
+	 * Encoding of SVG output
+	 */
+	encoding: string;
+}
+
+interface IViewBox {
+	/**
+	 * x-cooridnate of viewbox
+	 */
+	x: number;
+	/**
+	 * y-coordinate of viewbox
+	 */
+	y: number;
+	/**
+	 * Width of viewbox
+	 */
+	width: number;
+	/**
+	 * Height of viewbox
+	 */
+	height: number;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Mixins Interfaces
+//////////////////////////////////////////////////////////////////////////////
+interface ICollection<T> {
+	/**
+	 * Adds objects to collection, then renders canvas (if `renderOnAddRemove` is not `false`)
+	 * Objects should be instances of (or inherit from) fabric.Object
+	 * @param object Zero or more fabric instances
+	 */
+	add(...object: Object[]): T;
+
+	/**
+	 * Inserts an object into collection at specified index, then renders canvas (if `renderOnAddRemove` is not `false`)
+	 * An object should be an instance of (or inherit from) fabric.Object
+	 * @param object Object to insert
+	 * @param index Index to insert object at
+	 * @param nonSplicing When `true`, no splicing (shifting) of objects occurs
+	 * @return thisArg
+	 * @chainable
+	 */
+	insertAt(object: Object, index: number, nonSplicing: boolean): T;
+
+	/**
+	 * 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[]): T;
+
+	/**
+	 * Executes given function for each object in this group
+	 * @param context Context (aka thisObject)
+	 * @return thisArg
+	 */
+	forEachObject(callback: (element: Object, index: number, array: Object[]) => void, context?: any): T;
+
+	/**
+	 * Returns an array of children objects of this instance
+	 * Type parameter introduced in 1.3.10
+	 * @param [type] When specified, only objects of this type are returned
+	 */
+	getObjects(type?: string): Object[];
+
+	/**
+	 * Returns object at specified index
+	 * @return thisArg
+	 */
+	item(index: number): T;
+
+	/**
+	 * Returns true if collection contains no objects
+	 * @return true if collection is empty
+	 */
+	isEmpty(): boolean;
+
+	/**
+	 * Returns a size of a collection (i.e: length of an array containing its objects)
+	 * @return Collection size
+	 */
+	size(): number;
+
+	/**
+	 * Returns true if collection contains an object
+	 * @param object Object to check against
+	 * @return `true` if collection contains an object
+	 */
+	contains(object: Object): boolean;
+
+	/**
+	 * Returns number representation of a collection complexity
+	 * @return complexity
+	 */
+	complexity(): number;
+}
+
+interface IObservable<T> {
+	/**
+	 * Observes specified event
+	 * @param eventName Event name (eg. 'after:render')
+	 * @param handler Function that receives a notification when an event of the specified type occurs
+	 */
+	on(eventName: string, handler: (e: IEvent) => void): T;
+
+	/**
+	 * Observes specified event
+	 * @param eventName Object with key/value pairs (eg. {'after:render': handler, 'selection:cleared': handler})
+	 */
+	on(events: {[eventName: string]: (e: IEvent) => void}): T;
+	/**
+	 * Fires event with an optional options object
+	 * @param eventName Event name to fire
+	 * @param [options] Options object
+	 */
+	trigger(eventName: string, options?: any): T;
+	/**
+	 * Stops event observing for a particular event handler. Calling this method
+	 * without arguments removes all handlers for all events
+	 * @param eventName Event name (eg. 'after:render') or object with key/value pairs (eg. {'after:render': handler, 'selection:cleared': handler})
+	 * @param handler Function to be deleted from EventListeners
+	 */
+	off(eventName?: string|any, handler?: (e: IEvent) => void): T;
+}
+
+interface Callbacks {
+	/** Invoked on completion */
+	onComplete?: Function;
+	/** Invoked on every step of animation */
+	onChange?: Function;
+}
+
+// animation mixin
+// ----------------------------------------------------
+interface ICanvasAnimation<T> {
+	FX_DURATION: number;
+	/**
+	 * Centers object horizontally with animation.
+	 * @param object Object to center
+	 */
+	fxCenterObjectH(object: Object, callbacks?: Callbacks): T;
+
+	/**
+	 * Centers object vertically with animation.
+	 * @param object Object to center
+	 */
+	fxCenterObjectV(object: Object, callbacks?: Callbacks): T;
+
+	/**
+	 * Same as `fabric.Canvas#remove` but animated
+	 * @param object Object to remove
+	 * @chainable
+	 */
+	fxRemove(object: Object): T;
+}
+interface IObjectAnimation<T> {
+	/**
+	 * Animates object's properties
+	 * object.animate('left', ..., {duration: ...});
+	 * @param property Property to animate
+	 * @param value Value to animate property
+	 * @param options The animation options
+	 */
+	animate(property: string, value: number|string, options?: IAnimationOptions): Object;
+	/**
+	 * Animates object's properties
+	 * object.animate({ left: ..., top: ... }, { duration: ... });
+	 * @param properties Properties to animate
+	 * @param value Options object
+	 */
+	animate(properties: any, options?: IAnimationOptions): Object;
+}
+interface IAnimationOptions {
+	/**
+	 * Allows to specify starting value of animatable property (if we don't want current value to be used).
+	 */
+	from?: string|number;
+	/**
+	 * Defaults to 500 (ms). Can be used to change duration of an animation.
+	 */
+	duration?: number;
+	/**
+	 * Callback; invoked on every value change
+	 */
+	onChange?: Function;
+	/**
+	 * Callback; invoked when value change is completed
+	 */
+	onComplete?: Function;
+
+	/**
+	 * Easing function. Default: fabric.util.ease.easeInSine
+	 */
+	easing?: Function;
+	/**
+	 *  Value to modify the property by, default: end - start
+	 */
+	by?: number;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// General Fabric Interfaces
+//////////////////////////////////////////////////////////////////////////////
+export class Color {
+	/**
+	 * Color class
+	 * The purpose of Color is to abstract and encapsulate common color operations;
+	 * @param color optional in hex or rgb(a) format
+	 */
+	constructor(color?: string);
+
+	/**
+	 * Returns source of this color (where source is an array representation; ex: [200, 200, 100, 1])
+	 */
+	getSource(): number[];
+
+	/**
+	 * Sets source of this color (where source is an array representation; ex: [200, 200, 100, 1])
+	 */
+	setSource(source: number[]): void;
+
+	/**
+	 * Returns color represenation in RGB format ex: rgb(0-255,0-255,0-255)
+	 */
+	toRgb(): string;
+
+	/**
+	 * Returns color represenation in RGBA format ex: rgba(0-255,0-255,0-255,0-1)
+	 */
+	toRgba(): string;
+
+	/**
+	 * Returns color represenation in HSL format ex: hsl(0-360,0%-100%,0%-100%)
+	 */
+	toHsl(): string;
+
+	/**
+	 * Returns color represenation in HSLA format ex: hsla(0-360,0%-100%,0%-100%,0-1)
+	 */
+	toHsla(): string;
+
+	/**
+	 * Returns color represenation in HEX format ex: FF5555
+	 */
+	toHex(): string;
+
+	/**
+	 * Gets value of alpha channel for this color
+	 */
+	getAlpha(): number;
+
+	/**
+	 * Sets value of alpha channel for this color
+	 * @param alpha Alpha value 0-1
+	 */
+	setAlpha(alpha: number): void;
+
+	/**
+	 * Transforms color to its grayscale representation
+	 */
+	toGrayscale(): Color;
+
+	/**
+	 * Transforms color to its black and white representation
+	 */
+	toBlackWhite(threshold: number): Color;
+	/**
+	 * Overlays color with another color
+	 */
+	overlayWith(otherColor: string|Color): Color;
+
+	/**
+	 * Returns new color object, when given a color in RGB format
+	 * @param color Color value ex: rgb(0-255,0-255,0-255)
+	 */
+	static fromRgb(color: string): Color;
+	/**
+	 * Returns new color object, when given a color in RGBA format
+	 * @param color Color value ex: rgb(0-255,0-255,0-255)
+	 */
+	static fromRgba(color: string): Color;
+	/**
+	 * Returns array represenatation (ex: [100, 100, 200, 1]) of a color that's in RGB or RGBA format
+	 * @param color Color value ex: rgb(0-255,0-255,0-255), rgb(0%-100%,0%-100%,0%-100%)
+	 */
+	static sourceFromRgb(color: string): number[];
+	/**
+	 * Returns new color object, when given a color in HSL format
+	 * @param color Color value ex: hsl(0-260,0%-100%,0%-100%)
+	 */
+	static fromHsl(color: string): Color;
+	/**
+	 * Returns new color object, when given a color in HSLA format
+	 * @param color Color value ex: hsl(0-260,0%-100%,0%-100%)
+	 */
+	static fromHsla(color: string): Color;
+	/**
+	 * Returns array represenatation (ex: [100, 100, 200, 1]) of a color that's in HSL or HSLA format.
+	 * @param color Color value ex: hsl(0-360,0%-100%,0%-100%) or hsla(0-360,0%-100%,0%-100%, 0-1)
+	 */
+	static sourceFromHsl(color: string): number[];
+	/**
+	 * Returns new color object, when given a color in HEX format
+	 * @param color Color value ex: FF5555
+	 */
+	static fromHex(color: string): Color;
+
+	/**
+	 * Returns array represenatation (ex: [100, 100, 200, 1]) of a color that's in HEX format
+	 * @param color ex: FF5555
+	 */
+	static sourceFromHex(color: string): number[];
+	/**
+	 * Returns new color object, when given color in array representation (ex: [200, 100, 100, 0.5])
+	 */
+	static fromSource(source: number[]): Color;
+}
+
+interface IGradientOptions {
+	/**
+	 * @param [options.type] Type of gradient 'radial' or 'linear'
+	 */
+	type?: string;
+	/**
+	 * x-coordinate of start point
+	 */
+	x1?: number;
+	/**
+	 * y-coordinate of start point
+	 */
+	y1?: number;
+	/**
+	 * x-coordinate of end point
+	 */
+	x2?: number;
+	/**
+	 * y-coordinate of end point
+	 */
+	y2?: number;
+	/**
+	 * Radius of start point (only for radial gradients)
+	 */
+	r1?: number;
+	/**
+	 * Radius of end point (only for radial gradients)
+	 */
+	r2?: number;
+	/**
+	 * Color stops object eg. {0:string; 1:string;
+	 */
+	colorStops?: any;
+}
+interface IGradient extends IGradientOptions {
+	/**
+	 * Adds another colorStop
+	 * @param colorStop Object with offset and color
+	 */
+	addColorStop(colorStop: any): IGradient;
+	/**
+	 * Returns object representation of a gradient
+	 */
+	toObject(): any;
+	/**
+	 * Returns SVG representation of an gradient
+	 * @param object Object to create a gradient for
+	 * @param normalize Whether coords should be normalized
+	 * @return SVG representation of an gradient (linear/radial)
+	 */
+	toSVG(object: Object, normalize?: boolean): string;
+
+	/**
+	 * Returns an instance of CanvasGradient
+	 * @param ctx Context to render on
+	 */
+	toLive(ctx: CanvasRenderingContext2D, object?: PathGroup): CanvasGradient;
+}
+interface IGrandientStatic {
+	new (options?: IGradientOptions): IGradient;
+	/**
+	 * Returns instance from an SVG element
+	 * @param el SVG gradient element
+	 */
+	fromElement(el: SVGGradientElement, instance: Object): IGradient;
+	/**
+	 * Returns instance from its object representation
+	 * @param [options] Options object
+	 */
+	fromObject(obj: any, options: any[]): IGradient;
+}
+
+export class Intersection {
+	constructor(status?: string);
+
+	/**
+	 * Appends a point to intersection
+	 */
+	appendPoint(point: Point): void;
+	/**
+	 * Appends points to intersection
+	 */
+	appendPoints(points: Point[]): void;
+
+	/**
+	 * Checks if polygon intersects another polygon
+	 */
+	static intersectPolygonPolygon(points1: Point[], points2: Point[]): Intersection;
+	/**
+	 * Checks if line intersects polygon
+	 */
+	static intersectLinePolygon(a1: Point, a2: Point, points: Point[]): Intersection;
+	/**
+	 * Checks if one line intersects another
+	 */
+	static intersectLineLine(a1: Point, a2: Point, b1: Point, b2: Point): Intersection;
+	/**
+	 * Checks if polygon intersects rectangle
+	 */
+	static intersectPolygonRectangle(points: Point[], r1: number, r2: number): Intersection;
+}
+
+interface IPatternOptions {
+	/**
+	 * Repeat property of a pattern (one of repeat, repeat-x, repeat-y or no-repeat)
+	 */
+	repeat: string;
+
+	/**
+	 * Pattern horizontal offset from object's left/top corner
+	 */
+	offsetX: number;
+
+	/**
+	 * Pattern vertical offset from object's left/top corner
+	 */
+	offsetY: number;
+	/**
+	 * The source for the pattern
+	 */
+	source: string|HTMLImageElement;
+}
+export interface Pattern extends IPatternOptions {}
+export class Pattern  {
+	constructor(options?: IPatternOptions);
+
+	initialise(options?: IPatternOptions): Pattern;
+	/**
+	 * Returns an instance of CanvasPattern
+	 */
+	toLive(ctx: CanvasRenderingContext2D): Pattern;
+
+	/**
+	 * Returns object representation of a pattern
+	 */
+	toObject(): any;
+	/**
+	 * Returns SVG representation of a pattern
+	 */
+	toSVG(object: Object): string;
+}
+
+export class Point {
+	x: number;
+	y: number;
+
+	constructor(x: number, y: number);
+
+	/**
+	 * Adds another point to this one and returns another one
+	 */
+	add(that: Point): Point;
+
+	/**
+	 * Adds another point to this one
+	 */
+	addEquals(that: Point): Point;
+
+	/**
+	 * Adds value to this point and returns a new one
+	 */
+	scalarAdd(scalar: number): Point;
+
+	/**
+	 * Adds value to this point
+	 */
+	scalarAddEquals(scalar: number): Point;
+
+	/**
+	 * Subtracts another point from this point and returns a new one
+	 */
+	subtract(that: Point): Point;
+
+	/**
+	 * Subtracts another point from this point
+	 */
+	subtractEquals(that: Point): Point;
+
+	/**
+	 * Subtracts value from this point and returns a new one
+	 */
+	scalarSubtract(scalar: number): Point;
+
+	/**
+	 * Subtracts value from this point
+	 */
+	scalarSubtractEquals(scalar: number): Point;
+
+	/**
+	 * Miltiplies this point by a value and returns a new one
+	 */
+	multiply(scalar: number): Point;
+
+	/**
+	 * Miltiplies this point by a value
+	 */
+	multiplyEquals(scalar: number): Point;
+
+	/**
+	 * Divides this point by a value and returns a new one
+	 */
+	divide(scalar: number): Point;
+
+	/**
+	 * Divides this point by a value
+	 */
+	divideEquals(scalar: number): Point;
+
+	/**
+	 * Returns true if this point is equal to another one
+	 */
+	eq(that: Point): Point;
+
+	/**
+	 * Returns true if this point is less than another one
+	 */
+	lt(that: Point): Point;
+
+	/**
+	 * Returns true if this point is less than or equal to another one
+	 */
+	lte(that: Point): Point;
+
+	/**
+	 * Returns true if this point is greater another one
+	 */
+	gt(that: Point): Point;
+
+	/**
+	 * Returns true if this point is greater than or equal to another one
+	 */
+	gte(that: Point): Point;
+
+	/**
+	 * Returns new point which is the result of linear interpolation with this one and another one
+	 */
+	lerp(that: Point, t: number): Point;
+
+	/**
+	 * Returns distance from this point and another one
+	 */
+	distanceFrom(that: Point): number;
+
+	/**
+	 * Returns the point between this point and another one
+	 */
+	midPointFrom(that: Point): Point;
+
+	/**
+	 * Returns a new point which is the min of this and another one
+	 */
+	min(that: Point): Point;
+
+	/**
+	 * Returns a new point which is the max of this and another one
+	 */
+	max(that: Point): Point;
+
+	/**
+	 * Returns string representation of this point
+	 */
+	toString(): string;
+
+	/**
+	 * Sets x/y of this point
+	 */
+	setXY(x: number, y: number): Point;
+
+	/**
+	 * Sets x/y of this point from another point
+	 */
+	setFromPoint(that: Point): Point;
+
+	/**
+	 * Swaps x/y of this point and another point
+	 */
+	swap(that: Point): Point;
+}
+
+interface IShadowOptions {
+	/**
+	 * Whether the shadow should affect stroke operations
+	 */
+	affectStrike: boolean;
+	/**
+	 * Shadow blur
+	 */
+	blur: number;
+	/**
+	 * Shadow color
+	 */
+	color: string;
+	/**
+	 * Indicates whether toObject should include default values
+	 */
+	includeDefaultValues: boolean;
+	/**
+	 * Shadow horizontal offset
+	 */
+	offsetX: number;
+	/**
+	 * Shadow vertical offset
+	 */
+	offsetY: number;
+}
+export interface Shadow extends IShadowOptions {}
+export class Shadow {
+	constructor(options?: IShadowOptions);
+	initialize(options?: IShadowOptions|string): Shadow;
+	/**
+	 * Returns object representation of a shadow
+	 */
+	toObject(): any;
+	/**
+	 * Returns a string representation of an instance, CSS3 text-shadow declaration
+	 */
+	toString(): string;
+	/**
+	 * Returns SVG representation of a shadow
+	 */
+	toSVG(object: Object): string;
+
+	/**
+	 * Regex matching shadow offsetX, offsetY and blur, Static
+	 */
+	reOffsetsAndBlur: RegExp;
+
+	static reOffsetsAndBlur: RegExp;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Canvas Interfaces
+//////////////////////////////////////////////////////////////////////////////
+interface ICanvasDimensions {
+	/**
+	 * Width of canvas element
+	 */
+	width: number;
+	/**
+	 * Height of canvas element
+	 */
+	height: number;
+}
+interface ICanvasDimensionsOptions {
+	/**
+	 * Set the given dimensions only as canvas backstore dimensions
+	 */
+	backstoreOnly?: boolean;
+	/**
+	 * Set the given dimensions only as css dimensions
+	 */
+	cssOnly?: boolean;
+}
+
+interface IStaticCanvasOptions {
+	/**
+	 * Indicates whether the browser can be scrolled when using a touchscreen and dragging on the canvas
+	 */
+	allowTouchScrolling?: boolean;
+	/**
+	 * Indicates whether this canvas will use image smoothing, this is on by default in browsers
+	 */
+	imageSmoothingEnabled?: boolean;
+
+	/**
+	 * Indicates whether objects should remain in current stack position when selected.
+	 * When false objects are brought to top and rendered as part of the selection group
+	 */
+	preserveObjectStacking?: boolean;
+
+	/**
+	 * The transformation (in the format of Canvas transform) which focuses the viewport
+	 */
+	viewportTransform?: number[];
+
+	freeDrawingColor?: string;
+	freeDrawingLineWidth?: number;
+
+	/**
+	 * Background color of canvas instance.
+	 * Should be set via setBackgroundColor
+	 */
+	backgroundColor?: string|Pattern;
+	/**
+	 * Background image of canvas instance.
+	 * Should be set via setBackgroundImage
+	 * <b>Backwards incompatibility note:</b> The "backgroundImageOpacity" and "backgroundImageStretch" properties are deprecated since 1.3.9.
+	 */
+	backgroundImage?: Image | string;
+	backgroundImageOpacity?: number;
+	backgroundImageStretch?: number;
+	/**
+	 * Function that determines clipping of entire canvas area
+	 * Being passed context as first argument. See clipping canvas area
+	 */
+	clipTo?(context: CanvasRenderingContext2D): void;
+
+	/**
+	 * Indicates whether object controls (borders/controls) are rendered above overlay image
+	 */
+	controlsAboveOverlay?: boolean;
+
+	/**
+	 * Indicates whether toObject/toDatalessObject should include default values
+	 */
+	includeDefaultValues?: boolean;
+	/**
+	 * Overlay color of canvas instance.
+	 * Should be set via setOverlayColor
+	 */
+	overlayColor?: string|Pattern;
+	/**
+	 * Overlay image of canvas instance.
+	 * Should be set via setOverlayImage
+	 * <b>Backwards incompatibility note:</b> The "overlayImageLeft" and "overlayImageTop" properties are deprecated since 1.3.9.
+	 */
+	overlayImage?: Image;
+	overlayImageLeft?: number;
+	overlayImageTop?: number;
+	/**
+	 * Indicates whether add, insertAt and remove should also re-render canvas.
+	 * Disabling this option could give a great performance boost when adding/removing a lot of objects to/from canvas at once
+	 * (followed by a manual rendering after addition/deletion)
+	 */
+	renderOnAddRemove?: boolean;
+	/**
+	 * Indicates whether objects' state should be saved
+	 */
+	stateful?: boolean;
+}
+export interface StaticCanvas extends IObservable<StaticCanvas>, IStaticCanvasOptions, ICollection<StaticCanvas>, ICanvasAnimation<StaticCanvas> {}
+export class StaticCanvas {
+	/**
+	 * Constructor
+	 * @param element <canvas> element to initialize instance on
+	 * @param [options] Options object
+	 */
+	constructor(element: HTMLCanvasElement|string, options?: ICanvasOptions);
+
+	/**
+	 * Calculates canvas element offset relative to the document
+	 * This method is also attached as "resize" event handler of window
+	 */
+	calcOffset(): this;
+
+	/**
+	 * Sets {@link fabric.StaticCanvas#overlayImage|overlay image} for this canvas
+	 * @param image fabric.Image instance or URL of an image to set overlay to
+	 * @param callback callback to invoke when image is loaded and set as an overlay
+	 * @param [options] Optional options to set for the {@link fabric.Image|overlay image}.
+	 */
+	setOverlayImage(image: Image|string, callback: (img: HTMLImageElement) => void, options?: IImageOptions): this;
+
+	/**
+	 * Sets {@link fabric.StaticCanvas#backgroundImage|background image} for this canvas
+	 * @param image fabric.Image instance or URL of an image to set background to
+	 * @param callback Callback to invoke when image is loaded and set as background
+	 * @param [options] Optional options to set for the {@link fabric.Image|background image}.
+	 */
+	setBackgroundImage(image: Image|string, callback?: (img: HTMLImageElement) => void, options?: IImageOptions): this;
+
+	/**
+	 * Sets {@link fabric.StaticCanvas#overlayColor|background color} for this canvas
+	 * @param overlayColor Color or pattern to set background color to
+	 * @param callback Callback to invoke when background color is set
+	 */
+	setOverlayColor(overlayColor: string|Pattern, callback: (pattern: Pattern | undefined) => void): this;
+
+	/**
+	 * Sets {@link fabric.StaticCanvas#backgroundColor|background color} for this canvas
+	 * @param backgroundColor Color or pattern to set background color to
+	 * @param callback Callback to invoke when background color is set
+	 */
+	setBackgroundColor(backgroundColor: string|Pattern, callback: (pattern: Pattern | undefined) => void): StaticCanvas;
+
+	/**
+	 * Returns canvas width (in px)
+	 */
+	getWidth(): number;
+
+	/**
+	 * Returns canvas height (in px)
+	 */
+	getHeight(): number;
+
+	/**
+	 * Sets width of this canvas instance
+	 * @param value                         Value to set width to
+	 * @param        [options]                     Options object
+	 */
+	setWidth(value: number|string, options?: ICanvasDimensionsOptions): this;
+
+	/**
+	 * Sets height of this canvas instance
+	 * @param value                         Value to set height to
+	 * @param        [options]                     Options object
+	 */
+	setHeight(value: number|string, options?: ICanvasDimensionsOptions): this;
+
+	/**
+	 * Sets dimensions (width, height) of this canvas instance. when options.cssOnly flag active you should also supply the unit of measure (px/%/em)
+	 * @param        dimensions                    Object with width/height properties
+	 * @param        [options]                     Options object
+	 */
+	setDimensions(dimensions: ICanvasDimensions, options?: ICanvasDimensionsOptions): this;
+
+	/**
+	 * Returns canvas zoom level
+	 */
+	getZoom(): number;
+
+	/**
+	 * Sets viewport transform of this canvas instance
+	 * @param vpt the transform in the form of context.transform
+	 */
+	setViewportTransform(vpt: number[]): this;
+
+	/**
+	 * Sets zoom level of this canvas instance, zoom centered around point
+	 * @param point to zoom with respect to
+	 * @param value to set zoom to, less than 1 zooms out
+	 */
+	zoomToPoint(point: Point, value: number): this;
+
+	/**
+	 * Sets zoom level of this canvas instance
+	 * @param value to set zoom to, less than 1 zooms out
+	 */
+	setZoom(value: number): this;
+
+	/**
+	 * Pan viewport so as to place point at top left corner of canvas
+	 * @param point to move to
+	 */
+	absolutePan(point: Point): this;
+
+	/**
+	 * Pans viewpoint relatively
+	 * @param point (position vector) to move by
+	 */
+	relativePan(point: Point): this;
+
+	/**
+	 * Returns <canvas> element corresponding to this instance
+	 */
+	getElement(): HTMLCanvasElement;
+
+	/**
+	 * Returns currently selected object, if any
+	 */
+	getActiveObject(): Object;
+
+	/**
+	 * Returns currently selected group of object, if any
+	 */
+	getActiveGroup(): Group;
+
+	/**
+	 * Clears specified context of canvas element
+	 * @param ctx Context to clear
+	 * @chainable
+	 */
+	clearContext(ctx: CanvasRenderingContext2D): this;
+
+	/**
+	 * Returns context of canvas where objects are drawn
+	 */
+	getContext(): CanvasRenderingContext2D;
+
+	/**
+	 * Clears all contexts (background, main, top) of an instance
+	 */
+	clear(): this;
+
+	/**
+	 * Renders both the top canvas and the secondary container canvas.
+	 * @param [allOnTop] Whether we want to force all images to be rendered on the top canvas
+	 * @chainable
+	 */
+	renderAll(allOnTop?: boolean): this;
+
+	/**
+	 * Method to render only the top canvas.
+	 * Also used to render the group selection box.
+	 * @chainable
+	 */
+	renderTop(): StaticCanvas;
+
+	/**
+	 * Returns coordinates of a center of canvas.
+	 * Returned value is an object with top and left properties
+	 */
+	getCenter(): { top: number; left: number; };
+	/**
+	 * Centers object horizontally.
+	 * You might need to call `setCoords` on an object after centering, to update controls area.
+	 * @param object Object to center horizontally
+	 */
+	centerObjectH(object: Object): this;
+
+	/**
+	 * Centers object vertically.
+	 * You might need to call `setCoords` on an object after centering, to update controls area.
+	 * @param object Object to center vertically
+	 */
+	centerObjectV(object: Object): this;
+
+	/**
+	 * Centers object vertically and horizontally.
+	 * You might need to call `setCoords` on an object after centering, to update controls area.
+	 * @param object Object to center vertically and horizontally
+	 */
+	centerObject(object: Object): this;
+
+	/**
+	 * Returs dataless JSON representation of canvas
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	toDatalessJSON(propertiesToInclude?: string[]): string;
+
+	/**
+	 * Returns object representation of canvas
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+
+	/**
+	 * Returns dataless object representation of canvas
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	toDatalessObject(propertiesToInclude?: string[]): any;
+
+	/**
+	 * When true, getSvgTransform() will apply the StaticCanvas.viewportTransform to the SVG transformation. When true,
+	 * a zoomed canvas will then produce zoomed SVG output.
+	 */
+	svgViewportTransformation: boolean;
+
+	/**
+	 * Returns SVG representation of canvas
+	 * @param [options] Options object for SVG output
+	 * @param [reviver] Method for further parsing of svg elements, called after each fabric object converted into svg representation.
+	 */
+	toSVG(options: IToSVGOptions, reviver?: Function): string;
+
+	/**
+	 * Moves an object to the bottom of the stack of drawn objects
+	 * @param object Object to send to back
+	 * @chainable
+	 */
+	sendToBack(object: Object): this;
+
+	/**
+	 * Moves an object to the top of the stack of drawn objects
+	 * @param object Object to send
+	 * @chainable
+	 */
+	bringToFront(object: Object): this;
+
+	/**
+	 * Moves an object down in stack of drawn objects
+	 * @param object Object to send
+	 * @param [intersecting] If `true`, send object behind next lower intersecting object
+	 * @chainable
+	 */
+	sendBackwards(object: Object): this;
+
+	/**
+	 * Moves an object up in stack of drawn objects
+	 * @param object Object to send
+	 * @param [intersecting] If `true`, send object in front of next upper intersecting object
+	 * @chainable
+	 */
+	bringForward(object: Object): this;
+	/**
+	 * Moves an object to specified level in stack of drawn objects
+	 * @param object Object to send
+	 * @param index Position to move to
+	 * @chainable
+	 */
+	moveTo(object: Object, index: number): this;
+
+	/**
+	 * Clears a canvas element and removes all event listeners
+	 */
+	dispose(): this;
+
+	/**
+	 * Returns a string representation of an instance
+	 */
+	toString(): string;
+
+	/**
+	 * Exports canvas element to a dataurl image. Note that when multiplier is used, cropping is scaled appropriately
+	 * @param [options] Options object
+	 */
+	toDataURL(options?: IDataURLOptions): string;
+
+	/**
+	 * Provides a way to check support of some of the canvas methods
+	 * (either those of HTMLCanvasElement itself, or rendering context)
+	 * @param methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
+	 * @return `true` if method is supported (or at least exists), null` if canvas element or context can not be initialized
+	 */
+	supports(methodName: "getImageData" | "toDataURL" | "toDataURLWithQuality" | "setLineDash"): boolean;
+
+	/**
+	 * Populates canvas with data from the specified JSON.
+	 * JSON format must conform to the one of toJSON formats
+	 * @param json JSON string or object
+	 * @param callback Callback, invoked when json is parsed
+	 *                            and corresponding objects (e.g: {@link fabric.Image})
+	 *                            are initialized
+	 * @param [reviver] Method for further parsing of JSON elements, called after each fabric object created.
+	 */
+	loadFromJSON(json: string|any, callback: () => void, reviver?: Function): this;
+	/**
+	 * Clones canvas instance
+	 * @param [callback] Receives cloned instance as a first argument
+	 * @param [properties] Array of properties to include in the cloned canvas and children
+	 */
+	clone(callback: (canvas: StaticCanvas) => void, properties?: string[]): void;
+
+	/**
+	 * Clones canvas instance without cloning existing data.
+	 * This essentially copies canvas dimensions, clipping properties, etc.
+	 * but leaves data empty (so that you can populate it with your own)
+	 * @param [callback] Receives cloned instance as a first argument
+	 */
+	cloneWithoutData(callback: (canvas: StaticCanvas) => void): void;
+
+	/**
+	 * Callback; invoked right before object is about to be scaled/rotated
+	 */
+	onBeforeScaleRotate(target: Object): void;
+
+	// Functions from object straighten mixin
+	// --------------------------------------------------------------------------------------------------------------------------------
+
+	/**
+	 * Straightens object, then rerenders canvas
+	 * @param object Object to straighten
+	 */
+	straightenObject(object: Object): this;
+
+	/**
+	 * Same as straightenObject, but animated
+	 * @param object Object to straighten
+	 */
+	fxStraightenObject(object: Object): this;
+
+	static EMPTY_JSON: string;
+	/**
+	 * Provides a way to check support of some of the canvas methods
+	 * (either those of HTMLCanvasElement itself, or rendering context)
+	 * @param methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
+	 */
+	static supports(methodName: "getImageData" | "toDataURL" | "toDataURLWithQuality" | "setLineDash"): boolean;
+	/**
+	 * Returns JSON representation of canvas
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	static toJSON(propertiesToInclude?: string[]): string;
+}
+
+interface ICanvasOptions extends IStaticCanvasOptions {
+	/**
+	 * When true, objects can be transformed by one side (unproportionally)
+	 */
+	uniScaleTransform?: boolean;
+
+	/**
+	 * When true, objects use center point as the origin of scale transformation.
+	 * <b>Backwards incompatibility note:</b> This property replaces "centerTransform" (Boolean).
+	 */
+	centeredScaling?: boolean;
+
+	/**
+	 * When true, objects use center point as the origin of rotate transformation.
+	 * <b>Backwards incompatibility note:</b> This property replaces "centerTransform" (Boolean).
+	 */
+	centeredRotation?: boolean;
+
+	/**
+	 * Indicates that canvas is interactive. This property should not be changed.
+	 */
+	interactive?: boolean;
+
+	/**
+	 * Indicates whether group selection should be enabled
+	 */
+	selection?: boolean;
+
+	/**
+	 * Color of selection
+	 */
+	selectionColor?: string;
+
+	/**
+	 * Default dash array pattern
+	 * If not empty the selection border is dashed
+	 */
+	selectionDashArray?: any[];
+
+	/**
+	 * Color of the border of selection (usually slightly darker than color of selection itself)
+	 */
+	selectionBorderColor?: string;
+
+	/**
+	 * Width of a line used in object/group selection
+	 */
+	selectionLineWidth?: number;
+
+	/**
+	 * Default cursor value used when hovering over an object on canvas
+	 */
+	hoverCursor?: string;
+
+	/**
+	 * Default cursor value used when moving an object on canvas
+	 */
+	moveCursor?: string;
+
+	/**
+	 * Default cursor value used for the entire canvas
+	 */
+	defaultCursor?: string;
+
+	/**
+	 * Cursor value used during free drawing
+	 */
+	freeDrawingCursor?: string;
+
+	/**
+	 * Cursor value used for rotation point
+	 */
+	rotationCursor?: string;
+
+	/**
+	 * Default element class that's given to wrapper (div) element of canvas
+	 */
+	containerClass?: string;
+
+	/**
+	 * When true, object detection happens on per-pixel basis rather than on per-bounding-box
+	 */
+	perPixelTargetFind?: boolean;
+
+	/**
+	 * Number of pixels around target pixel to tolerate (consider active) during object detection
+	 */
+	targetFindTolerance?: number;
+
+	/**
+	 * When true, target detection is skipped when hovering over canvas. This can be used to improve performance.
+	 */
+	skipTargetFind?: boolean;
+
+	/**
+	 * When true, mouse events on canvas (mousedown/mousemove/mouseup) result in free drawing.
+	 * After mousedown, mousemove creates a shape,
+	 * and then mouseup finalizes it and adds an instance of `fabric.Path` onto canvas.
+	 */
+	isDrawingMode?: boolean;
+}
+export interface Canvas extends StaticCanvas {}
+export interface Canvas extends ICanvasOptions {}
+export class Canvas {
+	/**
+	 * Constructor
+	 * @param element <canvas> element to initialize instance on
+	 * @param [options] Options object
+	 */
+	constructor(element: HTMLCanvasElement | string, options?: ICanvasOptions);
+
+	_objects: Object[];
+
+	/**
+	 * Checks if point is contained within an area of given object
+	 * @param e Event object
+	 * @param target Object to test against
+	 */
+	containsPoint(e: Event, target: Object): boolean;
+	/**
+	 * Deactivates all objects on canvas, removing any active group or object
+	 * @return thisArg
+	 */
+	deactivateAll(): Canvas;
+	/**
+	 * Deactivates all objects and dispatches appropriate events
+	 * @param [e] Event (passed along when firing)
+	 * @return thisArg
+	 */
+	deactivateAllWithDispatch(e?: Event): Canvas;
+	/**
+	 * Discards currently active group
+	 * @param [e] Event (passed along when firing)
+	 * @return thisArg
+	 */
+	discardActiveGroup(e?: Event): Canvas;
+	/**
+	 * Discards currently active object
+	 * @param [e] Event (passed along when firing)
+	 * @return thisArg
+	 * @chainable
+	 */
+	discardActiveObject(e?: Event): Canvas;
+	/**
+	 * Draws objects' controls (borders/controls)
+	 * @param ctx Context to render controls on
+	 */
+	drawControls(ctx: CanvasRenderingContext2D): void;
+	/**
+	 * Method that determines what object we are clicking on
+	 * @param e mouse event
+	 * @param skipGroup when true, group is skipped and only objects are traversed through
+	 */
+	findTarget(e: MouseEvent, skipGroup: boolean): Canvas;
+	/**
+	 * Returns currently active group
+	 * @return Current group
+	 */
+	getActiveGroup(): Group;
+	/**
+	 * Returns currently active object
+	 * @return active object
+	 */
+	getActiveObject(): Object;
+	/**
+	 * Returns pointer coordinates relative to canvas.
+	 * @return object with "x" and "y" number values
+	 */
+	getPointer(e: Event, ignoreZoom?: boolean, upperCanvasEl?: CanvasRenderingContext2D): { x: number; y: number; };
+	/**
+	 * Returns context of canvas where object selection is drawn
+	 */
+	getSelectionContext(): CanvasRenderingContext2D;
+	/**
+	 * Returns <canvas> element on which object selection is drawn
+	 */
+	getSelectionElement(): HTMLCanvasElement;
+	/**
+	 * Returns true if object is transparent at a certain location
+	 * @param target Object to check
+	 * @param x Left coordinate
+	 * @param y Top coordinate
+	 */
+	isTargetTransparent(target: Object, x: number, y: number): boolean;
+	/**
+	 * Sets active group to a speicified one
+	 * @param group Group to set as a current one
+	 * @param [e] Event (passed along when firing)
+	 */
+	setActiveGroup(group: Group, e?: Event): Canvas;
+	/**
+	 * Sets given object as the only active object on canvas
+	 * @param object Object to set as an active one
+	 * @param [e] Event (passed along when firing "object:selected")
+	 */
+	setActiveObject(object: Object, e?: Event): Canvas;
+	/**
+	 * Set the cursor type of the canvas element
+	 * @param value Cursor type of the canvas element.
+	 * @see http://www.w3.org/TR/css3-ui/#cursor
+	 */
+	setCursor(value: string): void;
+
+	/**
+	 * Removes all event listeners
+	 */
+	removeListeners(): void;
+
+	static EMPTY_JSON: string;
+	/**
+	 * Provides a way to check support of some of the canvas methods
+	 * (either those of HTMLCanvasElement itself, or rendering context)
+	 * @param methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
+	 */
+	static supports(methodName: "getImageData" | "toDataURL" | "toDataURLWithQuality" | "setLineDash"): boolean;
+	/**
+	 * Returns JSON representation of canvas
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	static toJSON(propertiesToInclude?: string[]): string;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Shape Interfaces
+//////////////////////////////////////////////////////////////////////////////
+
+interface ICircleOptions extends IObjectOptions {
+	/**
+	 * Radius of this circle
+	 */
+	radius?: number;
+	/**
+	 * Start angle of the circle, moving clockwise
+	 */
+	startAngle?: number;
+
+	/**
+	 * End angle of the circle
+	 */
+	endAngle?: number;
+}
+export interface Circle extends Object, ICircleOptions {}
+export class Circle {
+	constructor(options?: ICircleOptions);
+
+	/**
+	 * Returns complexity of an instance
+	 * @return complexity of this instance
+	 */
+	complexity(): number;
+	/**
+	 * Returns horizontal radius of an object (according to how an object is scaled)
+	 */
+	getRadiusX(): number;
+	/**
+	 * Returns vertical radius of an object (according to how an object is scaled)
+	 */
+	getRadiusY(): number;
+	/**
+	 * Sets radius of an object (and updates width accordingly)
+	 */
+	setRadius(value: number): number;
+
+	/**
+	 * Returns object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+
+	/**
+	 * List of attribute names to account for when parsing SVG element (used by {@link fabric.Circle.fromElement})
+	 */
+	static ATTRIBUTE_NAMES: string[];
+	/**
+	 * Returns Circle instance from an SVG element
+	 * @param element Element to parse
+	 * @param [options] Options object
+	 */
+	static fromElement(element: SVGElement, options: ICircleOptions): Circle;
+	/**
+	 * Returns Circle instance from an object representation
+	 * @param object Object to create an instance from
+	 */
+	static fromObject(object: any): Circle;
+}
+
+interface IEllipseOptions extends IObjectOptions {
+	/**
+	 * Horizontal radius
+	 */
+	rx?: number;
+	/**
+	 * Vertical radius
+	 */
+	ry?: number;
+}
+export interface Ellipse extends Object, IEllipseOptions {}
+export class Ellipse {
+	constructor(options?: IEllipseOptions);
+
+	/**
+	 * Returns horizontal radius of an object (according to how an object is scaled)
+	 */
+	getRx(): number;
+
+	/**
+	 * Returns Vertical radius of an object (according to how an object is scaled)
+	 */
+	getRy(): number;
+	/**
+	 * Returns object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+	/**
+	 * Returns complexity of an instance
+	 * @return complexity
+	 */
+	complexity(): number;
+
+	/**
+	 * List of attribute names to account for when parsing SVG element (used by {@link fabric.Ellipse.fromElement})
+	 */
+	static ATTRIBUTE_NAMES: string[];
+
+	/**
+	 * Returns Ellipse instance from an SVG element
+	 * @param element Element to parse
+	 * @param [options] Options object
+	 */
+	static fromElement(element: SVGElement, options?: IEllipseOptions): Ellipse;
+
+	/**
+	 * Returns Ellipse instance from an object representation
+	 * @param object Object to create an instance from
+	 */
+	static fromObject(object: any): Ellipse;
+}
+
+export interface Group extends Object, ICollection<Group> {}
+export class Group {
+	/**
+	 * Constructor
+	 * @param objects Group objects
+	 * @param [options] Options object
+	 */
+	constructor(items?: any[], options?: IObjectOptions);
+
+	activateAllObjects(): Group;
+	/**
+	 * Adds an object to a group; Then recalculates group's dimension, position.
+	 * @return thisArg
+	 * @chainable
+	 */
+	addWithUpdate(object: Object): Group;
+	containsPoint(point: Point): boolean;
+	/**
+	 * Destroys a group (restoring state of its objects)
+	 * @return thisArg
+	 * @chainable
+	 */
+	destroy(): Group;
+	/**
+	 * Returns requested property
+	 * @param prop Property to get
+	 */
+	get(prop: string): any;
+	/**
+	 * Checks whether this group was moved (since `saveCoords` was called last)
+	 * @return true if an object was moved (since fabric.Group#saveCoords was called)
+	 */
+	hasMoved(): boolean;
+	/**
+	 * Removes an object from a group; Then recalculates group's dimension, position.
+	 * @return thisArg
+	 * @chainable
+	 */
+	removeWithUpdate(object: Object): Group;
+	/**
+	 * Renders instance on a given context
+	 * @param ctx context to render instance on
+	 */
+	render(ctx: CanvasRenderingContext2D): void;
+	/**
+	 * 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;
+	/**
+	 * Saves coordinates of this instance (to be used together with `hasMoved`)
+	 * @saveCoords
+	 * @return thisArg
+	 * @chainable
+	 */
+	saveCoords(): Group;
+	/**
+	 * Sets coordinates of all group objects
+	 * @return thisArg
+	 * @chainable
+	 */
+	setObjectsCoords(): Group;
+	/**
+	 * Returns object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns string represenation of a group
+	 */
+	toString(): string;
+	/**
+	 * Returns svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+
+	/**
+	 * Returns {@link fabric.Group} instance from an object representation
+	 * @param object Object to create a group from
+	 * @param [callback] Callback to invoke when an group instance is created
+	 */
+	static fromObject(object: any, callback: (group: Group) => any): void;
+}
+
+interface IImageOptions extends IObjectOptions {
+	/**
+	 * crossOrigin value (one of "", "anonymous", "allow-credentials")
+	 */
+	crossOrigin?: string;
+
+	/**
+	 * AlignX value, part of preserveAspectRatio (one of "none", "mid", "min", "max")
+	 * This parameter defines how the picture is aligned to its viewport when image element width differs from image width.
+	 */
+	alignX?: string;
+
+	/**
+	 * AlignY value, part of preserveAspectRatio (one of "none", "mid", "min", "max")
+	 * This parameter defines how the picture is aligned to its viewport when image element height differs from image height.
+	 */
+	alignY?: string;
+
+	/**
+	 * meetOrSlice value, part of preserveAspectRatio  (one of "meet", "slice").
+	 * if meet the image is always fully visibile, if slice the viewport is always filled with image.
+	 * @see http://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute
+	 */
+	meetOrSlice?: string;
+
+	/**
+	 * Image filter array
+	 */
+	filters?: IBaseFilter[];
+}
+interface Image extends Object, IImageOptions {}
+export class Image {
+	/**
+	 * Constructor
+	 * @param element Image element
+	 * @param [options] Options object
+	 */
+	constructor(element: HTMLImageElement, objObjects: IObjectOptions);
+
+	initialize(element?: string|HTMLImageElement, options?: IImageOptions): void;
+	/**
+	 * Applies filters assigned to this image (from "filters" array)
+	 * @param callback Callback is invoked when all filters have been applied and new image is generated
+	 */
+	applyFilters(callback: Function): void;
+	/**
+	 * Returns a clone of an instance
+	 * @param callback Callback is invoked with a clone as a first argument
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	clone(callback?: Function, propertiesToInclude?: string[]): void;
+	/**
+	 * Returns complexity of an instance
+	 * @return complexity of this instance
+	 */
+	complexity(): number;
+	/**
+	 * Returns image element which this instance if based on
+	 * @return Image element
+	 */
+	getElement(): HTMLImageElement;
+	/**
+	 * Returns original size of an image
+	 * @return Object with "width" and "height" properties
+	 */
+	getOriginalSize(): { width: number; height: number; };
+	/**
+	 * Returns source of an image
+	 * @return Source of an image
+	 */
+	getSrc(): string;
+	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
+
+	/**
+	 * Sets image element for this instance to a specified one.
+	 * If filters defined they are applied to new image.
+	 * You might need to call `canvas.renderAll` and `object.setCoords` after replacing, to render new image and update controls area.
+	 * @param [callback] Callback is invoked when all filters have been applied and new image is generated
+	 * @param [options] Options object
+	 */
+	setElement(element: HTMLImageElement, callback: Function, options: IImageOptions): Image;
+	/**
+	 * Sets crossOrigin value (on an instance and corresponding image element)
+	 */
+	setCrossOrigin(value: string): Image;
+	/**
+	 * Returns object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return Object representation of an instance
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns string representation of an instance
+	 * @return String representation of an instance
+	 */
+	toString(): string;
+	/**
+	 * Returns SVG representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+	/**
+	 * Sets source of an image
+	 * @param src Source string (URL)
+	 * @param [callback] Callback is invoked when image has been loaded (and all filters have been applied)
+	 * @param [options] Options object
+	 */
+	setSrc(src: string, callback?: Function, options?: IImageOptions): Image;
+
+	/**
+	 * Creates an instance of fabric.Image from an URL string
+	 * @param url URL to create an image from
+	 * @param [callback] Callback to invoke when image is created (newly created image is passed as a first argument)
+	 * @param [imgOptions] Options object
+	 */
+	static fromURL(url: string, callback?: (image: Image) => void, objObjects?: IObjectOptions): Image;
+	/**
+	 * Creates an instance of fabric.Image from its object representation
+	 * @param object Object to create an instance from
+	 * @param [callback] Callback to invoke when an image instance is created
+	 */
+	static fromObject(object: any, callback: (image: Image) => void): void;
+	/**
+	 * Returns Image instance from an SVG element
+	 * @param element Element to parse
+	 * @param callback Callback to execute when fabric.Image object is created
+	 * @param [options] Options object
+	 */
+	static fromElement(element: SVGElement, callback: (image: Image) => void, options?: IImageOptions): void;
+	/**
+	 * Default CSS class name for canvas
+	 */
+	static CSS_CANVAS: string;
+
+	static filters: IAllFilters;
+}
+
+interface ILineOptions extends IObjectOptions {
+	/**
+	 * x value or first line edge
+	 */
+	x1: number;
+	/**
+	 * x value or second line edge
+	 */
+	x2: number;
+	/**
+	 * y value or first line edge
+	 */
+	y1: number;
+	/**
+	 * y value or second line edge
+	 */
+	y2: number;
+}
+export interface Line extends Object, ILineOptions {}
+export class Line {
+	/**
+	 * Constructor
+	 * @param [points] Array of points
+	 * @param [options] Options object
+	 */
+	constructor(points?: number[], objObjects?: IObjectOptions);
+	/**
+	 * Returns complexity of an instance
+	 * @return complexity
+	 */
+	complexity(): number;
+	initialize(points?: number[], options?: ILineOptions): Line;
+	/**
+	 * Returns object representation of an instance
+	 * @methd toObject
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
+	 */
+	toObject(propertiesToInclude: string[]): any;
+	/**
+	 * Returns SVG representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+
+	static ATTRIBUTE_NAMES: string[];
+	/**
+	 * Returns fabric.Line instance from an SVG element
+	 * @param element Element to parse
+	 * @param [options] Options object
+	 */
+	static fromElement(element: SVGElement, options?: ILineOptions): Line;
+	/**
+	 * Returns fabric.Line instance from an object representation
+	 * @param object Object to create an instance from
+	 */
+	static fromObject(object: any): Line;
+}
+
+interface IObjectOptions {
+	/**
+	 * Type of an object (rect, circle, path, etc.).
+	 * Note that this property is meant to be read-only and not meant to be modified.
+	 * If you modify, certain parts of Fabric (such as JSON loading) won't work correctly.
+	 */
+	type?: string;
+
+	/**
+	 * Horizontal origin of transformation of an object (one of "left", "right", "center")
+	 */
+	originX?: string;
+
+	/**
+	 * Vertical origin of transformation of an object (one of "top", "bottom", "center")
+	 */
+	originY?: string;
+
+	/**
+	 * Top position of an object. Note that by default it's relative to object center. You can change this by setting originY={top/center/bottom}
+	 */
+	top?: number;
+
+	/**
+	 * Left position of an object. Note that by default it's relative to object center. You can change this by setting originX={left/center/right}
+	 */
+	left?: number;
+
+	/**
+	 * Object width
+	 */
+	width?: number;
+
+	/**
+	 * Object height
+	 */
+	height?: number;
+
+	/**
+	 * Object scale factor (horizontal)
+	 */
+	scaleX?: number;
+
+	/**
+	 * Object scale factor (vertical)
+	 */
+	scaleY?: number;
+
+	/**
+	 * When true, an object is rendered as flipped horizontally
+	 */
+	flipX?: boolean;
+
+	/**
+	 * When true, an object is rendered as flipped vertically
+	 */
+	flipY?: boolean;
+
+	/**
+	 * Opacity of an object
+	 */
+	opacity?: number;
+
+	/**
+	 * Angle of rotation of an object (in degrees)
+	 */
+	angle?: number;
+
+	/**
+	 * When true, object's controlling corners are rendered as transparent inside (i.e. stroke instead of fill)
+	 */
+	transparentCorners?: boolean;
+
+	/**
+	 * Default cursor value used when hovering over this object on canvas
+	 */
+	hoverCursor?: string;
+
+	/**
+	 * Padding between object and its controlling borders (in pixels)
+	 */
+	padding?: number;
+
+	/**
+	 * Color of controlling borders of an object (when it's active)
+	 */
+	borderColor?: string;
+
+	/**
+	 * Color of controlling corners of an object (when it's active)
+	 */
+	cornerColor?: string;
+
+	/**
+	 * Array specifying dash pattern of an object's control (hasBorder must be true)
+	 */
+	cornerDashArray?: number[];
+
+	/**
+	 * Size of object's controlling corners (in pixels)
+	 */
+	cornerSize?: number;
+
+	/**
+	 * Color of controlling corners of an object (when it's active and transparentCorners false)
+	 */
+	cornerStrokeColor?: string;
+
+	/**
+	 * Specify style of control, 'rect' or 'circle'
+	 */
+	cornerStyle?: "rect" | "circle";
+
+	/**
+	 * When true, this object will use center point as the origin of transformation
+	 * when being scaled via the controls.
+	 * <b>Backwards incompatibility note:</b> This property replaces "centerTransform" (Boolean).
+	 */
+	centeredScaling?: boolean;
+
+	/**
+	 * When true, this object will use center point as the origin of transformation
+	 * when being rotated via the controls.
+	 * <b>Backwards incompatibility note:</b> This property replaces "centerTransform" (Boolean).
+	 */
+	centeredRotation?: boolean;
+
+	/**
+	 * Color of object's fill
+	 */
+	fill?: string;
+
+	/**
+	 * Fill rule used to fill an object
+	 * accepted values are nonzero, evenodd
+	 * Backwards incompatibility note: This property was used for setting globalCompositeOperation until v1.4.12, use `globalCompositeOperation` instead
+	 */
+	fillRule?: string;
+
+	/**
+	 * Composite rule used for canvas globalCompositeOperation
+	 */
+	globalCompositeOperation?: string;
+
+	/**
+	 * Background color of an object. Only works with text objects at the moment.
+	 */
+	backgroundColor?: string;
+
+	/**
+	 * When defined, an object is rendered via stroke and this property specifies its color
+	 */
+	stroke?: string;
+
+	/**
+	 * Width of a stroke used to render this object
+	 */
+	strokeWidth?: number;
+
+	/**
+	 * Array specifying dash pattern of an object's stroke (stroke must be defined)
+	 */
+	strokeDashArray?: any[];
+
+	/**
+	 * Line endings style of an object's stroke (one of "butt", "round", "square")
+	 */
+	strokeLineCap?: string;
+
+	/**
+	 * Corner style of an object's stroke (one of "bevil", "round", "miter")
+	 */
+	strokeLineJoin?: string;
+
+	/**
+	 * Maximum miter length (used for strokeLineJoin = "miter") of an object's stroke
+	 */
+	strokeMiterLimit?: number;
+
+	/**
+	 * Shadow object representing shadow of this shape
+	 */
+	shadow?: Shadow|string;
+
+	/**
+	 * Opacity of object's controlling borders when object is active and moving
+	 */
+	borderOpacityWhenMoving?: number;
+
+	/**
+	 * Scale factor of object's controlling borders
+	 */
+	borderScaleFactor?: number;
+
+	/**
+	 * Transform matrix (similar to SVG's transform matrix)
+	 */
+	transformMatrix?: any[];
+
+	/**
+	 * Minimum allowed scale value of an object
+	 */
+	minScaleLimit?: number;
+
+	/**
+	 * When set to `false`, an object can not be selected for modification (using either point-click-based or group-based selection).
+	 * But events still fire on it.
+	 */
+	selectable?: boolean;
+
+	/**
+	 * When set to `false`, an object can not be a target of events. All events propagate through it. Introduced in v1.3.4
+	 */
+	evented?: boolean;
+
+	/**
+	 * When set to `false`, an object is not rendered on canvas
+	 */
+	visible?: boolean;
+
+	/**
+	 * When set to `false`, object's controls are not displayed and can not be used to manipulate object
+	 */
+	hasControls?: boolean;
+
+	/**
+	 * When set to `false`, object's controlling borders are not rendered
+	 */
+	hasBorders?: boolean;
+
+	/**
+	 * When set to `false`, object's controlling rotating point will not be visible or selectable
+	 */
+	hasRotatingPoint?: boolean;
+
+	/**
+	 * Offset for object's controlling rotating point (when enabled via `hasRotatingPoint`)
+	 */
+	rotatingPointOffset?: number;
+
+	/**
+	 * When set to `true`, objects are "found" on canvas on per-pixel basis rather than according to bounding box
+	 */
+	perPixelTargetFind?: boolean;
+
+	/**
+	 * When `false`, default object's values are not included in its serialization
+	 */
+	includeDefaultValues?: boolean;
+
+	/**
+	 * Function that determines clipping of an object (context is passed as a first argument)
+	 * Note that context origin is at the object's center point (not left/top corner)
+	 */
+	clipTo?: Function;
+
+	/**
+	 * When `true`, object horizontal movement is locked
+	 */
+	lockMovementX?: boolean;
+
+	/**
+	 * When `true`, object vertical movement is locked
+	 */
+	lockMovementY?: boolean;
+
+	/**
+	 * When `true`, object rotation is locked
+	 */
+	lockRotation?: boolean;
+
+	/**
+	 * When `true`, object horizontal scaling is locked
+	 */
+	lockScalingX?: boolean;
+
+	/**
+	 * When `true`, object vertical scaling is locked
+	 */
+	lockScalingY?: boolean;
+
+	/**
+	 * When `true`, object non-uniform scaling is locked
+	 */
+	lockUniScaling?: boolean;
+
+	/**
+	 * When `true`, object cannot be flipped by scaling into negative values
+	 */
+	lockScalingFlip?: boolean;
+
+	/**
+	 * Not used by fabric, just for convenience
+	 */
+	name?: string;
+
+	/**
+	 * Not used by fabric, just for convenience
+	 */
+	data?: any;
+}
+export interface Object extends IObservable<Object>, IObjectOptions, IObjectAnimation<Object> {}
+export class Object {
+	getCurrentWidth(): number;
+	getCurrentHeight(): number;
+
+	getAngle(): number;
+	setAngle(value: number): Object;
+
+	getBorderColor(): string;
+	setBorderColor(value: string): Object;
+
+	getBorderScaleFactor(): number;
+
+	getCornersize(): number;
+	setCornersize(value: number): Object;
+
+	getFill(): string;
+	setFill(value: string): Object;
+
+	getFillRule(): string;
+	setFillRule(value: string): Object;
+
+	getFlipX(): boolean;
+	setFlipX(value: boolean): Object;
+
+	getFlipY(): boolean;
+	setFlipY(value: boolean): Object;
+
+	getHeight(): number;
+	setHeight(value: number): Object;
+
+	getLeft(): number;
+	setLeft(value: number): Object;
+
+	getOpacity(): number;
+	setOpacity(value: number): Object;
+
+	overlayFill: string;
+	getOverlayFill(): string;
+	setOverlayFill(value: string): Object;
+
+	getScaleX(): number;
+	setScaleX(value: number): Object;
+
+	getScaleY(): number;
+	setScaleY(value: number): Object;
+
+	setShadow(options: any): Object;
+	getShadow(): Object;
+
+	stateProperties: any[];
+	getTop(): number;
+	setTop(value: number): Object;
+
+	getWidth(): number;
+	setWidth(value: number): Object;
+
+	/* * Sets object's properties from options
+		* @param {Object} [options] Options object
+		*/
+	setOptions(options: IObjectOptions): void;
+
+	/**
+	 * Transforms context when rendering an object
+	 * @param ctx Context
+	 * @param fromLeft When true, context is transformed to object's top/left corner. This is used when rendering text on Node
+	 */
+	transform(ctx: CanvasRenderingContext2D, fromLeft: boolean): void;
+
+	/**
+	 * Returns an object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+
+	/**
+	 * Returns (dataless) object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	toDatalessObject(propertiesToInclude?: string[]): any;
+
+	/**
+	 * Returns a string representation of an instance
+	 */
+	toString(): string;
+
+	/**
+	 * Basic getter
+	 * @param property Property name
+	 */
+	get<K extends keyof this>(property: K): this[K];
+
+	/**
+	 * Sets property to a given value.
+	 * When changing position/dimension -related properties (left, top, scale, angle, etc.) `set` does not update position of object's borders/controls.
+	 * If you need to update those, call `setCoords()`.
+	 * @param key Property name
+	 * @param value Property value (if function, the value is passed into it and its return value is used as a new one)
+	 */
+	set<K extends keyof this>(key: K, value: this[K] | ((value: this[K]) => this[K])): this;
+	/**
+	 * Sets property to a given value.
+	 * When changing position/dimension -related properties (left, top, scale, angle, etc.) `set` does not update position of object's borders/controls.
+	 * If you need to update those, call `setCoords()`.
+	 * @param options Property object, iterate over the object properties
+	 */
+	set(options: Partial<this>): this;
+
+	/**
+	 * Toggles specified property from `true` to `false` or from `false` to `true`
+	 * @param property Property to toggle
+	 */
+	toggle(property: keyof this): this;
+
+	/**
+	 * Sets sourcePath of an object
+	 * @param value Value to set sourcePath to
+	 */
+	setSourcePath(value: string): this;
+
+	/**
+	 * Retrieves viewportTransform from Object's canvas if possible
+	 */
+	getViewportTransform(): boolean;
+
+	/**
+	 * Renders an object on a specified context
+	 * @param ctx Context to render on
+	 * @param [noTransform] When true, context is not transformed
+	 */
+	render(ctx: CanvasRenderingContext2D, noTransform?: boolean): void;
+
+	/**
+	 * Clones an instance, using a callback method will work for every object.
+	 * @param callback Callback is invoked with a clone as a first argument
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	clone(callback: (clone: Object) => void, propertiesToInclude?: string[]): void;
+
+	/**
+	 * Creates an instance of fabric.Image out of an object
+	 * @param callback callback, invoked with an instance as a first argument
+	 */
+	cloneAsImage(callback: (image: Image) => void): this;
+
+	/**
+	 * Converts an object into a data-url-like string
+	 * @param options Options object
+	 */
+	toDataURL(options: IDataURLOptions): string;
+
+	/**
+	 * Returns true if specified type is identical to the type of an instance
+	 * @param type Type to check against
+	 */
+	isType(type: string): boolean;
+
+	/**
+	 * Returns complexity of an instance
+	 */
+	complexity(): number;
+
+	/**
+	 * Returns a JSON representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	toJSON(propertiesToInclude?: string[]): any;
+
+	/**
+	 * Sets gradient (fill or stroke) of an object
+	 * **Backwards incompatibility note:** This method was named "setGradientFill" until v1.1.0
+	 * @param property Property name 'stroke' or 'fill'
+	 * @param [options] Options object
+	 */
+	setGradient(property: "stroke" | "fill", options: IGradientOptions): this;
+	/**
+	 * Sets pattern fill of an object
+	 * @param options Options object
+	 */
+	setPatternFill(options: IFillOptions): this;
+
+	/**
+	 * Sets shadow of an object
+	 * @param [options] Options object or string (e.g. "2px 2px 10px rgba(0,0,0,0.2)")
+	 */
+	setShadow(options?: string | Shadow): this;
+
+	/**
+	 * Sets "color" of an instance (alias of `set('fill', …)`)
+	 * @param color Color value
+	 */
+	setColor(color: string): this;
+
+	/**
+	 * Sets "angle" of an instance
+	 * @param angle Angle value
+	 */
+	setAngle(angle: number): this;
+
+	/**
+	 * Sets "angle" of an instance
+	 * @param angle Angle value
+	 */
+	rotate(angle: number): this;
+
+	/**
+	 * Centers object horizontally on canvas to which it was added last.
+	 * You might need to call `setCoords` on an object after centering, to update controls area.
+	 */
+	centerH(): this;
+
+	/**
+	 * Centers object vertically on canvas to which it was added last.
+	 * You might need to call `setCoords` on an object after centering, to update controls area.
+	 */
+	centerV(): this;
+
+	/**
+	 * Centers object vertically and horizontally on canvas to which is was added last
+	 * You might need to call `setCoords` on an object after centering, to update controls area.
+	 */
+	center(): this;
+
+	/**
+	 * Removes object from canvas to which it was added last
+	 */
+	remove(): Object;
+
+	/**
+	 * Returns coordinates of a pointer relative to an object
+	 * @param e Event to operate upon
+	 * @param [pointer] Pointer to operate upon (instead of event)
+	 */
+	getLocalPointer(e: Event, pointer?: { x: number, y: number }): { x: number, y: number };
+
+	/**
+	 * Sets object's properties from options
+	 * @param [options] Options object
+	 */
+	setOptions(options: any): void;
+	/**
+	 * Sets sourcePath of an object
+	 * @param value Value to set sourcePath to
+	 */
+	setSourcePath(value: string): Object;
+	// functions from object svg export mixin
+	// -----------------------------------------------------------------------------------------------------------------------------------
+	/**
+	 * Returns styles-string for svg-export
+	 */
+	getSvgStyles(): string;
+	/**
+	 * Returns transform-string for svg-export
+	 */
+	getSvgTransform(): string;
+	/**
+	 * Returns transform-string for svg-export from the transform matrix of single elements
+	 */
+	getSvgTransformMatrix(): string;
+
+	// functions from stateful mixin
+	// -----------------------------------------------------------------------------------------------------------------------------------
+	/**
+	 * Returns true if object state (one of its state properties) was changed
+	 */
+	hasStateChanged(): boolean;
+	/**
+	 * Saves state of an object
+	 * @param [options] Object with additional `stateProperties` array to include when saving state
+	 * @return thisArg
+	 */
+	saveState(options?: { stateProperties: any[] }): this;
+	/**
+	 * Setups state of an object
+	 */
+	setupState(): this;
+	// functions from object straightening mixin
+	// -----------------------------------------------------------------------------------------------------------------------------------
+	/**
+	 * Straightens an object (rotating it from current angle to one of 0, 90, 180, 270, etc. depending on which is closer)
+	 */
+	straighten(): this;
+	/**
+	 * Same as straighten but with animation
+	 */
+	fxStraighten(callbacks: Callbacks): this;
+
+	// functions from object stacking mixin
+	// -----------------------------------------------------------------------------------------------------------------------------------
+	/**
+	 * Moves an object up in stack of drawn objects
+	 * @param [intersecting] If `true`, send object in front of next upper intersecting object
+	 */
+	bringForward(intersecting?: boolean): this;
+	/**
+	 * Moves an object to the top of the stack of drawn objects
+	 */
+	bringToFront(): this;
+	/**
+	 * Moves an object down in stack of drawn objects
+	 * @param [intersecting] If `true`, send object behind next lower intersecting object
+	 */
+	sendBackwards(intersecting?: boolean): this;
+	/**
+	 * Moves an object to the bottom of the stack of drawn objects
+	 */
+	sendToBack(): this;
+	/**
+	 * Moves an object to specified level in stack of drawn objects
+	 * @param index New position of object
+	 */
+	moveTo(index: number): this;
+
+	// functions from object origin mixin
+	// -----------------------------------------------------------------------------------------------------------------------------------
+	/**
+	 * Translates the coordinates from origin to center coordinates (based on the object's dimensions)
+	 * @param point The point which corresponds to the originX and originY params
+	 * @param originX Horizontal origin: 'left', 'center' or 'right'
+	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
+	 */
+	translateToCenterPoint(point: Point, originX: string, originY: string): Point;
+
+	/**
+	 * Translates the coordinates from center to origin coordinates (based on the object's dimensions)
+	 * @param center The point which corresponds to center of the object
+	 * @param originX Horizontal origin: 'left', 'center' or 'right'
+	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
+	 */
+	translateToOriginPoint(center: Point, originX: string, originY: string): Point;
+	/**
+	 * Returns the real center coordinates of the object
+	 */
+	getCenterPoint(): Point;
+
+	/**
+	 * Returns the coordinates of the object as if it has a different origin
+	 * @param originX Horizontal origin: 'left', 'center' or 'right'
+	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
+	 */
+	getPointByOrigin(): Point;
+
+	/**
+	 * Returns the point in local coordinates
+	 * @param point The point relative to the global coordinate system
+	 * @param originX Horizontal origin: 'left', 'center' or 'right'
+	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
+	 */
+	toLocalPoint(point: Point, originX: string, originY: string): Point;
+
+	/**
+	 * Sets the position of the object taking into consideration the object's origin
+	 * @param pos The new position of the object
+	 * @param originX Horizontal origin: 'left', 'center' or 'right'
+	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
+	 */
+	setPositionByOrigin(pos: Point, originX: string, originY: string): void;
+
+	/**
+	 * @param to One of 'left', 'center', 'right'
+	 */
+	adjustPosition(to: string): void;
+
+	// functions from interactivity mixin
+	// -----------------------------------------------------------------------------------------------------------------------------------
+	/**
+	 * Draws borders of an object's bounding box.
+	 * Requires public properties: width, height
+	 * Requires public options: padding, borderColor
+	 * @param ctx Context to draw on
+	 */
+	drawBorders(context: CanvasRenderingContext2D): this;
+
+	/**
+	 * Draws corners of an object's bounding box.
+	 * Requires public properties: width, height
+	 * Requires public options: cornerSize, padding
+	 * @param ctx Context to draw on
+	 */
+	drawCorners(context: CanvasRenderingContext2D): Object;
+
+	/**
+	 * Returns true if the specified control is visible, false otherwise.
+	 * @param controlName The name of the control. Possible values are 'tl', 'tr', 'br', 'bl', 'ml', 'mt', 'mr', 'mb', 'mtr'.
+	 */
+	isControlVisible(controlName: string): boolean;
+	/**
+	 * Sets the visibility of the specified control.
+	 * @param controlName The name of the control. Possible values are 'tl', 'tr', 'br', 'bl', 'ml', 'mt', 'mr', 'mb', 'mtr'.
+	 * @param visible true to set the specified control visible, false otherwise
+	 */
+	setControlVisible(controlName: string, visible: boolean): this;
+
+	/**
+	 * Sets the visibility state of object controls.
+	 * @param [options] Options object
+	 */
+	setControlsVisibility(options?: {
+		bl?: boolean;
+		br?: boolean;
+		mb?: boolean;
+		ml?: boolean;
+		mr?: boolean;
+		mt?: boolean;
+		tl?: boolean;
+		tr?: boolean;
+		mtr?: boolean; }): this;
+
+	// functions from geometry mixin
+	// -------------------------------------------------------------------------------------------------------------------------------
+	/**
+	 * Sets corner position coordinates based on current angle, width and height
+	 * See https://github.com/kangax/fabric.js/wiki/When-to-call-setCoords
+	 */
+	setCoords(): this;
+	/**
+	 * Returns coordinates of object's bounding rectangle (left, top, width, height)
+	 * @return Object with left, top, width, height properties
+	 */
+	getBoundingRect(): { left: number; top: number; width: number; height: number };
+	/**
+	 * Checks if object is fully contained within area of another object
+	 * @param other Object to test
+	 */
+	isContainedWithinObject(other: Object): boolean;
+	/**
+	 * Checks if object is fully contained within area formed by 2 points
+	 * @param pointTL top-left point of area
+	 * @param pointBR bottom-right point of area
+	 */
+	isContainedWithinRect(pointTL: any, pointBR: any): boolean;
+	/**
+	 * Checks if point is inside the object
+	 * @param point Point to check against
+	 */
+	containsPoint(point: Point): boolean;
+	/**
+	 * Scales an object (equally by x and y)
+	 * @param value Scale factor
+	 * @return thisArg
+	 */
+	scale(value: number): this;
+	/**
+	 * Scales an object to a given height, with respect to bounding box (scaling by x/y equally)
+	 * @param value New height value
+	 */
+	scaleToHeight(value: number): this;
+	/**
+	 * Scales an object to a given width, with respect to bounding box (scaling by x/y equally)
+	 * @param value New width value
+	 */
+	scaleToWidth(value: number): this;
+	/**
+	 * Checks if object intersects with another object
+	 * @param other Object to test
+	 */
+	intersectsWithObject(other: Object): boolean;
+	/**
+	 * Checks if object intersects with an area formed by 2 points
+	 * @param pointTL top-left point of area
+	 * @param pointBR bottom-right point of area
+	 */
+	intersectsWithRect(pointTL: any, pointBR: any): boolean;
+}
+
+interface IPathOptions extends IObjectOptions {
+	/**
+	 * Array of path points
+	 */
+	path?: any[];
+
+	/**
+	 * Minimum X from points values, necessary to offset points
+	 */
+	minX?: number;
+
+	/**
+	 * Minimum Y from points values, necessary to offset points
+	 */
+	minY?: number;
+}
+export interface Path extends Object, IPathOptions {}
+export class Path {
+	/**
+	 * Constructor
+	 * @param path Path data (sequence of coordinates and corresponding "command" tokens)
+	 * @param [options] Options object
+	 */
+	constructor(path?: string|any[], options?: IPathOptions);
+
+	initialize(path?: any[], options?: IPathOptions): Path;
+
+	/**
+	 * Returns number representation of an instance complexity
+	 * @return complexity of this instance
+	 */
+	complexity(): number;
+
+	/**
+	 * Renders path on a specified context
+	 * @param ctx context to render path on
+	 * @param [noTransform] When true, context is not transformed
+	 */
+	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
+	/**
+	 * Returns dataless object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
+	 */
+	toDatalessObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns string representation of an instance
+	 * @return string representation of an instance
+	 */
+	toString(): string;
+	/**
+	 * Returns svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+
+	/**
+	 * Creates an instance of fabric.Path from an SVG <path> element
+	 * @param element to parse
+	 * @param callback Callback to invoke when an fabric.Path instance is created
+	 * @param [options] Options object
+	 */
+	static fromElement(element: SVGElement, callback: (path: Path) => any, options?: IPathOptions): void;
+	/**
+	 * Creates an instance of fabric.Path from an object
+	 * @param callback Callback to invoke when an fabric.Path instance is created
+	 */
+	static fromObject(object: any, callback: (path: Path) => any): void;
+}
+
+export class PathGroup extends Object {
+	/**
+	 * Constructor
+	 * @param [options] Options object
+	 */
+	constructor(paths: Path[], options?: IObjectOptions);
+
+	initialize(paths: Path[], options?: IObjectOptions): void;
+	/**
+	 * Returns number representation of object's complexity
+	 * @return complexity
+	 */
+	complexity(): number;
+	/**
+	 * Returns true if all paths in this group are of same color
+	 * @return true if all paths are of the same color (`fill`)
+	 */
+	isSameColor(): boolean;
+	/**
+	 * Renders this group on a specified context
+	 * @param ctx Context to render this instance on
+	 */
+	render(ctx: CanvasRenderingContext2D): void;
+	/**
+	 * Returns dataless object representation of this path group
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return dataless object representation of an instance
+	 */
+	toDatalessObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns object representation of this path group
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns a string representation of this path group
+	 * @return string representation of an object
+	 */
+	toString(): string;
+	/**
+	 * Returns svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+	/**
+	 * Returns all paths in this path group
+	 * @return array of path objects included in this path group
+	 */
+	getObjects(): Path[];
+
+	static fromObject(object: any): PathGroup;
+	/**
+	 * Creates fabric.PathGroup instance from an object representation
+	 * @param object Object to create an instance from
+	 * @param callback Callback to invoke when an fabric.PathGroup instance is created
+	 */
+	static fromObject(object: any, callback: (group: PathGroup) => any): void;
+}
+
+interface IPolygonOptions extends IObjectOptions {
+	/**
+	 * Points array
+	 */
+	points?: Point[];
+
+	/**
+	 * Minimum X from points values, necessary to offset points
+	 */
+	minX?: number;
+
+	/**
+	 * Minimum Y from points values, necessary to offset points
+	 */
+	minY?: number;
+}
+export interface Polygon extends IPolygonOptions {}
+export class Polygon extends Object {
+	/**
+	 * Constructor
+	 * @param points Array of points
+	 * @param [options] Options object
+	 */
+	constructor(points: Array<{ x: number; y: number }>, options?: IObjectOptions, skipOffset?: boolean);
+
+	/**
+	 * Returns complexity of an instance
+	 * @return complexity of this instance
+	 */
+	complexity(): number;
+
+	/**
+	 * Returns object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+
+	/**
+	 * List of attribute names to account for when parsing SVG element (used by `fabric.Polygon.fromElement`)
+	 */
+	static ATTRIBUTE_NAMES: string[];
+
+	/**
+	 * Returns Polygon instance from an SVG element
+	 * @param element Element to parse
+	 * @param [options] Options object
+	 */
+	static fromElement(element: SVGElement, options?: IPolygonOptions): Polygon;
+	/**
+	 * Returns fabric.Polygon instance from an object representation
+	 * @param object Object to create an instance from
+	 */
+	static fromObject(object: any): Polygon;
+}
+
+interface IPolylineOptions extends IObjectOptions {
+	/**
+	 * Points array
+	 */
+	points?: Point[];
+
+	/**
+	 * Minimum X from points values, necessary to offset points
+	 */
+	minX?: number;
+
+	/**
+	 * Minimum Y from points values, necessary to offset points
+	 */
+	minY?: number;
+}
+export interface Polyline extends IPolylineOptions {}
+export class Polyline extends Object {
+	/**
+	 * Constructor
+	 * @param points Array of points (where each point is an object with x and y)
+	 * @param [options] Options object
+	 * @param [skipOffset] Whether points offsetting should be skipped
+	 */
+	constructor(points: Array<{ x: number; y: number }>, options?: IPolylineOptions);
+	initialize(points: Point[], options?: IPolylineOptions): void;
+	/**
+	 * Returns complexity of an instance
+	 * @return complexity of this instance
+	 */
+	complexity(): number;
+	/**
+	 * Returns object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return Object representation of an instance
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns SVG representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+
+	/**
+	 * List of attribute names to account for when parsing SVG element (used by `fabric.Polygon.fromElement`)
+	 */
+	static ATTRIBUTE_NAMES: string[];
+
+	/**
+	 * Returns Polyline  instance from an SVG element
+	 * @param element Element to parse
+	 * @param [options] Options object
+	 */
+	static fromElement(element: SVGElement, options?: IPolylineOptions): Polyline;
+	/**
+	 * Returns fabric.Polyline instance from an object representation
+	 * @param object Object to create an instance from
+	 */
+	static fromObject(object: any): Polyline;
+}
+
+interface IRectOptions extends IObjectOptions {
+	x?: number;
+	y?: number;
+	/**
+	 * Horizontal border radius
+	 */
+	rx?: number;
+
+	/**
+	 * Vertical border radius
+	 */
+	ry?: number;
+}
+
+export interface Rect extends IRectOptions {}
+export class Rect extends Object {
+	/**
+	 * Constructor
+	 * @param [options] Options object
+	 */
+	constructor(options?: IRectOptions);
+	initialize(points?: number[], options?: any): Rect;
+	/**
+	 * Returns complexity of an instance
+	 * @return complexity
+	 */
+	complexity(): number;
+	/**
+	 * Returns object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
+	 */
+	toObject(propertiesToInclude: any[]): any;
+	/**
+	 * Returns svg representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+
+	/**
+	 * List of attribute names to account for when parsing SVG element (used by `fabric.Rect.fromElement`)
+	 */
+	static ATTRIBUTE_NAMES: string[];
+	/**
+	 * Returns Rect instance from an SVG element
+	 * @param element Element to parse
+	 * @param [options] Options object
+	 */
+	static fromElement(element: SVGElement, options?: IRectOptions): Rect;
+	/**
+	 * Returns Rect instance from an object representation
+	 * @param object Object to create an instance from
+	 */
+	static fromObject(object: any): Rect;
+}
+
+interface ITextOptions extends IObjectOptions {
+	/**
+	 * Font size (in pixels)
+	 */
+	fontSize?: number;
+	/**
+	 * Font weight (e.g. bold, normal, 400, 600, 800)
+	 */
+	fontWeight?: number|string;
+	/**
+	 * Font family
+	 */
+	fontFamily?: string;
+	/**
+	 * Text decoration Possible values?: "", "underline", "overline" or "line-through".
+	 */
+	textDecoration?: string;
+	/**
+	 * Text alignment. Possible values?: "left", "center", or "right".
+	 */
+	textAlign?: string;
+	/**
+	 * Font style . Possible values?: "", "normal", "italic" or "oblique".
+	 */
+	fontStyle?: string;
+	/**
+	 * Line height
+	 */
+	lineHeight?: number;
+	/**
+	 * When defined, an object is rendered via stroke and this property specifies its color.
+	 * <b>Backwards incompatibility note?:</b> This property was named "strokeStyle" until v1.1.6
+	 */
+	stroke?: string;
+	/**
+	 * Shadow object representing shadow of this shape.
+	 * <b>Backwards incompatibility note?:</b> This property was named "textShadow" (String) until v1.2.11
+	 */
+	shadow?: Shadow|string;
+	/**
+	 * Background color of text lines
+	 */
+	textBackgroundColor?: string;
+
+	path?: string;
+	useNative?: boolean;
+	text?: string;
+}
+export interface Text extends ITextOptions {}
+export class Text extends Object {
+	/**
+	 * Constructor
+	 * @param text Text string
+	 * @param [options] Options object
+	 */
+	constructor(text: string, options?: ITextOptions);
+	/**
+	 * Returns complexity of an instance
+	 */
+	complexity(): number;
+	/**
+	 * Returns string representation of an instance
+	 */
+	toString(): string;
+	/**
+	 * Renders text instance on a specified context
+	 * @param ctx Context to render on
+	 */
+	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
+	/**
+	 * Returns object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+	/**
+	 * Returns SVG representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 */
+	toSVG(reviver?: Function): string;
+	/**
+	 * Retrieves object's fontSize
+	 */
+	getFontSize(): number;
+	/**
+	 * Sets object's fontSize
+	 * @param fontSize Font size (in pixels)
+	 */
+	setFontSize(fontSize: number): Text;
+	/**
+	 * Retrieves object's fontWeight
+	 */
+	getFontWeight(): number|string;
+	/**
+	 * Sets object's fontWeight
+	 * @param fontWeight Font weight
+	 */
+	setFontWeight(fontWeight: string|number): Text;
+	/**
+	 * Retrieves object's fontFamily
+	 */
+	getFontFamily(): string;
+	/**
+	 * Sets object's fontFamily
+	 * @param fontFamily Font family
+	 */
+	setFontFamily(fontFamily: string): Text;
+	/**
+	 * Retrieves object's text
+	 */
+	getText(): string;
+	/**
+	 * Sets object's text
+	 * @param text Text
+	 */
+	setText(text: string): Text;
+	/**
+	 * Retrieves object's textDecoration
+	 */
+	getTextDecoration(): string;
+	/**
+	 * Sets object's textDecoration
+	 * @param textDecoration Text decoration
+	 */
+	setTextDecoration(textDecoration: string): Text;
+	/**
+	 * Retrieves object's fontStyle
+	 */
+	getFontStyle(): string;
+	/**
+	 * Sets object's fontStyle
+	 * @param fontStyle Font style
+	 */
+	setFontStyle(fontStyle: string): Text;
+	/**
+	 * Retrieves object's lineHeight
+	 */
+	getLineHeight(): number;
+	/**
+	 * Sets object's lineHeight
+	 * @param lineHeight Line height
+	 */
+	setLineHeight(lineHeight: number): Text;
+	/**
+	 * Retrieves object's textAlign
+	 */
+	getTextAlign(): string;
+	/**
+	 * Sets object's textAlign
+	 * @param textAlign Text alignment
+	 */
+	setTextAlign(textAlign: string): Text;
+	/**
+	 * Retrieves object's textBackgroundColor
+	 */
+	getTextBackgroundColor(): string;
+	/**
+	 * Sets object's textBackgroundColor
+	 * @param textBackgroundColor Text background color
+	 */
+	setTextBackgroundColor(textBackgroundColor: string): Text;
+
+	/**
+	 * List of attribute names to account for when parsing SVG element (used by `fabric.Text.fromElement`)
+	 */
+	static ATTRIBUTE_NAMES: string[];
+	/**
+	 * Default SVG font size
+	 */
+	static DEFAULT_SVG_FONT_SIZE: number;
+
+	/**
+	 * Returns fabric.Text instance from an SVG element (<b>not yet implemented</b>)
+	 * @param element Element to parse
+	 * @param [options] Options object
+	 */
+	static fromElement(element: SVGElement, options?: ITextOptions): Text;
+	/**
+	 * Returns fabric.Text instance from an object representation
+	 * @param object Object to create an instance from
+	 */
+	static fromObject(object: any): Text;
+}
+
+interface IITextOptions extends IObjectOptions, ITextOptions {
+	/**
+	 * Index where text selection starts (or where cursor is when there is no selection)
+	 */
+	selectionStart?: number;
+
+	/**
+	 * Index where text selection ends
+	 */
+	selectionEnd?: number;
+
+	/**
+	 * Color of text selection
+	 */
+	selectionColor?: string;
+
+	/**
+	 * Indicates whether text is in editing mode
+	 */
+	isEditing?: boolean;
+
+	/**
+	 * Indicates whether a text can be edited
+	 */
+	editable?: boolean;
+
+	/**
+	 * Border color of text object while it's in editing mode
+	 */
+	editingBorderColor?: string;
+
+	/**
+	 * Width of cursor (in px)
+	 */
+	cursorWidth?: number;
+
+	/**
+	 * Color of default cursor (when not overwritten by character style)
+	 */
+	cursorColor?: string;
+
+	/**
+	 * Delay between cursor blink (in ms)
+	 */
+	cursorDelay?: number;
+
+	/**
+	 * Duration of cursor fadein (in ms)
+	 */
+	cursorDuration?: number;
+
+	/**
+	 * Object containing character styles
+	 * (where top-level properties corresponds to line number and 2nd-level properties -- to char number in a line)
+	 */
+	styles?: any;
+
+	/**
+	 * Indicates whether internal text char widths can be cached
+	 */
+	caching?: boolean;
+}
+export interface IText extends Text, IITextOptions {}
+export class IText extends Object {
+	/**
+	 * Constructor
+	 * @param text Text string
+	 * @param [options] Options object
+	 */
+	constructor(text: string, options?: IITextOptions);
+	/**
+	 * Returns true if object has no styling
+	 */
+	isEmptyStyles(): boolean;
+	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
+	/**
+	 * Returns object representation of an instance
+	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
+	 * @return object representation of an instance
+	 */
+	toObject(propertiesToInclude?: string[]): any;
+
+	setText(value: string): Text;
+	/**
+	 * Sets selection start (left boundary of a selection)
+	 * @param index Index to set selection start to
+	 */
+	setSelectionStart(index: number): void;
+	/**
+	 * Sets selection end (right boundary of a selection)
+	 * @param index Index to set selection end to
+	 */
+	setSelectionEnd(index: number): void;
+	/**
+	 * Gets style of a current selection/cursor (at the start position)
+	 * @param [startIndex] Start index to get styles at
+	 * @param [endIndex] End index to get styles at
+	 * @return styles Style object at a specified (or current) index
+	 */
+	getSelectionStyles(startIndex: number, endIndex: number): any;
+	/**
+	 * Sets style of a current selection
+	 * @param [styles] Styles object
+	 * @return thisArg
+	 * @chainable
+	 */
+	setSelectionStyles(styles: any): Text;
+
+	/**
+	 * Renders cursor or selection (depending on what exists)
+	 */
+	renderCursorOrSelection(): void;
+
+	/**
+	 * Returns 2d representation (lineIndex and charIndex) of cursor (or selection start)
+	 * @param [selectionStart] Optional index. When not given, current selectionStart is used.
+	 */
+	get2DCursorLocation(selectionStart?: number): void;
+	/**
+	 * Returns complete style of char at the current cursor
+	 * @param lineIndex Line index
+	 * @param charIndex Char index
+	 * @return Character style
+	 */
+	getCurrentCharStyle(lineIndex: number, charIndex: number): any;
+
+	/**
+	 * Returns fontSize of char at the current cursor
+	 * @param lineIndex Line index
+	 * @param charIndex Char index
+	 * @return Character font size
+	 */
+	getCurrentCharFontSize(lineIndex: number, charIndex: number): number;
+
+	/**
+	 * Returns color (fill) of char at the current cursor
+	 * @param lineIndex Line index
+	 * @param charIndex Char index
+	 * @return Character color (fill)
+	 */
+	getCurrentCharColor(lineIndex: number, charIndex: number): string;
+	/**
+	 * Renders cursor
+	 */
+	renderCursor(boundaries: any): void;
+
+	/**
+	 * Renders text selection
+	 * @param chars Array of characters
+	 * @param boundaries Object with left/top/leftOffset/topOffset
+	 */
+	renderSelection(chars: string[], boundaries: any): void;
+
+	// functions from itext behavior mixin
+	// ------------------------------------------------------------------------------------------------------------------------
+	/**
+	 * Initializes all the interactive behavior of IText
+	 */
+	initBehavior(): void;
+
+	/**
+	 * Initializes "selected" event handler
+	 */
+	initSelectedHandler(): void;
+
+	/**
+	 * Initializes "added" event handler
+	 */
+	initAddedHandler(): void;
+
+	initRemovedHandler(): void;
+
+	/**
+	 * Initializes delayed cursor
+	 */
+	initDelayedCursor(restart: boolean): void;
+
+	/**
+	 * Aborts cursor animation and clears all timeouts
+	 */
+	abortCursorAnimation(): void;
+
+	/**
+	 * Selects entire text
+	 */
+	selectAll(): void;
+
+	/**
+	 * Returns selected text
+	 */
+	getSelectedText(): string;
+
+	/**
+	 * Find new selection index representing start of current word according to current selection index
+	 * @param startFrom Surrent selection index
+	 * @return New selection index
+	 */
+	findWordBoundaryLeft(startFrom: number): number;
+
+	/**
+	 * Find new selection index representing end of current word according to current selection index
+	 * @param startFrom Current selection index
+	 * @return New selection index
+	 */
+	findWordBoundaryRight(startFrom: number): number;
+
+	/**
+	 * Find new selection index representing start of current line according to current selection index
+	 * @param startFrom Current selection index
+	 */
+	findLineBoundaryLeft(startFrom: number): number;
+
+	/**
+	 * Find new selection index representing end of current line according to current selection index
+	 * @param startFrom Current selection index
+	 */
+	findLineBoundaryRight(startFrom: number): number;
+
+	/**
+	 * Returns number of newlines in selected text
+	 */
+	getNumNewLinesInSelectedText(): number;
+
+	/**
+	 * Finds index corresponding to beginning or end of a word
+	 * @param selectionStart Index of a character
+	 * @param direction: 1 or -1
+	 */
+	searchWordBoundary(selectionStart: number, direction: number): number;
+
+	/**
+	 * Selects a word based on the index
+	 * @param selectionStart Index of a character
+	 */
+	selectWord(selectionStart: number): void;
+	/**
+	 * Selects a line based on the index
+	 * @param selectionStart Index of a character
+	 */
+	selectLine(selectionStart: number): void;
+
+	/**
+	 * Enters editing state
+	 */
+	enterEditing(): IText;
+
+	/**
+	 * Initializes "mousemove" event handler
+	 */
+	initMouseMoveHandler(): void;
+	/**
+	 * Exits from editing state
+	 * @return thisArg
+	 * @chainable
+	 */
+	exitEditing(): IText;
+
+	/**
+	 * Inserts a character where cursor is (replacing selection if one exists)
+	 * @param _chars Characters to insert
+	 */
+	insertChars(_chars: string, useCopiedStyle?: boolean): void;
+	/**
+	 * Inserts new style object
+	 * @param lineIndex Index of a line
+	 * @param charIndex Index of a char
+	 * @param isEndOfLine True if it's end of line
+	 */
+	insertNewlineStyleObject(lineIndex: number, charIndex: number, isEndOfLine: boolean): void;
+
+	/**
+	 * Inserts style object for a given line/char index
+	 * @param lineIndex Index of a line
+	 * @param charIndex Index of a char
+	 * @param [style] Style object to insert, if given
+	 */
+	insertCharStyleObject(lineIndex: number, charIndex: number, isEndOfLine: boolean): void;
+
+	/**
+	 * Inserts style object(s)
+	 * @param _chars Characters at the location where style is inserted
+	 * @param isEndOfLine True if it's end of line
+	 * @param [useCopiedStyle] Style to insert
+	 */
+	insertStyleObjects(_chars: string, isEndOfLine: boolean, useCopiedStyle?: boolean): void;
+
+	/**
+	 * Shifts line styles up or down
+	 * @param lineIndex Index of a line
+	 * @param offset Can be -1 or +1
+	 */
+	shiftLineStyles(lineIndex: number, offset: number): void;
+
+	/**
+	 * Removes style object
+	 * @param isBeginningOfLine True if cursor is at the beginning of line
+	 * @param [index] Optional index. When not given, current selectionStart is used.
+	 */
+	removeStyleObject(isBeginningOfLine: boolean, index?: number): void;
+	/**
+	 * Inserts new line
+	 */
+	insertNewline(): void;
+
+	/**
+	 * Returns fabric.IText instance from an object representation
+	 * @param object Object to create an instance from
+	 */
+	static fromObject(object: any): IText;
+}
+
+interface ITriangleOptions extends IObjectOptions { }
+export class Triangle extends Object {
+	/**
+	 * Constructor
+	 * @param [options] Options object
+	 */
+	constructor(options?: ITriangleOptions);
+
+	/**
+	 * Returns complexity of an instance
+	 * @return complexity of this instance
+	 */
+	complexity(): number;
+	/**
+	 * Returns SVG representation of an instance
+	 * @param [reviver] Method for further parsing of svg representation.
+	 * @return svg representation of an instance
+	 */
+	toSVG(reviver?: Function): string;
+
+	/**
+	 * Returns Triangle instance from an object representation
+	 * @param object Object to create an instance from
+	 */
+	static fromObject(object: any): Triangle;
+}
+
+////////////////////////////////////////////////////////////
+// Filters
+////////////////////////////////////////////////////////////
+interface IAllFilters {
+	BaseFilter: {
+		/**
+		 * Constructor
+		 * @param [options] Options object
+		 */
+		new (options?: any): IBaseFilter;
+	};
+	Blend: {
+		/**
+		 * Constructor
+		 * @param [options] Options object
+		 */
+		new (options?: { color?: string; mode?: string; alpha?: number; image?: Image }): IBlendFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IBlendFilter
+	};
+	Brightness: {
+		new (options?: {
+			/**
+			 * Value to brighten the image up (0..255)
+			 * @default 0
+			 */
+			brightness: number
+		}): IBrightnessFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IBrightnessFilter
+	};
+	Convolute: {
+		new (options?: {
+			opaque?: boolean,
+			/** Filter matrix */
+			matrix?: number[],
+		}): IConvoluteFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IConvoluteFilter
+	};
+	GradientTransparency: {
+		new (options?: {
+			/** @default 100 */
+			threshold?: number;
+		}): IGradientTransparencyFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IGradientTransparencyFilter
+	};
+	Grayscale: {
+		new (options?: any): IGrayscaleFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IGrayscaleFilter
+	};
+	Invert: {
+		/**
+		 * Constructor
+		 * @param [options] Options object
+		 */
+		new (options?: any): IInvertFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IInvertFilter
+	};
+	Mask: {
+		new (options?: {
+			/** Mask image object */
+			mask?: Image,
+			/**
+			 * Rgb channel (0, 1, 2 or 3)
+			 * @default 0
+			 */
+			channel: number,
+		}): IMaskFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IMaskFilter
+	};
+	Multiply: {
+		new (options?: {
+			/**
+			 * Color to multiply the image pixels with
+			 * @default #000000
+			 */
+			color: string;
+		}): IMultiplyFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IMultiplyFilter
+	};
+	Noise: {
+		new (options?: {
+			/** @default 0 */
+			noise: number,
+		}): INoiseFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): INoiseFilter
+	};
+	Pixelate: {
+		new (options?: {
+			/**
+			 * Blocksize for pixelate
+			 * @default 4
+			 */
+			blocksize?: number,
+		}): IPixelateFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IPixelateFilter
+	};
+	RemoveWhite: {
+		new (options?: {
+			/** @default 30 */
+			threshold?: number,
+			/** @default 20 */
+			distance?: number,
+		}): IRemoveWhiteFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IRemoveWhiteFilter
+	};
+	Resize: {
+		new (options?: any): IResizeFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): IResizeFilter
+	};
+	Sepia2: {
+		new (options?: any): ISepia2Filter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): ISepia2Filter
+	};
+	Sepia: {
+		new (options?: any): ISepiaFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): ISepiaFilter
+	};
+	Tint: {
+		new (options?: {
+			/**
+			 * Color to tint the image with
+			 * @default #000000
+			 */
+			color?: string;
+			/** Opacity value that controls the tint effect's transparency (0..1) */
+			opacity?: number;
+		}): ITintFilter;
+		/**
+		 * Returns filter instance from an object representation
+		 * @param object Object to create an instance from
+		 */
+		fromObject(object: any): ITintFilter
+	};
+}
+interface IBaseFilter {
+	/**
+	 * Sets filter's properties from options
+	 * @param [options] Options object
+	 */
+	setOptions(options?: any): void;
+	/**
+	 * Returns object representation of an instance
+	 */
+	toObject(): any;
+	/**
+	 * Returns a JSON representation of an instance
+	 */
+	toJSON(): string;
+}
+interface IBlendFilter extends IBaseFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface IBrightnessFilter extends IBaseFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface IConvoluteFilter extends IBaseFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface IGradientTransparencyFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface IGrayscaleFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface IInvertFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface IMaskFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface IMultiplyFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface INoiseFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface IPixelateFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface IRemoveWhiteFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface IResizeFilter {
+	/**
+	 * Resize type
+	 */
+	resizeType: string;
+
+	/**
+	 * Scale factor for resizing, x axis
+	 */
+	scaleX: number;
+
+	/**
+	 * Scale factor for resizing, y axis
+	 */
+	scaleY: number;
+
+	/**
+	 * LanczosLobes parameter for lanczos filter
+	 */
+	lanczosLobes: number;
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface ISepiaFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface ISepia2Filter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+interface ITintFilter {
+	/**
+	 * Applies filter to canvas element
+	 * @param canvasEl Canvas element to apply filter to
+	 */
+	applyTo(canvasEl: HTMLCanvasElement): void;
+}
+
+////////////////////////////////////////////////////////////
+// Brushes
+////////////////////////////////////////////////////////////
+export class BaseBrush {
+	/**
+	 * Color of a brush
+	 */
+	color: string;
+
+	/**
+	 * Width of a brush
+	 */
+	width: number;
+
+	/**
+	 * Shadow object representing shadow of this shape.
+	 * <b>Backwards incompatibility note:</b> This property replaces "shadowColor" (String), "shadowOffsetX" (Number),
+	 * "shadowOffsetY" (Number) and "shadowBlur" (Number) since v1.2.12
+	 */
+	shadow: Shadow|string;
+	/**
+	 * Line endings style of a brush (one of "butt", "round", "square")
+	 */
+	strokeLineCap: string;
+
+	/**
+	 * Corner style of a brush (one of "bevil", "round", "miter")
+	 */
+	strokeLineJoin: string;
+
+	/**
+	 * Stroke Dash Array.
+	 */
+	strokeDashArray: any[];
+
+	/**
+	 * Sets shadow of an object
+	 * @param [options] Options object or string (e.g. "2px 2px 10px rgba(0,0,0,0.2)")
+	 */
+	setShadow(options: string|any): BaseBrush;
+}
+
+export class CircleBrush extends BaseBrush {
+	/**
+	 * Width of a brush
+	 */
+	width: number;
+	/**
+	 * Invoked inside on mouse down and mouse move
+	 */
+	drawDot(pointer: any): void;
+
+	/**
+	 * @return Just added pointer point
+	 */
+	addPoint(pointer: any): Point;
+}
+
+export class SprayBrush extends BaseBrush {
+	/**
+	 * Width of a brush
+	 */
+	width: number;
+	/**
+	 * Density of a spray (number of dots per chunk)
+	 */
+	density: number;
+
+	/**
+	 * Width of spray dots
+	 */
+	dotWidth: number;
+	/**
+	 * Width variance of spray dots
+	 */
+	dotWidthVariance: number;
+
+	/**
+	 * Whether opacity of a dot should be random
+	 */
+	randomOpacity: boolean;
+	/**
+	 * Whether overlapping dots (rectangles) should be removed (for performance reasons)
+	 */
+	optimizeOverlapping: boolean;
+
+	addSprayChunk(pointer: any): void;
+}
+export class PatternBrush extends PencilBrush {
+	getPatternSrc(): HTMLCanvasElement;
+
+	getPatternSrcFunction(): string;
+
+	/**
+	 * Creates "pattern" instance property
+	 */
+	getPattern(): any;
+	/**
+	 * Creates path
+	 */
+	createPath(pathData: string): Path;
+}
+export class PencilBrush extends BaseBrush {
+	/**
+	 * Converts points to SVG path
+	 * @param points Array of points
+	 */
+	convertPointsToSVGPath(points: Array<{ x: number; y: number }>, minX?: number, minY?: number): string[];
+
+	/**
+	 * Creates fabric.Path object to add on canvas
+	 * @param pathData Path data
+	 */
+	createPath(pathData: string): Path;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Fabric util Interface
+//////////////////////////////////////////////////////////////////////////////
+interface IUtilAnimationOptions {
+	/**
+	 * Starting value
+	 */
+	startValue?: number;
+	/**
+	 * Ending value
+	 */
+	endValue?: number;
+	/**
+	 * Value to modify the property by
+	 */
+	byValue: number;
+	/**
+	 * Duration of change (in ms)
+	 */
+	duration?: number;
+	/**
+	 * Callback; invoked on every value change
+	 */
+	onChange?: Function;
+	/**
+	 * Callback; invoked when value change is completed
+	 */
+	onComplete?: Function;
+	/**
+	 * Easing function
+	 */
+	easing?: Function;
+}
+interface IUtilAnimation {
+	/**
+	 * Changes value from one to another within certain period of time, invoking callbacks as value is being changed.
+	 * @param [options] Animation options
+	 */
+	animate(options?: IUtilAnimationOptions): void;
+	/**
+	 * requestAnimationFrame polyfill based on http://paulirish.com/2011/requestanimationframe-for-smart-animating/
+	 * In order to get a precise start time, `requestAnimFrame` should be called as an entry into the method
+	 * @param callback Callback to invoke
+	 */
+	requestAnimFrame(callback: Function): void;
+}
+
+type IUtilAminEaseFunction = (t: number, b: number, c: number, d: number) => number;
+
+interface IUtilAnimEase {
+	easeInBack: IUtilAminEaseFunction;
+	easeInBounce: IUtilAminEaseFunction;
+	easeInCirc: IUtilAminEaseFunction;
+	easeInCubic: IUtilAminEaseFunction;
+	easeInElastic: IUtilAminEaseFunction;
+	easeInExpo: IUtilAminEaseFunction;
+	easeInOutBack: IUtilAminEaseFunction;
+	easeInOutBounce: IUtilAminEaseFunction;
+	easeInOutCirc: IUtilAminEaseFunction;
+	easeInOutCubic: IUtilAminEaseFunction;
+	easeInOutElastic: IUtilAminEaseFunction;
+	easeInOutExpo: IUtilAminEaseFunction;
+	easeInOutQuad: IUtilAminEaseFunction;
+	easeInOutQuart: IUtilAminEaseFunction;
+	easeInOutQuint: IUtilAminEaseFunction;
+	easeInOutSine: IUtilAminEaseFunction;
+	easeInQuad: IUtilAminEaseFunction;
+	easeInQuart: IUtilAminEaseFunction;
+	easeInQuint: IUtilAminEaseFunction;
+	easeInSine: IUtilAminEaseFunction;
+	easeOutBack: IUtilAminEaseFunction;
+	easeOutBounce: IUtilAminEaseFunction;
+	easeOutCirc: IUtilAminEaseFunction;
+	easeOutCubic: IUtilAminEaseFunction;
+	easeOutElastic: IUtilAminEaseFunction;
+	easeOutExpo: IUtilAminEaseFunction;
+	easeOutQuad: IUtilAminEaseFunction;
+	easeOutQuart: IUtilAminEaseFunction;
+	easeOutQuint: IUtilAminEaseFunction;
+	easeOutSine: IUtilAminEaseFunction;
+}
+
+interface IUtilArc {
+	/**
+	 * Draws arc
+	 */
+	drawArc(ctx: CanvasRenderingContext2D, fx: number, fy: number, coords: number[]): void;
+	/**
+	 * Calculate bounding box of a elliptic-arc
+	 * @param fx start point of arc
+	 * @param rx horizontal radius
+	 * @param ry vertical radius
+	 * @param rot angle of horizontal axe
+	 * @param large 1 or 0, whatever the arc is the big or the small on the 2 points
+	 * @param sweep 1 or 0, 1 clockwise or counterclockwise direction
+	 * @param tx end point of arc
+	 */
+	getBoundsOfArc(fx: number, fy: number, rx: number, ry: number, rot: number, large: number, sweep: number, tx: number, ty: number): Point[];
+	/**
+	 * Calculate bounding box of a beziercurve
+	 * @param x0 starting point
+	 * @param x1 first control point
+	 * @param x2 secondo control point
+	 * @param x3 end of beizer
+	 */
+	getBoundsOfCurve(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, x3: number, y3: number): Point[];
+}
+
+interface IUtilDomEvent {
+	/**
+	 * Cross-browser wrapper for getting event's coordinates
+	 * @param event Event object
+	 * @param upperCanvasEl &lt;canvas> element on which object selection is drawn
+	 */
+	getPointer(event: Event, upperCanvasEl: HTMLCanvasElement): Point;
+
+	/**
+	 * Adds an event listener to an element
+	 */
+	addListener(element: HTMLElement, eventName: string, handler: Function): void;
+
+	/**
+	 * Removes an event listener from an element
+	 */
+	removeListener(element: HTMLElement, eventName: string, handler: Function): void;
+}
+
+interface IUtilDomMisc {
+	/**
+	 * Takes id and returns an element with that id (if one exists in a document)
+	 */
+	getById(id: string|HTMLElement): HTMLElement;
+	/**
+	 * Converts an array-like object (e.g. arguments or NodeList) to an array
+	 */
+	toArray(arrayLike: any): any[];
+	/**
+	 * Creates specified element with specified attributes
+	 * @param tagName Type of an element to create
+	 * @param [attributes] Attributes to set on an element
+	 * @return Newly created element
+	 */
+	makeElement(tagName: string, attributes?: any): HTMLElement;
+	/**
+	 * Adds class to an element
+	 * @param element Element to add class to
+	 * @param className Class to add to an element
+	 */
+	addClass(element: HTMLElement, classname: string): void;
+	/**
+	 * Wraps element with another element
+	 * @param element Element to wrap
+	 * @param wrapper Element to wrap with
+	 * @param [attributes] Attributes to set on a wrapper
+	 */
+	wrapElement(element: HTMLElement, wrapper: HTMLElement|string, attributes?: any): HTMLElement;
+	/**
+	 * Returns element scroll offsets
+	 * @param element Element to operate on
+	 * @param upperCanvasEl Upper canvas element
+	 */
+	getScrollLeftTop(element: HTMLElement, upperCanvasEl: HTMLElement): { left: number; right: number; };
+	/**
+	 * Returns offset for a given element
+	 * @param element Element to get offset for
+	 */
+	getElementOffset(element: HTMLElement): { left: number; right: number; };
+	/**
+	 * Returns style attribute value of a given element
+	 * @param element Element to get style attribute for
+	 * @param attr Style attribute to get for element
+	 */
+	getElementStyle(elment: HTMLElement, attr: string): string;
+	/**
+	 * Inserts a script element with a given url into a document; invokes callback, when that script is finished loading
+	 * @param url URL of a script to load
+	 * @param callback Callback to execute when script is finished loading
+	 */
+	getScript(url: string, callback: Function): void;
+	/**
+	 * Makes element unselectable
+	 * @param element Element to make unselectable
+	 */
+	makeElementUnselectable(element: HTMLElement): HTMLElement;
+	/**
+	 * Makes element selectable
+	 * @param element Element to make selectable
+	 */
+	makeElementSelectable(element: HTMLElement): HTMLElement;
+}
+
+interface IUtilDomRequest {
+	/**
+	 * Cross-browser abstraction for sending XMLHttpRequest
+	 * @param url URL to send XMLHttpRequest to
+	 */
+	request(url: string, options?: {
+		/** @default "GET" */
+		method?: string,
+		/** Callback to invoke when request is completed */
+		onComplete: Function,
+	}): XMLHttpRequest;
+}
+
+interface IUtilDomStyle {
+	/**
+	 * Cross-browser wrapper for setting element's style
+	 */
+	setStyle(element: HTMLElement, styles: any): HTMLElement;
+}
+
+interface IUtilArray {
+	/**
+	 * Invokes method on all items in a given array
+	 * @param array Array to iterate over
+	 * @param method Name of a method to invoke
+	 */
+	invoke(array: any[], method: string): any[];
+	/**
+	 * Finds minimum value in array (not necessarily "first" one)
+	 * @param array Array to iterate over
+	 */
+	min(array: any[], byProperty: string): any;
+	/**
+	 * Finds maximum value in array (not necessarily "first" one)
+	 * @param array Array to iterate over
+	 */
+	max(array: any[], byProperty: string): any;
+}
+
+interface IUtilClass {
+	/**
+	 * Helper for creation of "classes".
+	 * @param [parent] optional "Class" to inherit from
+	 * @param [properties] Properties shared by all instances of this class
+	 *                  (be careful modifying objects defined here as this would affect all instances)
+	 */
+	createClass(parent: Function, properties?: any): void;
+	/**
+	 * Helper for creation of "classes".
+	 * @param [properties] Properties shared by all instances of this class
+	 *                  (be careful modifying objects defined here as this would affect all instances)
+	 */
+	createClass(properties?: any): void;
+}
+
+interface IUtilObject {
+	/**
+	 * Copies all enumerable properties of one object to another
+	 * @param destination Where to copy to
+	 * @param source Where to copy from
+	 */
+	extend(destination: any, source: any): any;
+
+	/**
+	 * Creates an empty object and copies all enumerable properties of another object to it
+	 * @param object Object to clone
+	 */
+	clone(object: any): any;
+}
+
+interface IUtilString {
+	/**
+	 * Camelizes a string
+	 * @param string String to camelize
+	 */
+	camelize(string: string): string;
+
+	/**
+	 * Capitalizes a string
+	 * @param string String to capitalize
+	 * @param [firstLetterOnly] If true only first letter is capitalized
+	 * and other letters stay untouched, if false first letter is capitalized
+	 * and other letters are converted to lowercase.
+	 */
+	capitalize(string: string, firstLetterOnly: boolean): string;
+
+	/**
+	 * Escapes XML in a string
+	 * @param string String to escape
+	 */
+	escapeXml(string: string): string;
+}
+
+interface IUtilMisc {
+	/**
+	 * Removes value from an array.
+	 * Presence of value (and its position in an array) is determined via `Array.prototype.indexOf`
+	 */
+	removeFromArray(array: any[], value: any): any[];
+
+	/**
+	 * Returns random number between 2 specified ones.
+	 * @param min lower limit
+	 * @param max upper limit
+	 */
+	getRandomInt(min: number, max: number): number;
+
+	/**
+	 * Transforms degrees to radians.
+	 * @param degrees value in degrees
+	 */
+	degreesToRadians(degrees: number): number;
+
+	/**
+	 * Transforms radians to degrees.
+	 * @param radians value in radians
+	 */
+	radiansToDegrees(radians: number): number;
+
+	/**
+	 * Rotates `point` around `origin` with `radians`
+	 * @param point The point to rotate
+	 * @param origin The origin of the rotation
+	 * @param radians The radians of the angle for the rotation
+	 */
+	rotatePoint(point: Point, origin: Point, radians: number): Point;
+
+	/**
+	 * Rotates `vector` with `radians`
+	 * @param vector The vector to rotate (x and y)
+	 * @param radians The radians of the angle for the rotation
+	 */
+	rotateVector(vector: { x: number, y: number }, radians: number): { x: number, y: number };
+
+	/**
+	 * Apply transform t to point p
+	 * @param  p The point to transform
+	 * @param  t The transform
+	 * @param  [ignoreOffset] Indicates that the offset should not be applied
+	 */
+	transformPoint(p: Point, t: any[], ignoreOffset?: boolean): Point;
+
+	/**
+	 * Invert transformation t
+	 * @param t The transform
+	 */
+	invertTransform(t: any[]): any[];
+
+	/**
+	 * A wrapper around Number#toFixed, which contrary to native method returns number, not string.
+	 * @param number number to operate on
+	 * @param fractionDigits number of fraction digits to "leave"
+	 */
+	toFixed(number: number, fractionDigits: number): number;
+
+	/**
+	 * Converts from attribute value to pixel value if applicable.
+	 * Returns converted pixels or original value not converted.
+	 * @param value number to operate on
+	 */
+	parseUnit(value: number|string, fontSize?: number): number|string;
+
+	/**
+	 * Function which always returns `false`.
+	 */
+	falseFunction(): boolean;
+
+	/**
+	 * Returns klass "Class" object of given namespace
+	 * @param type Type of object (eg. 'circle')
+	 * @param namespace Namespace to get klass "Class" object from
+	 */
+	getKlass(type: string, namespace: string): any;
+
+	/**
+	 * Returns object of given namespace
+	 * @param namespace Namespace string e.g. 'fabric.Image.filter' or 'fabric'
+	 */
+	resolveNamespace(namespace: string): any;
+
+	/**
+	 * Loads image element from given url and passes it to a callback
+	 * @param url URL representing an image
+	 * @param callback Callback; invoked with loaded image
+	 * @param [context] Context to invoke callback in
+	 * @param [crossOrigin] crossOrigin value to set image element to
+	 */
+	loadImage(url: string, callback: (image: HTMLImageElement) => {}, context?: any, crossOrigin?: boolean): void;
+
+	/**
+	 * Creates corresponding fabric instances from their object representations
+	 * @param objects Objects to enliven
+	 * @param callback Callback to invoke when all objects are created
+	 * @param namespace Namespace to get klass "Class" object from
+	 * @param reviver Method for further parsing of object elements, called after each fabric object created.
+	 */
+	enlivenObjects(objects: any[], callback: Function, namespace: string, reviver?: Function): void;
+
+	/**
+	 * Groups SVG elements (usually those retrieved from SVG document)
+	 * @param elements SVG elements to group
+	 * @param [options] Options object
+	 */
+	groupSVGElements(elements: any[], options?: any, path?: any): PathGroup;
+
+	/**
+	 * Populates an object with properties of another object
+	 * @param source Source object
+	 * @param destination Destination object
+	 * @param properties Propertie names to include
+	 */
+	populateWithProperties(source: any, destination: any, properties: any): void;
+
+	/**
+	 * Draws a dashed line between two points
+	 * This method is used to draw dashed line around selection area.
+	 * @param ctx context
+	 * @param x  start x coordinate
+	 * @param y start y coordinate
+	 * @param x2 end x coordinate
+	 * @param y2 end y coordinate
+	 * @param da dash array pattern
+	 */
+	drawDashedLine(ctx: CanvasRenderingContext2D, x: number, y: number, x2: number, y2: number, da: any[]): void;
+
+	/**
+	 * Creates canvas element and initializes it via excanvas if necessary
+	 * @param [canvasEl] optional canvas element to initialize;
+	 * when not given, element is created implicitly
+	 */
+	createCanvasElement(canvasEl?: HTMLCanvasElement): HTMLCanvasElement;
+
+	/**
+	 * Creates image element (works on client and node)
+	 */
+	createImage(): HTMLImageElement;
+
+	/**
+	 * Creates accessors (getXXX, setXXX) for a "class", based on "stateProperties" array
+	 * @param klass "Class" to create accessors for
+	 */
+	createAccessors(klass: any): any;
+
+	/**
+	 * @param receiver Object implementing `clipTo` method
+	 * @param ctx Context to clip
+	 */
+	clipContext(receiver: Object, ctx: CanvasRenderingContext2D): void;
+
+	/**
+	 * Multiply matrix A by matrix B to nest transformations
+	 * @param  a First transformMatrix
+	 * @param  b Second transformMatrix
+	 */
+	multiplyTransformMatrices(a: number[], b: number[]): number[];
+
+	/**
+	 * Decomposes standard 2x2 matrix into transform componentes
+	 * @param a transformMatrix
+	 */
+	qrDecompose(a: number[]): { angle: number, scaleX: number, scaleY: number, skewX: number, skewY: number, translateX: number, translateY: number };
+
+	/**
+	 * Returns string representation of function body
+	 * @param fn Function to get body of
+	 */
+	getFunctionBody(fn: Function): string;
+
+	/**
+	 * Returns true if context has transparent pixel
+	 * at specified location (taking tolerance into account)
+	 * @param ctx context
+	 * @param x x coordinate
+	 * @param y y coordinate
+	 * @param tolerance Tolerance
+	 */
+	isTransparent(ctx: CanvasRenderingContext2D, x: number, y: number, tolerance: number): boolean;
+}
+
+export const util: IUtil;
+interface IUtil extends IUtilAnimation, IUtilArc, IObservable<IUtil>, IUtilDomEvent, IUtilDomMisc,
+	IUtilDomRequest, IUtilDomStyle, IUtilClass, IUtilMisc {
+	ease: IUtilAnimEase;
+	array: IUtilArray;
+	object: IUtilObject;
+	string: IUtilString;
+}
diff --git a/types/fabric/index.d.ts b/types/fabric/index.d.ts
index 8b7c007cd7..a0fa06629e 100644
--- a/types/fabric/index.d.ts
+++ b/types/fabric/index.d.ts
@@ -6,4429 +6,4 @@
 //                 Tiger Oakes <https://github.com/NotWoods>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
-
-export as namespace fabric;
-
-export const isLikelyNode: boolean;
-export const isTouchSupported: boolean;
-
-/////////////////////////////////////////////////////////////
-// farbic Functions
-/////////////////////////////////////////////////////////////
-
-export function createCanvasForNode(width: number, height: number): Canvas;
-
-// Parse
-// ----------------------------------------------------------
-/**
- * Creates markup containing SVG referenced elements like patterns, gradients etc.
- * @param canvas instance of fabric.Canvas
- */
-export function createSVGRefElementsMarkup(canvas: StaticCanvas): string;
-/**
- * Creates markup containing SVG font faces
- * @param objects Array of fabric objects
- */
-export function createSVGFontFacesMarkup(objects: Object[]): string;
-/**
- * Takes string corresponding to an SVG document, and parses it into a set of fabric objects
- * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
- */
-export function loadSVGFromString(string: string, callback: (results: Object[], options: any) => void, reviver?: Function): void;
-/**
- * Takes url corresponding to an SVG document, and parses it into a set of fabric objects.
- * Note that SVG is fetched via XMLHttpRequest, so it needs to conform to SOP (Same Origin Policy)
- * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
- */
-export function loadSVGFromURL(url: string, callback: (results: Object[], options: any) => void, reviver?: Function): void;
-/**
- * Returns CSS rules for a given SVG document
- * @param doc SVG document to parse
- */
-export function getCSSRules(doc: SVGElement): any;
-
-export function parseElements(elements: any[], callback: Function, options: any, reviver?: Function): void;
-/**
- * Parses "points" attribute, returning an array of values
- * @param points points attribute string
- */
-export function parsePointsAttribute(points: string): any[];
-/**
- * Parses "style" attribute, retuning an object with values
- * @param element Element to parse
- */
-export function parseStyleAttribute(element: SVGElement): any;
-/**
- * Transforms an array of svg elements to corresponding fabric.* instances
- * @param elements Array of elements to parse
- * @param callback Being passed an array of fabric instances (transformed from SVG elements)
- * @param [options] Options object
- * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
- */
-export function parseElements(elements: SVGElement[], callback: Function, options?: any, reviver?: Function): void;
-/**
- * Returns an object of attributes' name/value, given element and an array of attribute names;
- * Parses parent "g" nodes recursively upwards.
- * @param element Element to parse
- * @param attributes Array of attributes to parse
- */
-export function parseAttributes(element: HTMLElement, attributes: string[], svgUid?: string): { [key: string]: string };
-/**
- * Parses an SVG document, returning all of the gradient declarations found in it
- * @param doc SVG document to parse
- */
-export function getGradientDefs(doc: SVGElement): { [key: string]: any };
-/**
- * Parses a short font declaration, building adding its properties to a style object
- * @param value font declaration
- * @param oStyle definition
- */
-export function parseFontDeclaration(value: string, oStyle: any): void;
-/**
- * Parses an SVG document, converts it to an array of corresponding fabric.* instances and passes them to a callback
- * @param doc SVG document to parse
- * @param callback Callback to call when parsing is finished; It's being passed an array of elements (parsed from a document).
- * @param [reviver] Method for further parsing of SVG elements, called after each fabric object created.
- */
-export function parseSVGDocument(doc: SVGElement, callback: (results: Object[], options: any) => void, reviver?: Function): void;
-/**
- * Parses "transform" attribute, returning an array of values
- * @param attributeValue String containing attribute value
- */
-export function parseTransformAttribute(attributeValue: string): number[];
-
-// fabric Log
-// ---------------
-/**
- * Wrapper around `console.log` (when available)
- */
-export function log(...values: any[]): void;
-/**
- * Wrapper around `console.warn` (when available)
- */
-export function warn(...values: any[]): void;
-
-///////////////////////////////////////////////////////////////////////////////
-// Data Object Interfaces - These intrface are not specific part of fabric,
-// They are just helpful for for defining function paramters
-//////////////////////////////////////////////////////////////////////////////
-interface IDataURLOptions {
-	/**
-	 * The format of the output image. Either "jpeg" or "png"
-	 */
-	format?: string;
-	/**
-	 * Quality level (0..1). Only used for jpeg
-	 */
-	quality?: number;
-	/**
-	 * Multiplier to scale by
-	 */
-	multiplier?: number;
-	/**
-	 * Cropping left offset. Introduced in v1.2.14
-	 */
-	left?: number;
-	/**
-	 * Cropping top offset. Introduced in v1.2.14
-	 */
-	top?: number;
-	/**
-	 * Cropping width. Introduced in v1.2.14
-	 */
-	width?: number;
-	/**
-	 * Cropping height. Introduced in v1.2.14
-	 */
-	height?: number;
-}
-
-interface IEvent {
-	e: Event;
-	target?: Object;
-}
-
-interface IFillOptions {
-	/**
-	 * options.source Pattern source
-	 */
-	source: string | HTMLImageElement;
-	/**
-	 * Repeat property of a pattern (one of repeat, repeat-x, repeat-y or no-repeat)
-	 */
-	repeat?: string;
-	/**
-	 * Pattern horizontal offset from object's left/top corner
-	 */
-	offsetX?: number;
-	/**
-	 * Pattern vertical offset from object's left/top corner
-	 */
-	offsetY?: number;
-}
-
-interface IToSVGOptions {
-	/**
-	 * If true xml tag is not included
-	 */
-	suppressPreamble: boolean;
-	/**
-	 * SVG viewbox object
-	 */
-	viewBox: IViewBox;
-	/**
-	 * Encoding of SVG output
-	 */
-	encoding: string;
-}
-
-interface IViewBox {
-	/**
-	 * x-cooridnate of viewbox
-	 */
-	x: number;
-	/**
-	 * y-coordinate of viewbox
-	 */
-	y: number;
-	/**
-	 * Width of viewbox
-	 */
-	width: number;
-	/**
-	 * Height of viewbox
-	 */
-	height: number;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Mixins Interfaces
-//////////////////////////////////////////////////////////////////////////////
-interface ICollection<T> {
-	/**
-	 * Adds objects to collection, then renders canvas (if `renderOnAddRemove` is not `false`)
-	 * Objects should be instances of (or inherit from) fabric.Object
-	 * @param object Zero or more fabric instances
-	 */
-	add(...object: Object[]): T;
-
-	/**
-	 * Inserts an object into collection at specified index, then renders canvas (if `renderOnAddRemove` is not `false`)
-	 * An object should be an instance of (or inherit from) fabric.Object
-	 * @param object Object to insert
-	 * @param index Index to insert object at
-	 * @param nonSplicing When `true`, no splicing (shifting) of objects occurs
-	 * @return thisArg
-	 * @chainable
-	 */
-	insertAt(object: Object, index: number, nonSplicing: boolean): T;
-
-	/**
-	 * 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[]): T;
-
-	/**
-	 * Executes given function for each object in this group
-	 * @param context Context (aka thisObject)
-	 * @return thisArg
-	 */
-	forEachObject(callback: (element: Object, index: number, array: Object[]) => void, context?: any): T;
-
-	/**
-	 * Returns an array of children objects of this instance
-	 * Type parameter introduced in 1.3.10
-	 * @param [type] When specified, only objects of this type are returned
-	 */
-	getObjects(type?: string): Object[];
-
-	/**
-	 * Returns object at specified index
-	 * @return thisArg
-	 */
-	item(index: number): T;
-
-	/**
-	 * Returns true if collection contains no objects
-	 * @return true if collection is empty
-	 */
-	isEmpty(): boolean;
-
-	/**
-	 * Returns a size of a collection (i.e: length of an array containing its objects)
-	 * @return Collection size
-	 */
-	size(): number;
-
-	/**
-	 * Returns true if collection contains an object
-	 * @param object Object to check against
-	 * @return `true` if collection contains an object
-	 */
-	contains(object: Object): boolean;
-
-	/**
-	 * Returns number representation of a collection complexity
-	 * @return complexity
-	 */
-	complexity(): number;
-}
-
-interface IObservable<T> {
-	/**
-	 * Observes specified event
-	 * @param eventName Event name (eg. 'after:render')
-	 * @param handler Function that receives a notification when an event of the specified type occurs
-	 */
-	on(eventName: string, handler: (e: IEvent) => void): T;
-
-	/**
-	 * Observes specified event
-	 * @param eventName Object with key/value pairs (eg. {'after:render': handler, 'selection:cleared': handler})
-	 */
-	on(events: {[eventName: string]: (e: IEvent) => void}): T;
-	/**
-	 * Fires event with an optional options object
-	 * @param eventName Event name to fire
-	 * @param [options] Options object
-	 */
-	trigger(eventName: string, options?: any): T;
-	/**
-	 * Stops event observing for a particular event handler. Calling this method
-	 * without arguments removes all handlers for all events
-	 * @param eventName Event name (eg. 'after:render') or object with key/value pairs (eg. {'after:render': handler, 'selection:cleared': handler})
-	 * @param handler Function to be deleted from EventListeners
-	 */
-	off(eventName?: string|any, handler?: (e: IEvent) => void): T;
-}
-
-interface Callbacks {
-	/** Invoked on completion */
-	onComplete?: Function;
-	/** Invoked on every step of animation */
-	onChange?: Function;
-}
-
-// animation mixin
-// ----------------------------------------------------
-interface ICanvasAnimation<T> {
-	FX_DURATION: number;
-	/**
-	 * Centers object horizontally with animation.
-	 * @param object Object to center
-	 */
-	fxCenterObjectH(object: Object, callbacks?: Callbacks): T;
-
-	/**
-	 * Centers object vertically with animation.
-	 * @param object Object to center
-	 */
-	fxCenterObjectV(object: Object, callbacks?: Callbacks): T;
-
-	/**
-	 * Same as `fabric.Canvas#remove` but animated
-	 * @param object Object to remove
-	 * @chainable
-	 */
-	fxRemove(object: Object): T;
-}
-interface IObjectAnimation<T> {
-	/**
-	 * Animates object's properties
-	 * object.animate('left', ..., {duration: ...});
-	 * @param property Property to animate
-	 * @param value Value to animate property
-	 * @param options The animation options
-	 */
-	animate(property: string, value: number|string, options?: IAnimationOptions): Object;
-	/**
-	 * Animates object's properties
-	 * object.animate({ left: ..., top: ... }, { duration: ... });
-	 * @param properties Properties to animate
-	 * @param value Options object
-	 */
-	animate(properties: any, options?: IAnimationOptions): Object;
-}
-interface IAnimationOptions {
-	/**
-	 * Allows to specify starting value of animatable property (if we don't want current value to be used).
-	 */
-	from?: string|number;
-	/**
-	 * Defaults to 500 (ms). Can be used to change duration of an animation.
-	 */
-	duration?: number;
-	/**
-	 * Callback; invoked on every value change
-	 */
-	onChange?: Function;
-	/**
-	 * Callback; invoked when value change is completed
-	 */
-	onComplete?: Function;
-
-	/**
-	 * Easing function. Default: fabric.util.ease.easeInSine
-	 */
-	easing?: Function;
-	/**
-	 *  Value to modify the property by, default: end - start
-	 */
-	by?: number;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// General Fabric Interfaces
-//////////////////////////////////////////////////////////////////////////////
-export class Color {
-	/**
-	 * Color class
-	 * The purpose of Color is to abstract and encapsulate common color operations;
-	 * @param color optional in hex or rgb(a) format
-	 */
-	constructor(color?: string);
-
-	/**
-	 * Returns source of this color (where source is an array representation; ex: [200, 200, 100, 1])
-	 */
-	getSource(): number[];
-
-	/**
-	 * Sets source of this color (where source is an array representation; ex: [200, 200, 100, 1])
-	 */
-	setSource(source: number[]): void;
-
-	/**
-	 * Returns color represenation in RGB format ex: rgb(0-255,0-255,0-255)
-	 */
-	toRgb(): string;
-
-	/**
-	 * Returns color represenation in RGBA format ex: rgba(0-255,0-255,0-255,0-1)
-	 */
-	toRgba(): string;
-
-	/**
-	 * Returns color represenation in HSL format ex: hsl(0-360,0%-100%,0%-100%)
-	 */
-	toHsl(): string;
-
-	/**
-	 * Returns color represenation in HSLA format ex: hsla(0-360,0%-100%,0%-100%,0-1)
-	 */
-	toHsla(): string;
-
-	/**
-	 * Returns color represenation in HEX format ex: FF5555
-	 */
-	toHex(): string;
-
-	/**
-	 * Gets value of alpha channel for this color
-	 */
-	getAlpha(): number;
-
-	/**
-	 * Sets value of alpha channel for this color
-	 * @param alpha Alpha value 0-1
-	 */
-	setAlpha(alpha: number): void;
-
-	/**
-	 * Transforms color to its grayscale representation
-	 */
-	toGrayscale(): Color;
-
-	/**
-	 * Transforms color to its black and white representation
-	 */
-	toBlackWhite(threshold: number): Color;
-	/**
-	 * Overlays color with another color
-	 */
-	overlayWith(otherColor: string|Color): Color;
-
-	/**
-	 * Returns new color object, when given a color in RGB format
-	 * @param color Color value ex: rgb(0-255,0-255,0-255)
-	 */
-	static fromRgb(color: string): Color;
-	/**
-	 * Returns new color object, when given a color in RGBA format
-	 * @param color Color value ex: rgb(0-255,0-255,0-255)
-	 */
-	static fromRgba(color: string): Color;
-	/**
-	 * Returns array represenatation (ex: [100, 100, 200, 1]) of a color that's in RGB or RGBA format
-	 * @param color Color value ex: rgb(0-255,0-255,0-255), rgb(0%-100%,0%-100%,0%-100%)
-	 */
-	static sourceFromRgb(color: string): number[];
-	/**
-	 * Returns new color object, when given a color in HSL format
-	 * @param color Color value ex: hsl(0-260,0%-100%,0%-100%)
-	 */
-	static fromHsl(color: string): Color;
-	/**
-	 * Returns new color object, when given a color in HSLA format
-	 * @param color Color value ex: hsl(0-260,0%-100%,0%-100%)
-	 */
-	static fromHsla(color: string): Color;
-	/**
-	 * Returns array represenatation (ex: [100, 100, 200, 1]) of a color that's in HSL or HSLA format.
-	 * @param color Color value ex: hsl(0-360,0%-100%,0%-100%) or hsla(0-360,0%-100%,0%-100%, 0-1)
-	 */
-	static sourceFromHsl(color: string): number[];
-	/**
-	 * Returns new color object, when given a color in HEX format
-	 * @param color Color value ex: FF5555
-	 */
-	static fromHex(color: string): Color;
-
-	/**
-	 * Returns array represenatation (ex: [100, 100, 200, 1]) of a color that's in HEX format
-	 * @param color ex: FF5555
-	 */
-	static sourceFromHex(color: string): number[];
-	/**
-	 * Returns new color object, when given color in array representation (ex: [200, 100, 100, 0.5])
-	 */
-	static fromSource(source: number[]): Color;
-}
-
-interface IGradientOptions {
-	/**
-	 * @param [options.type] Type of gradient 'radial' or 'linear'
-	 */
-	type?: string;
-	/**
-	 * x-coordinate of start point
-	 */
-	x1?: number;
-	/**
-	 * y-coordinate of start point
-	 */
-	y1?: number;
-	/**
-	 * x-coordinate of end point
-	 */
-	x2?: number;
-	/**
-	 * y-coordinate of end point
-	 */
-	y2?: number;
-	/**
-	 * Radius of start point (only for radial gradients)
-	 */
-	r1?: number;
-	/**
-	 * Radius of end point (only for radial gradients)
-	 */
-	r2?: number;
-	/**
-	 * Color stops object eg. {0:string; 1:string;
-	 */
-	colorStops?: any;
-}
-interface IGradient extends IGradientOptions {
-	/**
-	 * Adds another colorStop
-	 * @param colorStop Object with offset and color
-	 */
-	addColorStop(colorStop: any): IGradient;
-	/**
-	 * Returns object representation of a gradient
-	 */
-	toObject(): any;
-	/**
-	 * Returns SVG representation of an gradient
-	 * @param object Object to create a gradient for
-	 * @param normalize Whether coords should be normalized
-	 * @return SVG representation of an gradient (linear/radial)
-	 */
-	toSVG(object: Object, normalize?: boolean): string;
-
-	/**
-	 * Returns an instance of CanvasGradient
-	 * @param ctx Context to render on
-	 */
-	toLive(ctx: CanvasRenderingContext2D, object?: PathGroup): CanvasGradient;
-}
-interface IGrandientStatic {
-	new (options?: IGradientOptions): IGradient;
-	/**
-	 * Returns instance from an SVG element
-	 * @param el SVG gradient element
-	 */
-	fromElement(el: SVGGradientElement, instance: Object): IGradient;
-	/**
-	 * Returns instance from its object representation
-	 * @param [options] Options object
-	 */
-	fromObject(obj: any, options: any[]): IGradient;
-}
-
-export class Intersection {
-	constructor(status?: string);
-
-	/**
-	 * Appends a point to intersection
-	 */
-	appendPoint(point: Point): void;
-	/**
-	 * Appends points to intersection
-	 */
-	appendPoints(points: Point[]): void;
-
-	/**
-	 * Checks if polygon intersects another polygon
-	 */
-	static intersectPolygonPolygon(points1: Point[], points2: Point[]): Intersection;
-	/**
-	 * Checks if line intersects polygon
-	 */
-	static intersectLinePolygon(a1: Point, a2: Point, points: Point[]): Intersection;
-	/**
-	 * Checks if one line intersects another
-	 */
-	static intersectLineLine(a1: Point, a2: Point, b1: Point, b2: Point): Intersection;
-	/**
-	 * Checks if polygon intersects rectangle
-	 */
-	static intersectPolygonRectangle(points: Point[], r1: number, r2: number): Intersection;
-}
-
-interface IPatternOptions {
-	/**
-	 * Repeat property of a pattern (one of repeat, repeat-x, repeat-y or no-repeat)
-	 */
-	repeat: string;
-
-	/**
-	 * Pattern horizontal offset from object's left/top corner
-	 */
-	offsetX: number;
-
-	/**
-	 * Pattern vertical offset from object's left/top corner
-	 */
-	offsetY: number;
-	/**
-	 * The source for the pattern
-	 */
-	source: string|HTMLImageElement;
-}
-export interface Pattern extends IPatternOptions {}
-export class Pattern  {
-	constructor(options?: IPatternOptions);
-
-	initialise(options?: IPatternOptions): Pattern;
-	/**
-	 * Returns an instance of CanvasPattern
-	 */
-	toLive(ctx: CanvasRenderingContext2D): Pattern;
-
-	/**
-	 * Returns object representation of a pattern
-	 */
-	toObject(): any;
-	/**
-	 * Returns SVG representation of a pattern
-	 */
-	toSVG(object: Object): string;
-}
-
-export class Point {
-	x: number;
-	y: number;
-
-	constructor(x: number, y: number);
-
-	/**
-	 * Adds another point to this one and returns another one
-	 */
-	add(that: Point): Point;
-
-	/**
-	 * Adds another point to this one
-	 */
-	addEquals(that: Point): Point;
-
-	/**
-	 * Adds value to this point and returns a new one
-	 */
-	scalarAdd(scalar: number): Point;
-
-	/**
-	 * Adds value to this point
-	 */
-	scalarAddEquals(scalar: number): Point;
-
-	/**
-	 * Subtracts another point from this point and returns a new one
-	 */
-	subtract(that: Point): Point;
-
-	/**
-	 * Subtracts another point from this point
-	 */
-	subtractEquals(that: Point): Point;
-
-	/**
-	 * Subtracts value from this point and returns a new one
-	 */
-	scalarSubtract(scalar: number): Point;
-
-	/**
-	 * Subtracts value from this point
-	 */
-	scalarSubtractEquals(scalar: number): Point;
-
-	/**
-	 * Miltiplies this point by a value and returns a new one
-	 */
-	multiply(scalar: number): Point;
-
-	/**
-	 * Miltiplies this point by a value
-	 */
-	multiplyEquals(scalar: number): Point;
-
-	/**
-	 * Divides this point by a value and returns a new one
-	 */
-	divide(scalar: number): Point;
-
-	/**
-	 * Divides this point by a value
-	 */
-	divideEquals(scalar: number): Point;
-
-	/**
-	 * Returns true if this point is equal to another one
-	 */
-	eq(that: Point): Point;
-
-	/**
-	 * Returns true if this point is less than another one
-	 */
-	lt(that: Point): Point;
-
-	/**
-	 * Returns true if this point is less than or equal to another one
-	 */
-	lte(that: Point): Point;
-
-	/**
-	 * Returns true if this point is greater another one
-	 */
-	gt(that: Point): Point;
-
-	/**
-	 * Returns true if this point is greater than or equal to another one
-	 */
-	gte(that: Point): Point;
-
-	/**
-	 * Returns new point which is the result of linear interpolation with this one and another one
-	 */
-	lerp(that: Point, t: number): Point;
-
-	/**
-	 * Returns distance from this point and another one
-	 */
-	distanceFrom(that: Point): number;
-
-	/**
-	 * Returns the point between this point and another one
-	 */
-	midPointFrom(that: Point): Point;
-
-	/**
-	 * Returns a new point which is the min of this and another one
-	 */
-	min(that: Point): Point;
-
-	/**
-	 * Returns a new point which is the max of this and another one
-	 */
-	max(that: Point): Point;
-
-	/**
-	 * Returns string representation of this point
-	 */
-	toString(): string;
-
-	/**
-	 * Sets x/y of this point
-	 */
-	setXY(x: number, y: number): Point;
-
-	/**
-	 * Sets x/y of this point from another point
-	 */
-	setFromPoint(that: Point): Point;
-
-	/**
-	 * Swaps x/y of this point and another point
-	 */
-	swap(that: Point): Point;
-}
-
-interface IShadowOptions {
-	/**
-	 * Whether the shadow should affect stroke operations
-	 */
-	affectStrike: boolean;
-	/**
-	 * Shadow blur
-	 */
-	blur: number;
-	/**
-	 * Shadow color
-	 */
-	color: string;
-	/**
-	 * Indicates whether toObject should include default values
-	 */
-	includeDefaultValues: boolean;
-	/**
-	 * Shadow horizontal offset
-	 */
-	offsetX: number;
-	/**
-	 * Shadow vertical offset
-	 */
-	offsetY: number;
-}
-export interface Shadow extends IShadowOptions {}
-export class Shadow {
-	constructor(options?: IShadowOptions);
-	initialize(options?: IShadowOptions|string): Shadow;
-	/**
-	 * Returns object representation of a shadow
-	 */
-	toObject(): any;
-	/**
-	 * Returns a string representation of an instance, CSS3 text-shadow declaration
-	 */
-	toString(): string;
-	/**
-	 * Returns SVG representation of a shadow
-	 */
-	toSVG(object: Object): string;
-
-	/**
-	 * Regex matching shadow offsetX, offsetY and blur, Static
-	 */
-	reOffsetsAndBlur: RegExp;
-
-	static reOffsetsAndBlur: RegExp;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Canvas Interfaces
-//////////////////////////////////////////////////////////////////////////////
-interface ICanvasDimensions {
-	/**
-	 * Width of canvas element
-	 */
-	width: number;
-	/**
-	 * Height of canvas element
-	 */
-	height: number;
-}
-interface ICanvasDimensionsOptions {
-	/**
-	 * Set the given dimensions only as canvas backstore dimensions
-	 */
-	backstoreOnly?: boolean;
-	/**
-	 * Set the given dimensions only as css dimensions
-	 */
-	cssOnly?: boolean;
-}
-
-interface IStaticCanvasOptions {
-	/**
-	 * Indicates whether the browser can be scrolled when using a touchscreen and dragging on the canvas
-	 */
-	allowTouchScrolling?: boolean;
-	/**
-	 * Indicates whether this canvas will use image smoothing, this is on by default in browsers
-	 */
-	imageSmoothingEnabled?: boolean;
-
-	/**
-	 * Indicates whether objects should remain in current stack position when selected.
-	 * When false objects are brought to top and rendered as part of the selection group
-	 */
-	preserveObjectStacking?: boolean;
-
-	/**
-	 * The transformation (in the format of Canvas transform) which focuses the viewport
-	 */
-	viewportTransform?: number[];
-
-	freeDrawingColor?: string;
-	freeDrawingLineWidth?: number;
-
-	/**
-	 * Background color of canvas instance.
-	 * Should be set via setBackgroundColor
-	 */
-	backgroundColor?: string|Pattern;
-	/**
-	 * Background image of canvas instance.
-	 * Should be set via setBackgroundImage
-	 * <b>Backwards incompatibility note:</b> The "backgroundImageOpacity" and "backgroundImageStretch" properties are deprecated since 1.3.9.
-	 */
-	backgroundImage?: Image | string;
-	backgroundImageOpacity?: number;
-	backgroundImageStretch?: number;
-	/**
-	 * Function that determines clipping of entire canvas area
-	 * Being passed context as first argument. See clipping canvas area
-	 */
-	clipTo?(context: CanvasRenderingContext2D): void;
-
-	/**
-	 * Indicates whether object controls (borders/controls) are rendered above overlay image
-	 */
-	controlsAboveOverlay?: boolean;
-
-	/**
-	 * Indicates whether toObject/toDatalessObject should include default values
-	 */
-	includeDefaultValues?: boolean;
-	/**
-	 * Overlay color of canvas instance.
-	 * Should be set via setOverlayColor
-	 */
-	overlayColor?: string|Pattern;
-	/**
-	 * Overlay image of canvas instance.
-	 * Should be set via setOverlayImage
-	 * <b>Backwards incompatibility note:</b> The "overlayImageLeft" and "overlayImageTop" properties are deprecated since 1.3.9.
-	 */
-	overlayImage?: Image;
-	overlayImageLeft?: number;
-	overlayImageTop?: number;
-	/**
-	 * Indicates whether add, insertAt and remove should also re-render canvas.
-	 * Disabling this option could give a great performance boost when adding/removing a lot of objects to/from canvas at once
-	 * (followed by a manual rendering after addition/deletion)
-	 */
-	renderOnAddRemove?: boolean;
-	/**
-	 * Indicates whether objects' state should be saved
-	 */
-	stateful?: boolean;
-}
-export interface StaticCanvas extends IObservable<StaticCanvas>, IStaticCanvasOptions, ICollection<StaticCanvas>, ICanvasAnimation<StaticCanvas> {}
-export class StaticCanvas {
-	/**
-	 * Constructor
-	 * @param element <canvas> element to initialize instance on
-	 * @param [options] Options object
-	 */
-	constructor(element: HTMLCanvasElement|string, options?: ICanvasOptions);
-
-	/**
-	 * Calculates canvas element offset relative to the document
-	 * This method is also attached as "resize" event handler of window
-	 */
-	calcOffset(): this;
-
-	/**
-	 * Sets {@link fabric.StaticCanvas#overlayImage|overlay image} for this canvas
-	 * @param image fabric.Image instance or URL of an image to set overlay to
-	 * @param callback callback to invoke when image is loaded and set as an overlay
-	 * @param [options] Optional options to set for the {@link fabric.Image|overlay image}.
-	 */
-	setOverlayImage(image: Image|string, callback: (img: HTMLImageElement) => void, options?: IImageOptions): this;
-
-	/**
-	 * Sets {@link fabric.StaticCanvas#backgroundImage|background image} for this canvas
-	 * @param image fabric.Image instance or URL of an image to set background to
-	 * @param callback Callback to invoke when image is loaded and set as background
-	 * @param [options] Optional options to set for the {@link fabric.Image|background image}.
-	 */
-	setBackgroundImage(image: Image|string, callback?: (img: HTMLImageElement) => void, options?: IImageOptions): this;
-
-	/**
-	 * Sets {@link fabric.StaticCanvas#overlayColor|background color} for this canvas
-	 * @param overlayColor Color or pattern to set background color to
-	 * @param callback Callback to invoke when background color is set
-	 */
-	setOverlayColor(overlayColor: string|Pattern, callback: (pattern: Pattern | undefined) => void): this;
-
-	/**
-	 * Sets {@link fabric.StaticCanvas#backgroundColor|background color} for this canvas
-	 * @param backgroundColor Color or pattern to set background color to
-	 * @param callback Callback to invoke when background color is set
-	 */
-	setBackgroundColor(backgroundColor: string|Pattern, callback: (pattern: Pattern | undefined) => void): StaticCanvas;
-
-	/**
-	 * Returns canvas width (in px)
-	 */
-	getWidth(): number;
-
-	/**
-	 * Returns canvas height (in px)
-	 */
-	getHeight(): number;
-
-	/**
-	 * Sets width of this canvas instance
-	 * @param value                         Value to set width to
-	 * @param        [options]                     Options object
-	 */
-	setWidth(value: number|string, options?: ICanvasDimensionsOptions): this;
-
-	/**
-	 * Sets height of this canvas instance
-	 * @param value                         Value to set height to
-	 * @param        [options]                     Options object
-	 */
-	setHeight(value: number|string, options?: ICanvasDimensionsOptions): this;
-
-	/**
-	 * Sets dimensions (width, height) of this canvas instance. when options.cssOnly flag active you should also supply the unit of measure (px/%/em)
-	 * @param        dimensions                    Object with width/height properties
-	 * @param        [options]                     Options object
-	 */
-	setDimensions(dimensions: ICanvasDimensions, options?: ICanvasDimensionsOptions): this;
-
-	/**
-	 * Returns canvas zoom level
-	 */
-	getZoom(): number;
-
-	/**
-	 * Sets viewport transform of this canvas instance
-	 * @param vpt the transform in the form of context.transform
-	 */
-	setViewportTransform(vpt: number[]): this;
-
-	/**
-	 * Sets zoom level of this canvas instance, zoom centered around point
-	 * @param point to zoom with respect to
-	 * @param value to set zoom to, less than 1 zooms out
-	 */
-	zoomToPoint(point: Point, value: number): this;
-
-	/**
-	 * Sets zoom level of this canvas instance
-	 * @param value to set zoom to, less than 1 zooms out
-	 */
-	setZoom(value: number): this;
-
-	/**
-	 * Pan viewport so as to place point at top left corner of canvas
-	 * @param point to move to
-	 */
-	absolutePan(point: Point): this;
-
-	/**
-	 * Pans viewpoint relatively
-	 * @param point (position vector) to move by
-	 */
-	relativePan(point: Point): this;
-
-	/**
-	 * Returns <canvas> element corresponding to this instance
-	 */
-	getElement(): HTMLCanvasElement;
-
-	/**
-	 * Returns currently selected object, if any
-	 */
-	getActiveObject(): Object;
-
-	/**
-	 * Returns currently selected group of object, if any
-	 */
-	getActiveGroup(): Group;
-
-	/**
-	 * Clears specified context of canvas element
-	 * @param ctx Context to clear
-	 * @chainable
-	 */
-	clearContext(ctx: CanvasRenderingContext2D): this;
-
-	/**
-	 * Returns context of canvas where objects are drawn
-	 */
-	getContext(): CanvasRenderingContext2D;
-
-	/**
-	 * Clears all contexts (background, main, top) of an instance
-	 */
-	clear(): this;
-
-	/**
-	 * Renders both the top canvas and the secondary container canvas.
-	 * @param [allOnTop] Whether we want to force all images to be rendered on the top canvas
-	 * @chainable
-	 */
-	renderAll(allOnTop?: boolean): this;
-
-	/**
-	 * Method to render only the top canvas.
-	 * Also used to render the group selection box.
-	 * @chainable
-	 */
-	renderTop(): StaticCanvas;
-
-	/**
-	 * Returns coordinates of a center of canvas.
-	 * Returned value is an object with top and left properties
-	 */
-	getCenter(): { top: number; left: number; };
-	/**
-	 * Centers object horizontally.
-	 * You might need to call `setCoords` on an object after centering, to update controls area.
-	 * @param object Object to center horizontally
-	 */
-	centerObjectH(object: Object): this;
-
-	/**
-	 * Centers object vertically.
-	 * You might need to call `setCoords` on an object after centering, to update controls area.
-	 * @param object Object to center vertically
-	 */
-	centerObjectV(object: Object): this;
-
-	/**
-	 * Centers object vertically and horizontally.
-	 * You might need to call `setCoords` on an object after centering, to update controls area.
-	 * @param object Object to center vertically and horizontally
-	 */
-	centerObject(object: Object): this;
-
-	/**
-	 * Returs dataless JSON representation of canvas
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	toDatalessJSON(propertiesToInclude?: string[]): string;
-
-	/**
-	 * Returns object representation of canvas
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-
-	/**
-	 * Returns dataless object representation of canvas
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	toDatalessObject(propertiesToInclude?: string[]): any;
-
-	/**
-	 * When true, getSvgTransform() will apply the StaticCanvas.viewportTransform to the SVG transformation. When true,
-	 * a zoomed canvas will then produce zoomed SVG output.
-	 */
-	svgViewportTransformation: boolean;
-
-	/**
-	 * Returns SVG representation of canvas
-	 * @param [options] Options object for SVG output
-	 * @param [reviver] Method for further parsing of svg elements, called after each fabric object converted into svg representation.
-	 */
-	toSVG(options: IToSVGOptions, reviver?: Function): string;
-
-	/**
-	 * Moves an object to the bottom of the stack of drawn objects
-	 * @param object Object to send to back
-	 * @chainable
-	 */
-	sendToBack(object: Object): this;
-
-	/**
-	 * Moves an object to the top of the stack of drawn objects
-	 * @param object Object to send
-	 * @chainable
-	 */
-	bringToFront(object: Object): this;
-
-	/**
-	 * Moves an object down in stack of drawn objects
-	 * @param object Object to send
-	 * @param [intersecting] If `true`, send object behind next lower intersecting object
-	 * @chainable
-	 */
-	sendBackwards(object: Object): this;
-
-	/**
-	 * Moves an object up in stack of drawn objects
-	 * @param object Object to send
-	 * @param [intersecting] If `true`, send object in front of next upper intersecting object
-	 * @chainable
-	 */
-	bringForward(object: Object): this;
-	/**
-	 * Moves an object to specified level in stack of drawn objects
-	 * @param object Object to send
-	 * @param index Position to move to
-	 * @chainable
-	 */
-	moveTo(object: Object, index: number): this;
-
-	/**
-	 * Clears a canvas element and removes all event listeners
-	 */
-	dispose(): this;
-
-	/**
-	 * Returns a string representation of an instance
-	 */
-	toString(): string;
-
-	/**
-	 * Exports canvas element to a dataurl image. Note that when multiplier is used, cropping is scaled appropriately
-	 * @param [options] Options object
-	 */
-	toDataURL(options?: IDataURLOptions): string;
-
-	/**
-	 * Provides a way to check support of some of the canvas methods
-	 * (either those of HTMLCanvasElement itself, or rendering context)
-	 * @param methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
-	 * @return `true` if method is supported (or at least exists), null` if canvas element or context can not be initialized
-	 */
-	supports(methodName: "getImageData" | "toDataURL" | "toDataURLWithQuality" | "setLineDash"): boolean;
-
-	/**
-	 * Populates canvas with data from the specified JSON.
-	 * JSON format must conform to the one of toJSON formats
-	 * @param json JSON string or object
-	 * @param callback Callback, invoked when json is parsed
-	 *                            and corresponding objects (e.g: {@link fabric.Image})
-	 *                            are initialized
-	 * @param [reviver] Method for further parsing of JSON elements, called after each fabric object created.
-	 */
-	loadFromJSON(json: string|any, callback: () => void, reviver?: Function): this;
-	/**
-	 * Clones canvas instance
-	 * @param [callback] Receives cloned instance as a first argument
-	 * @param [properties] Array of properties to include in the cloned canvas and children
-	 */
-	clone(callback: (canvas: StaticCanvas) => void, properties?: string[]): void;
-
-	/**
-	 * Clones canvas instance without cloning existing data.
-	 * This essentially copies canvas dimensions, clipping properties, etc.
-	 * but leaves data empty (so that you can populate it with your own)
-	 * @param [callback] Receives cloned instance as a first argument
-	 */
-	cloneWithoutData(callback: (canvas: StaticCanvas) => void): void;
-
-	/**
-	 * Callback; invoked right before object is about to be scaled/rotated
-	 */
-	onBeforeScaleRotate(target: Object): void;
-
-	// Functions from object straighten mixin
-	// --------------------------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Straightens object, then rerenders canvas
-	 * @param object Object to straighten
-	 */
-	straightenObject(object: Object): this;
-
-	/**
-	 * Same as straightenObject, but animated
-	 * @param object Object to straighten
-	 */
-	fxStraightenObject(object: Object): this;
-
-	static EMPTY_JSON: string;
-	/**
-	 * Provides a way to check support of some of the canvas methods
-	 * (either those of HTMLCanvasElement itself, or rendering context)
-	 * @param methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
-	 */
-	static supports(methodName: "getImageData" | "toDataURL" | "toDataURLWithQuality" | "setLineDash"): boolean;
-	/**
-	 * Returns JSON representation of canvas
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	static toJSON(propertiesToInclude?: string[]): string;
-}
-
-interface ICanvasOptions extends IStaticCanvasOptions {
-	/**
-	 * When true, objects can be transformed by one side (unproportionally)
-	 */
-	uniScaleTransform?: boolean;
-
-	/**
-	 * When true, objects use center point as the origin of scale transformation.
-	 * <b>Backwards incompatibility note:</b> This property replaces "centerTransform" (Boolean).
-	 */
-	centeredScaling?: boolean;
-
-	/**
-	 * When true, objects use center point as the origin of rotate transformation.
-	 * <b>Backwards incompatibility note:</b> This property replaces "centerTransform" (Boolean).
-	 */
-	centeredRotation?: boolean;
-
-	/**
-	 * Indicates that canvas is interactive. This property should not be changed.
-	 */
-	interactive?: boolean;
-
-	/**
-	 * Indicates whether group selection should be enabled
-	 */
-	selection?: boolean;
-
-	/**
-	 * Color of selection
-	 */
-	selectionColor?: string;
-
-	/**
-	 * Default dash array pattern
-	 * If not empty the selection border is dashed
-	 */
-	selectionDashArray?: any[];
-
-	/**
-	 * Color of the border of selection (usually slightly darker than color of selection itself)
-	 */
-	selectionBorderColor?: string;
-
-	/**
-	 * Width of a line used in object/group selection
-	 */
-	selectionLineWidth?: number;
-
-	/**
-	 * Default cursor value used when hovering over an object on canvas
-	 */
-	hoverCursor?: string;
-
-	/**
-	 * Default cursor value used when moving an object on canvas
-	 */
-	moveCursor?: string;
-
-	/**
-	 * Default cursor value used for the entire canvas
-	 */
-	defaultCursor?: string;
-
-	/**
-	 * Cursor value used during free drawing
-	 */
-	freeDrawingCursor?: string;
-
-	/**
-	 * Cursor value used for rotation point
-	 */
-	rotationCursor?: string;
-
-	/**
-	 * Default element class that's given to wrapper (div) element of canvas
-	 */
-	containerClass?: string;
-
-	/**
-	 * When true, object detection happens on per-pixel basis rather than on per-bounding-box
-	 */
-	perPixelTargetFind?: boolean;
-
-	/**
-	 * Number of pixels around target pixel to tolerate (consider active) during object detection
-	 */
-	targetFindTolerance?: number;
-
-	/**
-	 * When true, target detection is skipped when hovering over canvas. This can be used to improve performance.
-	 */
-	skipTargetFind?: boolean;
-
-	/**
-	 * When true, mouse events on canvas (mousedown/mousemove/mouseup) result in free drawing.
-	 * After mousedown, mousemove creates a shape,
-	 * and then mouseup finalizes it and adds an instance of `fabric.Path` onto canvas.
-	 */
-	isDrawingMode?: boolean;
-}
-export interface Canvas extends StaticCanvas {}
-export interface Canvas extends ICanvasOptions {}
-export class Canvas {
-	/**
-	 * Constructor
-	 * @param element <canvas> element to initialize instance on
-	 * @param [options] Options object
-	 */
-	constructor(element: HTMLCanvasElement | string, options?: ICanvasOptions);
-
-	_objects: Object[];
-
-	/**
-	 * Checks if point is contained within an area of given object
-	 * @param e Event object
-	 * @param target Object to test against
-	 */
-	containsPoint(e: Event, target: Object): boolean;
-	/**
-	 * Deactivates all objects on canvas, removing any active group or object
-	 * @return thisArg
-	 */
-	deactivateAll(): Canvas;
-	/**
-	 * Deactivates all objects and dispatches appropriate events
-	 * @param [e] Event (passed along when firing)
-	 * @return thisArg
-	 */
-	deactivateAllWithDispatch(e?: Event): Canvas;
-	/**
-	 * Discards currently active group
-	 * @param [e] Event (passed along when firing)
-	 * @return thisArg
-	 */
-	discardActiveGroup(e?: Event): Canvas;
-	/**
-	 * Discards currently active object
-	 * @param [e] Event (passed along when firing)
-	 * @return thisArg
-	 * @chainable
-	 */
-	discardActiveObject(e?: Event): Canvas;
-	/**
-	 * Draws objects' controls (borders/controls)
-	 * @param ctx Context to render controls on
-	 */
-	drawControls(ctx: CanvasRenderingContext2D): void;
-	/**
-	 * Method that determines what object we are clicking on
-	 * @param e mouse event
-	 * @param skipGroup when true, group is skipped and only objects are traversed through
-	 */
-	findTarget(e: MouseEvent, skipGroup: boolean): Canvas;
-	/**
-	 * Returns currently active group
-	 * @return Current group
-	 */
-	getActiveGroup(): Group;
-	/**
-	 * Returns currently active object
-	 * @return active object
-	 */
-	getActiveObject(): Object;
-	/**
-	 * Returns pointer coordinates relative to canvas.
-	 * @return object with "x" and "y" number values
-	 */
-	getPointer(e: Event, ignoreZoom?: boolean, upperCanvasEl?: CanvasRenderingContext2D): { x: number; y: number; };
-	/**
-	 * Returns context of canvas where object selection is drawn
-	 */
-	getSelectionContext(): CanvasRenderingContext2D;
-	/**
-	 * Returns <canvas> element on which object selection is drawn
-	 */
-	getSelectionElement(): HTMLCanvasElement;
-	/**
-	 * Returns true if object is transparent at a certain location
-	 * @param target Object to check
-	 * @param x Left coordinate
-	 * @param y Top coordinate
-	 */
-	isTargetTransparent(target: Object, x: number, y: number): boolean;
-	/**
-	 * Sets active group to a speicified one
-	 * @param group Group to set as a current one
-	 * @param [e] Event (passed along when firing)
-	 */
-	setActiveGroup(group: Group, e?: Event): Canvas;
-	/**
-	 * Sets given object as the only active object on canvas
-	 * @param object Object to set as an active one
-	 * @param [e] Event (passed along when firing "object:selected")
-	 */
-	setActiveObject(object: Object, e?: Event): Canvas;
-	/**
-	 * Set the cursor type of the canvas element
-	 * @param value Cursor type of the canvas element.
-	 * @see http://www.w3.org/TR/css3-ui/#cursor
-	 */
-	setCursor(value: string): void;
-
-	/**
-	 * Removes all event listeners
-	 */
-	removeListeners(): void;
-
-	static EMPTY_JSON: string;
-	/**
-	 * Provides a way to check support of some of the canvas methods
-	 * (either those of HTMLCanvasElement itself, or rendering context)
-	 * @param methodName Method to check support for; Could be one of "getImageData", "toDataURL", "toDataURLWithQuality" or "setLineDash"
-	 */
-	static supports(methodName: "getImageData" | "toDataURL" | "toDataURLWithQuality" | "setLineDash"): boolean;
-	/**
-	 * Returns JSON representation of canvas
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	static toJSON(propertiesToInclude?: string[]): string;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Shape Interfaces
-//////////////////////////////////////////////////////////////////////////////
-
-interface ICircleOptions extends IObjectOptions {
-	/**
-	 * Radius of this circle
-	 */
-	radius?: number;
-	/**
-	 * Start angle of the circle, moving clockwise
-	 */
-	startAngle?: number;
-
-	/**
-	 * End angle of the circle
-	 */
-	endAngle?: number;
-}
-export interface Circle extends Object, ICircleOptions {}
-export class Circle {
-	constructor(options?: ICircleOptions);
-
-	/**
-	 * Returns complexity of an instance
-	 * @return complexity of this instance
-	 */
-	complexity(): number;
-	/**
-	 * Returns horizontal radius of an object (according to how an object is scaled)
-	 */
-	getRadiusX(): number;
-	/**
-	 * Returns vertical radius of an object (according to how an object is scaled)
-	 */
-	getRadiusY(): number;
-	/**
-	 * Sets radius of an object (and updates width accordingly)
-	 */
-	setRadius(value: number): number;
-
-	/**
-	 * Returns object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return object representation of an instance
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns svg representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-
-	/**
-	 * List of attribute names to account for when parsing SVG element (used by {@link fabric.Circle.fromElement})
-	 */
-	static ATTRIBUTE_NAMES: string[];
-	/**
-	 * Returns Circle instance from an SVG element
-	 * @param element Element to parse
-	 * @param [options] Options object
-	 */
-	static fromElement(element: SVGElement, options: ICircleOptions): Circle;
-	/**
-	 * Returns Circle instance from an object representation
-	 * @param object Object to create an instance from
-	 */
-	static fromObject(object: any): Circle;
-}
-
-interface IEllipseOptions extends IObjectOptions {
-	/**
-	 * Horizontal radius
-	 */
-	rx?: number;
-	/**
-	 * Vertical radius
-	 */
-	ry?: number;
-}
-export interface Ellipse extends Object, IEllipseOptions {}
-export class Ellipse {
-	constructor(options?: IEllipseOptions);
-
-	/**
-	 * Returns horizontal radius of an object (according to how an object is scaled)
-	 */
-	getRx(): number;
-
-	/**
-	 * Returns Vertical radius of an object (according to how an object is scaled)
-	 */
-	getRy(): number;
-	/**
-	 * Returns object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return object representation of an instance
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns svg representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-	/**
-	 * Returns complexity of an instance
-	 * @return complexity
-	 */
-	complexity(): number;
-
-	/**
-	 * List of attribute names to account for when parsing SVG element (used by {@link fabric.Ellipse.fromElement})
-	 */
-	static ATTRIBUTE_NAMES: string[];
-
-	/**
-	 * Returns Ellipse instance from an SVG element
-	 * @param element Element to parse
-	 * @param [options] Options object
-	 */
-	static fromElement(element: SVGElement, options?: IEllipseOptions): Ellipse;
-
-	/**
-	 * Returns Ellipse instance from an object representation
-	 * @param object Object to create an instance from
-	 */
-	static fromObject(object: any): Ellipse;
-}
-
-export interface Group extends Object, ICollection<Group> {}
-export class Group {
-	/**
-	 * Constructor
-	 * @param objects Group objects
-	 * @param [options] Options object
-	 */
-	constructor(items?: any[], options?: IObjectOptions);
-
-	activateAllObjects(): Group;
-	/**
-	 * Adds an object to a group; Then recalculates group's dimension, position.
-	 * @return thisArg
-	 * @chainable
-	 */
-	addWithUpdate(object: Object): Group;
-	containsPoint(point: Point): boolean;
-	/**
-	 * Destroys a group (restoring state of its objects)
-	 * @return thisArg
-	 * @chainable
-	 */
-	destroy(): Group;
-	/**
-	 * Returns requested property
-	 * @param prop Property to get
-	 */
-	get(prop: string): any;
-	/**
-	 * Checks whether this group was moved (since `saveCoords` was called last)
-	 * @return true if an object was moved (since fabric.Group#saveCoords was called)
-	 */
-	hasMoved(): boolean;
-	/**
-	 * Removes an object from a group; Then recalculates group's dimension, position.
-	 * @return thisArg
-	 * @chainable
-	 */
-	removeWithUpdate(object: Object): Group;
-	/**
-	 * Renders instance on a given context
-	 * @param ctx context to render instance on
-	 */
-	render(ctx: CanvasRenderingContext2D): void;
-	/**
-	 * 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;
-	/**
-	 * Saves coordinates of this instance (to be used together with `hasMoved`)
-	 * @saveCoords
-	 * @return thisArg
-	 * @chainable
-	 */
-	saveCoords(): Group;
-	/**
-	 * Sets coordinates of all group objects
-	 * @return thisArg
-	 * @chainable
-	 */
-	setObjectsCoords(): Group;
-	/**
-	 * Returns object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return object representation of an instance
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns string represenation of a group
-	 */
-	toString(): string;
-	/**
-	 * Returns svg representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-
-	/**
-	 * Returns {@link fabric.Group} instance from an object representation
-	 * @param object Object to create a group from
-	 * @param [callback] Callback to invoke when an group instance is created
-	 */
-	static fromObject(object: any, callback: (group: Group) => any): void;
-}
-
-interface IImageOptions extends IObjectOptions {
-	/**
-	 * crossOrigin value (one of "", "anonymous", "allow-credentials")
-	 */
-	crossOrigin?: string;
-
-	/**
-	 * AlignX value, part of preserveAspectRatio (one of "none", "mid", "min", "max")
-	 * This parameter defines how the picture is aligned to its viewport when image element width differs from image width.
-	 */
-	alignX?: string;
-
-	/**
-	 * AlignY value, part of preserveAspectRatio (one of "none", "mid", "min", "max")
-	 * This parameter defines how the picture is aligned to its viewport when image element height differs from image height.
-	 */
-	alignY?: string;
-
-	/**
-	 * meetOrSlice value, part of preserveAspectRatio  (one of "meet", "slice").
-	 * if meet the image is always fully visibile, if slice the viewport is always filled with image.
-	 * @see http://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute
-	 */
-	meetOrSlice?: string;
-
-	/**
-	 * Image filter array
-	 */
-	filters?: IBaseFilter[];
-}
-interface Image extends Object, IImageOptions {}
-export class Image {
-	/**
-	 * Constructor
-	 * @param element Image element
-	 * @param [options] Options object
-	 */
-	constructor(element: HTMLImageElement, objObjects: IObjectOptions);
-
-	initialize(element?: string|HTMLImageElement, options?: IImageOptions): void;
-	/**
-	 * Applies filters assigned to this image (from "filters" array)
-	 * @param callback Callback is invoked when all filters have been applied and new image is generated
-	 */
-	applyFilters(callback: Function): void;
-	/**
-	 * Returns a clone of an instance
-	 * @param callback Callback is invoked with a clone as a first argument
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	clone(callback?: Function, propertiesToInclude?: string[]): void;
-	/**
-	 * Returns complexity of an instance
-	 * @return complexity of this instance
-	 */
-	complexity(): number;
-	/**
-	 * Returns image element which this instance if based on
-	 * @return Image element
-	 */
-	getElement(): HTMLImageElement;
-	/**
-	 * Returns original size of an image
-	 * @return Object with "width" and "height" properties
-	 */
-	getOriginalSize(): { width: number; height: number; };
-	/**
-	 * Returns source of an image
-	 * @return Source of an image
-	 */
-	getSrc(): string;
-	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
-
-	/**
-	 * Sets image element for this instance to a specified one.
-	 * If filters defined they are applied to new image.
-	 * You might need to call `canvas.renderAll` and `object.setCoords` after replacing, to render new image and update controls area.
-	 * @param [callback] Callback is invoked when all filters have been applied and new image is generated
-	 * @param [options] Options object
-	 */
-	setElement(element: HTMLImageElement, callback: Function, options: IImageOptions): Image;
-	/**
-	 * Sets crossOrigin value (on an instance and corresponding image element)
-	 */
-	setCrossOrigin(value: string): Image;
-	/**
-	 * Returns object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return Object representation of an instance
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns string representation of an instance
-	 * @return String representation of an instance
-	 */
-	toString(): string;
-	/**
-	 * Returns SVG representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-	/**
-	 * Sets source of an image
-	 * @param src Source string (URL)
-	 * @param [callback] Callback is invoked when image has been loaded (and all filters have been applied)
-	 * @param [options] Options object
-	 */
-	setSrc(src: string, callback?: Function, options?: IImageOptions): Image;
-
-	/**
-	 * Creates an instance of fabric.Image from an URL string
-	 * @param url URL to create an image from
-	 * @param [callback] Callback to invoke when image is created (newly created image is passed as a first argument)
-	 * @param [imgOptions] Options object
-	 */
-	static fromURL(url: string, callback?: (image: Image) => void, objObjects?: IObjectOptions): Image;
-	/**
-	 * Creates an instance of fabric.Image from its object representation
-	 * @param object Object to create an instance from
-	 * @param [callback] Callback to invoke when an image instance is created
-	 */
-	static fromObject(object: any, callback: (image: Image) => void): void;
-	/**
-	 * Returns Image instance from an SVG element
-	 * @param element Element to parse
-	 * @param callback Callback to execute when fabric.Image object is created
-	 * @param [options] Options object
-	 */
-	static fromElement(element: SVGElement, callback: (image: Image) => void, options?: IImageOptions): void;
-	/**
-	 * Default CSS class name for canvas
-	 */
-	static CSS_CANVAS: string;
-
-	static filters: IAllFilters;
-}
-
-interface ILineOptions extends IObjectOptions {
-	/**
-	 * x value or first line edge
-	 */
-	x1: number;
-	/**
-	 * x value or second line edge
-	 */
-	x2: number;
-	/**
-	 * y value or first line edge
-	 */
-	y1: number;
-	/**
-	 * y value or second line edge
-	 */
-	y2: number;
-}
-export interface Line extends Object, ILineOptions {}
-export class Line {
-	/**
-	 * Constructor
-	 * @param [points] Array of points
-	 * @param [options] Options object
-	 */
-	constructor(points?: number[], objObjects?: IObjectOptions);
-	/**
-	 * Returns complexity of an instance
-	 * @return complexity
-	 */
-	complexity(): number;
-	initialize(points?: number[], options?: ILineOptions): Line;
-	/**
-	 * Returns object representation of an instance
-	 * @methd toObject
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return object representation of an instance
-	 */
-	toObject(propertiesToInclude: string[]): any;
-	/**
-	 * Returns SVG representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-
-	static ATTRIBUTE_NAMES: string[];
-	/**
-	 * Returns fabric.Line instance from an SVG element
-	 * @param element Element to parse
-	 * @param [options] Options object
-	 */
-	static fromElement(element: SVGElement, options?: ILineOptions): Line;
-	/**
-	 * Returns fabric.Line instance from an object representation
-	 * @param object Object to create an instance from
-	 */
-	static fromObject(object: any): Line;
-}
-
-interface IObjectOptions {
-	/**
-	 * Type of an object (rect, circle, path, etc.).
-	 * Note that this property is meant to be read-only and not meant to be modified.
-	 * If you modify, certain parts of Fabric (such as JSON loading) won't work correctly.
-	 */
-	type?: string;
-
-	/**
-	 * Horizontal origin of transformation of an object (one of "left", "right", "center")
-	 */
-	originX?: string;
-
-	/**
-	 * Vertical origin of transformation of an object (one of "top", "bottom", "center")
-	 */
-	originY?: string;
-
-	/**
-	 * Top position of an object. Note that by default it's relative to object center. You can change this by setting originY={top/center/bottom}
-	 */
-	top?: number;
-
-	/**
-	 * Left position of an object. Note that by default it's relative to object center. You can change this by setting originX={left/center/right}
-	 */
-	left?: number;
-
-	/**
-	 * Object width
-	 */
-	width?: number;
-
-	/**
-	 * Object height
-	 */
-	height?: number;
-
-	/**
-	 * Object scale factor (horizontal)
-	 */
-	scaleX?: number;
-
-	/**
-	 * Object scale factor (vertical)
-	 */
-	scaleY?: number;
-
-	/**
-	 * When true, an object is rendered as flipped horizontally
-	 */
-	flipX?: boolean;
-
-	/**
-	 * When true, an object is rendered as flipped vertically
-	 */
-	flipY?: boolean;
-
-	/**
-	 * Opacity of an object
-	 */
-	opacity?: number;
-
-	/**
-	 * Angle of rotation of an object (in degrees)
-	 */
-	angle?: number;
-
-	/**
-	 * When true, object's controlling corners are rendered as transparent inside (i.e. stroke instead of fill)
-	 */
-	transparentCorners?: boolean;
-
-	/**
-	 * Default cursor value used when hovering over this object on canvas
-	 */
-	hoverCursor?: string;
-
-	/**
-	 * Padding between object and its controlling borders (in pixels)
-	 */
-	padding?: number;
-
-	/**
-	 * Color of controlling borders of an object (when it's active)
-	 */
-	borderColor?: string;
-
-	/**
-	 * Color of controlling corners of an object (when it's active)
-	 */
-	cornerColor?: string;
-
-	/**
-	 * Array specifying dash pattern of an object's control (hasBorder must be true)
-	 */
-	cornerDashArray?: number[];
-
-	/**
-	 * Size of object's controlling corners (in pixels)
-	 */
-	cornerSize?: number;
-
-	/**
-	 * Color of controlling corners of an object (when it's active and transparentCorners false)
-	 */
-	cornerStrokeColor?: string;
-
-	/**
-	 * Specify style of control, 'rect' or 'circle'
-	 */
-	cornerStyle?: "rect" | "circle";
-
-	/**
-	 * When true, this object will use center point as the origin of transformation
-	 * when being scaled via the controls.
-	 * <b>Backwards incompatibility note:</b> This property replaces "centerTransform" (Boolean).
-	 */
-	centeredScaling?: boolean;
-
-	/**
-	 * When true, this object will use center point as the origin of transformation
-	 * when being rotated via the controls.
-	 * <b>Backwards incompatibility note:</b> This property replaces "centerTransform" (Boolean).
-	 */
-	centeredRotation?: boolean;
-
-	/**
-	 * Color of object's fill
-	 */
-	fill?: string;
-
-	/**
-	 * Fill rule used to fill an object
-	 * accepted values are nonzero, evenodd
-	 * Backwards incompatibility note: This property was used for setting globalCompositeOperation until v1.4.12, use `globalCompositeOperation` instead
-	 */
-	fillRule?: string;
-
-	/**
-	 * Composite rule used for canvas globalCompositeOperation
-	 */
-	globalCompositeOperation?: string;
-
-	/**
-	 * Background color of an object. Only works with text objects at the moment.
-	 */
-	backgroundColor?: string;
-
-	/**
-	 * When defined, an object is rendered via stroke and this property specifies its color
-	 */
-	stroke?: string;
-
-	/**
-	 * Width of a stroke used to render this object
-	 */
-	strokeWidth?: number;
-
-	/**
-	 * Array specifying dash pattern of an object's stroke (stroke must be defined)
-	 */
-	strokeDashArray?: any[];
-
-	/**
-	 * Line endings style of an object's stroke (one of "butt", "round", "square")
-	 */
-	strokeLineCap?: string;
-
-	/**
-	 * Corner style of an object's stroke (one of "bevil", "round", "miter")
-	 */
-	strokeLineJoin?: string;
-
-	/**
-	 * Maximum miter length (used for strokeLineJoin = "miter") of an object's stroke
-	 */
-	strokeMiterLimit?: number;
-
-	/**
-	 * Shadow object representing shadow of this shape
-	 */
-	shadow?: Shadow|string;
-
-	/**
-	 * Opacity of object's controlling borders when object is active and moving
-	 */
-	borderOpacityWhenMoving?: number;
-
-	/**
-	 * Scale factor of object's controlling borders
-	 */
-	borderScaleFactor?: number;
-
-	/**
-	 * Transform matrix (similar to SVG's transform matrix)
-	 */
-	transformMatrix?: any[];
-
-	/**
-	 * Minimum allowed scale value of an object
-	 */
-	minScaleLimit?: number;
-
-	/**
-	 * When set to `false`, an object can not be selected for modification (using either point-click-based or group-based selection).
-	 * But events still fire on it.
-	 */
-	selectable?: boolean;
-
-	/**
-	 * When set to `false`, an object can not be a target of events. All events propagate through it. Introduced in v1.3.4
-	 */
-	evented?: boolean;
-
-	/**
-	 * When set to `false`, an object is not rendered on canvas
-	 */
-	visible?: boolean;
-
-	/**
-	 * When set to `false`, object's controls are not displayed and can not be used to manipulate object
-	 */
-	hasControls?: boolean;
-
-	/**
-	 * When set to `false`, object's controlling borders are not rendered
-	 */
-	hasBorders?: boolean;
-
-	/**
-	 * When set to `false`, object's controlling rotating point will not be visible or selectable
-	 */
-	hasRotatingPoint?: boolean;
-
-	/**
-	 * Offset for object's controlling rotating point (when enabled via `hasRotatingPoint`)
-	 */
-	rotatingPointOffset?: number;
-
-	/**
-	 * When set to `true`, objects are "found" on canvas on per-pixel basis rather than according to bounding box
-	 */
-	perPixelTargetFind?: boolean;
-
-	/**
-	 * When `false`, default object's values are not included in its serialization
-	 */
-	includeDefaultValues?: boolean;
-
-	/**
-	 * Function that determines clipping of an object (context is passed as a first argument)
-	 * Note that context origin is at the object's center point (not left/top corner)
-	 */
-	clipTo?: Function;
-
-	/**
-	 * When `true`, object horizontal movement is locked
-	 */
-	lockMovementX?: boolean;
-
-	/**
-	 * When `true`, object vertical movement is locked
-	 */
-	lockMovementY?: boolean;
-
-	/**
-	 * When `true`, object rotation is locked
-	 */
-	lockRotation?: boolean;
-
-	/**
-	 * When `true`, object horizontal scaling is locked
-	 */
-	lockScalingX?: boolean;
-
-	/**
-	 * When `true`, object vertical scaling is locked
-	 */
-	lockScalingY?: boolean;
-
-	/**
-	 * When `true`, object non-uniform scaling is locked
-	 */
-	lockUniScaling?: boolean;
-
-	/**
-	 * When `true`, object cannot be flipped by scaling into negative values
-	 */
-	lockScalingFlip?: boolean;
-
-	/**
-	 * Not used by fabric, just for convenience
-	 */
-	name?: string;
-
-	/**
-	 * Not used by fabric, just for convenience
-	 */
-	data?: any;
-}
-export interface Object extends IObservable<Object>, IObjectOptions, IObjectAnimation<Object> {}
-export class Object {
-	getCurrentWidth(): number;
-	getCurrentHeight(): number;
-
-	getAngle(): number;
-	setAngle(value: number): Object;
-
-	getBorderColor(): string;
-	setBorderColor(value: string): Object;
-
-	getBorderScaleFactor(): number;
-
-	getCornersize(): number;
-	setCornersize(value: number): Object;
-
-	getFill(): string;
-	setFill(value: string): Object;
-
-	getFillRule(): string;
-	setFillRule(value: string): Object;
-
-	getFlipX(): boolean;
-	setFlipX(value: boolean): Object;
-
-	getFlipY(): boolean;
-	setFlipY(value: boolean): Object;
-
-	getHeight(): number;
-	setHeight(value: number): Object;
-
-	getLeft(): number;
-	setLeft(value: number): Object;
-
-	getOpacity(): number;
-	setOpacity(value: number): Object;
-
-	overlayFill: string;
-	getOverlayFill(): string;
-	setOverlayFill(value: string): Object;
-
-	getScaleX(): number;
-	setScaleX(value: number): Object;
-
-	getScaleY(): number;
-	setScaleY(value: number): Object;
-
-	setShadow(options: any): Object;
-	getShadow(): Object;
-
-	stateProperties: any[];
-	getTop(): number;
-	setTop(value: number): Object;
-
-	getWidth(): number;
-	setWidth(value: number): Object;
-
-	/* * Sets object's properties from options
-		* @param {Object} [options] Options object
-		*/
-	setOptions(options: IObjectOptions): void;
-
-	/**
-	 * Transforms context when rendering an object
-	 * @param ctx Context
-	 * @param fromLeft When true, context is transformed to object's top/left corner. This is used when rendering text on Node
-	 */
-	transform(ctx: CanvasRenderingContext2D, fromLeft: boolean): void;
-
-	/**
-	 * Returns an object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-
-	/**
-	 * Returns (dataless) object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	toDatalessObject(propertiesToInclude?: string[]): any;
-
-	/**
-	 * Returns a string representation of an instance
-	 */
-	toString(): string;
-
-	/**
-	 * Basic getter
-	 * @param property Property name
-	 */
-	get<K extends keyof this>(property: K): this[K];
-
-	/**
-	 * Sets property to a given value.
-	 * When changing position/dimension -related properties (left, top, scale, angle, etc.) `set` does not update position of object's borders/controls.
-	 * If you need to update those, call `setCoords()`.
-	 * @param key Property name
-	 * @param value Property value (if function, the value is passed into it and its return value is used as a new one)
-	 */
-	set<K extends keyof this>(key: K, value: this[K] | ((value: this[K]) => this[K])): this;
-	/**
-	 * Sets property to a given value.
-	 * When changing position/dimension -related properties (left, top, scale, angle, etc.) `set` does not update position of object's borders/controls.
-	 * If you need to update those, call `setCoords()`.
-	 * @param options Property object, iterate over the object properties
-	 */
-	set(options: Partial<this>): this;
-
-	/**
-	 * Toggles specified property from `true` to `false` or from `false` to `true`
-	 * @param property Property to toggle
-	 */
-	toggle(property: keyof this): this;
-
-	/**
-	 * Sets sourcePath of an object
-	 * @param value Value to set sourcePath to
-	 */
-	setSourcePath(value: string): this;
-
-	/**
-	 * Retrieves viewportTransform from Object's canvas if possible
-	 */
-	getViewportTransform(): boolean;
-
-	/**
-	 * Renders an object on a specified context
-	 * @param ctx Context to render on
-	 * @param [noTransform] When true, context is not transformed
-	 */
-	render(ctx: CanvasRenderingContext2D, noTransform?: boolean): void;
-
-	/**
-	 * Clones an instance, using a callback method will work for every object.
-	 * @param callback Callback is invoked with a clone as a first argument
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	clone(callback: (clone: Object) => void, propertiesToInclude?: string[]): void;
-
-	/**
-	 * Creates an instance of fabric.Image out of an object
-	 * @param callback callback, invoked with an instance as a first argument
-	 */
-	cloneAsImage(callback: (image: Image) => void): this;
-
-	/**
-	 * Converts an object into a data-url-like string
-	 * @param options Options object
-	 */
-	toDataURL(options: IDataURLOptions): string;
-
-	/**
-	 * Returns true if specified type is identical to the type of an instance
-	 * @param type Type to check against
-	 */
-	isType(type: string): boolean;
-
-	/**
-	 * Returns complexity of an instance
-	 */
-	complexity(): number;
-
-	/**
-	 * Returns a JSON representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	toJSON(propertiesToInclude?: string[]): any;
-
-	/**
-	 * Sets gradient (fill or stroke) of an object
-	 * **Backwards incompatibility note:** This method was named "setGradientFill" until v1.1.0
-	 * @param property Property name 'stroke' or 'fill'
-	 * @param [options] Options object
-	 */
-	setGradient(property: "stroke" | "fill", options: IGradientOptions): this;
-	/**
-	 * Sets pattern fill of an object
-	 * @param options Options object
-	 */
-	setPatternFill(options: IFillOptions): this;
-
-	/**
-	 * Sets shadow of an object
-	 * @param [options] Options object or string (e.g. "2px 2px 10px rgba(0,0,0,0.2)")
-	 */
-	setShadow(options?: string | Shadow): this;
-
-	/**
-	 * Sets "color" of an instance (alias of `set('fill', …)`)
-	 * @param color Color value
-	 */
-	setColor(color: string): this;
-
-	/**
-	 * Sets "angle" of an instance
-	 * @param angle Angle value
-	 */
-	setAngle(angle: number): this;
-
-	/**
-	 * Sets "angle" of an instance
-	 * @param angle Angle value
-	 */
-	rotate(angle: number): this;
-
-	/**
-	 * Centers object horizontally on canvas to which it was added last.
-	 * You might need to call `setCoords` on an object after centering, to update controls area.
-	 */
-	centerH(): this;
-
-	/**
-	 * Centers object vertically on canvas to which it was added last.
-	 * You might need to call `setCoords` on an object after centering, to update controls area.
-	 */
-	centerV(): this;
-
-	/**
-	 * Centers object vertically and horizontally on canvas to which is was added last
-	 * You might need to call `setCoords` on an object after centering, to update controls area.
-	 */
-	center(): this;
-
-	/**
-	 * Removes object from canvas to which it was added last
-	 */
-	remove(): Object;
-
-	/**
-	 * Returns coordinates of a pointer relative to an object
-	 * @param e Event to operate upon
-	 * @param [pointer] Pointer to operate upon (instead of event)
-	 */
-	getLocalPointer(e: Event, pointer?: { x: number, y: number }): { x: number, y: number };
-
-	/**
-	 * Sets object's properties from options
-	 * @param [options] Options object
-	 */
-	setOptions(options: any): void;
-	/**
-	 * Sets sourcePath of an object
-	 * @param value Value to set sourcePath to
-	 */
-	setSourcePath(value: string): Object;
-	// functions from object svg export mixin
-	// -----------------------------------------------------------------------------------------------------------------------------------
-	/**
-	 * Returns styles-string for svg-export
-	 */
-	getSvgStyles(): string;
-	/**
-	 * Returns transform-string for svg-export
-	 */
-	getSvgTransform(): string;
-	/**
-	 * Returns transform-string for svg-export from the transform matrix of single elements
-	 */
-	getSvgTransformMatrix(): string;
-
-	// functions from stateful mixin
-	// -----------------------------------------------------------------------------------------------------------------------------------
-	/**
-	 * Returns true if object state (one of its state properties) was changed
-	 */
-	hasStateChanged(): boolean;
-	/**
-	 * Saves state of an object
-	 * @param [options] Object with additional `stateProperties` array to include when saving state
-	 * @return thisArg
-	 */
-	saveState(options?: { stateProperties: any[] }): this;
-	/**
-	 * Setups state of an object
-	 */
-	setupState(): this;
-	// functions from object straightening mixin
-	// -----------------------------------------------------------------------------------------------------------------------------------
-	/**
-	 * Straightens an object (rotating it from current angle to one of 0, 90, 180, 270, etc. depending on which is closer)
-	 */
-	straighten(): this;
-	/**
-	 * Same as straighten but with animation
-	 */
-	fxStraighten(callbacks: Callbacks): this;
-
-	// functions from object stacking mixin
-	// -----------------------------------------------------------------------------------------------------------------------------------
-	/**
-	 * Moves an object up in stack of drawn objects
-	 * @param [intersecting] If `true`, send object in front of next upper intersecting object
-	 */
-	bringForward(intersecting?: boolean): this;
-	/**
-	 * Moves an object to the top of the stack of drawn objects
-	 */
-	bringToFront(): this;
-	/**
-	 * Moves an object down in stack of drawn objects
-	 * @param [intersecting] If `true`, send object behind next lower intersecting object
-	 */
-	sendBackwards(intersecting?: boolean): this;
-	/**
-	 * Moves an object to the bottom of the stack of drawn objects
-	 */
-	sendToBack(): this;
-	/**
-	 * Moves an object to specified level in stack of drawn objects
-	 * @param index New position of object
-	 */
-	moveTo(index: number): this;
-
-	// functions from object origin mixin
-	// -----------------------------------------------------------------------------------------------------------------------------------
-	/**
-	 * Translates the coordinates from origin to center coordinates (based on the object's dimensions)
-	 * @param point The point which corresponds to the originX and originY params
-	 * @param originX Horizontal origin: 'left', 'center' or 'right'
-	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
-	 */
-	translateToCenterPoint(point: Point, originX: string, originY: string): Point;
-
-	/**
-	 * Translates the coordinates from center to origin coordinates (based on the object's dimensions)
-	 * @param center The point which corresponds to center of the object
-	 * @param originX Horizontal origin: 'left', 'center' or 'right'
-	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
-	 */
-	translateToOriginPoint(center: Point, originX: string, originY: string): Point;
-	/**
-	 * Returns the real center coordinates of the object
-	 */
-	getCenterPoint(): Point;
-
-	/**
-	 * Returns the coordinates of the object as if it has a different origin
-	 * @param originX Horizontal origin: 'left', 'center' or 'right'
-	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
-	 */
-	getPointByOrigin(): Point;
-
-	/**
-	 * Returns the point in local coordinates
-	 * @param point The point relative to the global coordinate system
-	 * @param originX Horizontal origin: 'left', 'center' or 'right'
-	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
-	 */
-	toLocalPoint(point: Point, originX: string, originY: string): Point;
-
-	/**
-	 * Sets the position of the object taking into consideration the object's origin
-	 * @param pos The new position of the object
-	 * @param originX Horizontal origin: 'left', 'center' or 'right'
-	 * @param originY Vertical origin: 'top', 'center' or 'bottom'
-	 */
-	setPositionByOrigin(pos: Point, originX: string, originY: string): void;
-
-	/**
-	 * @param to One of 'left', 'center', 'right'
-	 */
-	adjustPosition(to: string): void;
-
-	// functions from interactivity mixin
-	// -----------------------------------------------------------------------------------------------------------------------------------
-	/**
-	 * Draws borders of an object's bounding box.
-	 * Requires public properties: width, height
-	 * Requires public options: padding, borderColor
-	 * @param ctx Context to draw on
-	 */
-	drawBorders(context: CanvasRenderingContext2D): this;
-
-	/**
-	 * Draws corners of an object's bounding box.
-	 * Requires public properties: width, height
-	 * Requires public options: cornerSize, padding
-	 * @param ctx Context to draw on
-	 */
-	drawCorners(context: CanvasRenderingContext2D): Object;
-
-	/**
-	 * Returns true if the specified control is visible, false otherwise.
-	 * @param controlName The name of the control. Possible values are 'tl', 'tr', 'br', 'bl', 'ml', 'mt', 'mr', 'mb', 'mtr'.
-	 */
-	isControlVisible(controlName: string): boolean;
-	/**
-	 * Sets the visibility of the specified control.
-	 * @param controlName The name of the control. Possible values are 'tl', 'tr', 'br', 'bl', 'ml', 'mt', 'mr', 'mb', 'mtr'.
-	 * @param visible true to set the specified control visible, false otherwise
-	 */
-	setControlVisible(controlName: string, visible: boolean): this;
-
-	/**
-	 * Sets the visibility state of object controls.
-	 * @param [options] Options object
-	 */
-	setControlsVisibility(options?: {
-		bl?: boolean;
-		br?: boolean;
-		mb?: boolean;
-		ml?: boolean;
-		mr?: boolean;
-		mt?: boolean;
-		tl?: boolean;
-		tr?: boolean;
-		mtr?: boolean; }): this;
-
-	// functions from geometry mixin
-	// -------------------------------------------------------------------------------------------------------------------------------
-	/**
-	 * Sets corner position coordinates based on current angle, width and height
-	 * See https://github.com/kangax/fabric.js/wiki/When-to-call-setCoords
-	 */
-	setCoords(): this;
-	/**
-	 * Returns coordinates of object's bounding rectangle (left, top, width, height)
-	 * @return Object with left, top, width, height properties
-	 */
-	getBoundingRect(): { left: number; top: number; width: number; height: number };
-	/**
-	 * Checks if object is fully contained within area of another object
-	 * @param other Object to test
-	 */
-	isContainedWithinObject(other: Object): boolean;
-	/**
-	 * Checks if object is fully contained within area formed by 2 points
-	 * @param pointTL top-left point of area
-	 * @param pointBR bottom-right point of area
-	 */
-	isContainedWithinRect(pointTL: any, pointBR: any): boolean;
-	/**
-	 * Checks if point is inside the object
-	 * @param point Point to check against
-	 */
-	containsPoint(point: Point): boolean;
-	/**
-	 * Scales an object (equally by x and y)
-	 * @param value Scale factor
-	 * @return thisArg
-	 */
-	scale(value: number): this;
-	/**
-	 * Scales an object to a given height, with respect to bounding box (scaling by x/y equally)
-	 * @param value New height value
-	 */
-	scaleToHeight(value: number): this;
-	/**
-	 * Scales an object to a given width, with respect to bounding box (scaling by x/y equally)
-	 * @param value New width value
-	 */
-	scaleToWidth(value: number): this;
-	/**
-	 * Checks if object intersects with another object
-	 * @param other Object to test
-	 */
-	intersectsWithObject(other: Object): boolean;
-	/**
-	 * Checks if object intersects with an area formed by 2 points
-	 * @param pointTL top-left point of area
-	 * @param pointBR bottom-right point of area
-	 */
-	intersectsWithRect(pointTL: any, pointBR: any): boolean;
-}
-
-interface IPathOptions extends IObjectOptions {
-	/**
-	 * Array of path points
-	 */
-	path?: any[];
-
-	/**
-	 * Minimum X from points values, necessary to offset points
-	 */
-	minX?: number;
-
-	/**
-	 * Minimum Y from points values, necessary to offset points
-	 */
-	minY?: number;
-}
-export interface Path extends Object, IPathOptions {}
-export class Path {
-	/**
-	 * Constructor
-	 * @param path Path data (sequence of coordinates and corresponding "command" tokens)
-	 * @param [options] Options object
-	 */
-	constructor(path?: string|any[], options?: IPathOptions);
-
-	initialize(path?: any[], options?: IPathOptions): Path;
-
-	/**
-	 * Returns number representation of an instance complexity
-	 * @return complexity of this instance
-	 */
-	complexity(): number;
-
-	/**
-	 * Renders path on a specified context
-	 * @param ctx context to render path on
-	 * @param [noTransform] When true, context is not transformed
-	 */
-	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
-	/**
-	 * Returns dataless object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return object representation of an instance
-	 */
-	toDatalessObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return object representation of an instance
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns string representation of an instance
-	 * @return string representation of an instance
-	 */
-	toString(): string;
-	/**
-	 * Returns svg representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-
-	/**
-	 * Creates an instance of fabric.Path from an SVG <path> element
-	 * @param element to parse
-	 * @param callback Callback to invoke when an fabric.Path instance is created
-	 * @param [options] Options object
-	 */
-	static fromElement(element: SVGElement, callback: (path: Path) => any, options?: IPathOptions): void;
-	/**
-	 * Creates an instance of fabric.Path from an object
-	 * @param callback Callback to invoke when an fabric.Path instance is created
-	 */
-	static fromObject(object: any, callback: (path: Path) => any): void;
-}
-
-export class PathGroup extends Object {
-	/**
-	 * Constructor
-	 * @param [options] Options object
-	 */
-	constructor(paths: Path[], options?: IObjectOptions);
-
-	initialize(paths: Path[], options?: IObjectOptions): void;
-	/**
-	 * Returns number representation of object's complexity
-	 * @return complexity
-	 */
-	complexity(): number;
-	/**
-	 * Returns true if all paths in this group are of same color
-	 * @return true if all paths are of the same color (`fill`)
-	 */
-	isSameColor(): boolean;
-	/**
-	 * Renders this group on a specified context
-	 * @param ctx Context to render this instance on
-	 */
-	render(ctx: CanvasRenderingContext2D): void;
-	/**
-	 * Returns dataless object representation of this path group
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return dataless object representation of an instance
-	 */
-	toDatalessObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns object representation of this path group
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return object representation of an instance
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns a string representation of this path group
-	 * @return string representation of an object
-	 */
-	toString(): string;
-	/**
-	 * Returns svg representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-	/**
-	 * Returns all paths in this path group
-	 * @return array of path objects included in this path group
-	 */
-	getObjects(): Path[];
-
-	static fromObject(object: any): PathGroup;
-	/**
-	 * Creates fabric.PathGroup instance from an object representation
-	 * @param object Object to create an instance from
-	 * @param callback Callback to invoke when an fabric.PathGroup instance is created
-	 */
-	static fromObject(object: any, callback: (group: PathGroup) => any): void;
-}
-
-interface IPolygonOptions extends IObjectOptions {
-	/**
-	 * Points array
-	 */
-	points?: Point[];
-
-	/**
-	 * Minimum X from points values, necessary to offset points
-	 */
-	minX?: number;
-
-	/**
-	 * Minimum Y from points values, necessary to offset points
-	 */
-	minY?: number;
-}
-export interface Polygon extends IPolygonOptions {}
-export class Polygon extends Object {
-	/**
-	 * Constructor
-	 * @param points Array of points
-	 * @param [options] Options object
-	 */
-	constructor(points: Array<{ x: number; y: number }>, options?: IObjectOptions, skipOffset?: boolean);
-
-	/**
-	 * Returns complexity of an instance
-	 * @return complexity of this instance
-	 */
-	complexity(): number;
-
-	/**
-	 * Returns object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return object representation of an instance
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns svg representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-
-	/**
-	 * List of attribute names to account for when parsing SVG element (used by `fabric.Polygon.fromElement`)
-	 */
-	static ATTRIBUTE_NAMES: string[];
-
-	/**
-	 * Returns Polygon instance from an SVG element
-	 * @param element Element to parse
-	 * @param [options] Options object
-	 */
-	static fromElement(element: SVGElement, options?: IPolygonOptions): Polygon;
-	/**
-	 * Returns fabric.Polygon instance from an object representation
-	 * @param object Object to create an instance from
-	 */
-	static fromObject(object: any): Polygon;
-}
-
-interface IPolylineOptions extends IObjectOptions {
-	/**
-	 * Points array
-	 */
-	points?: Point[];
-
-	/**
-	 * Minimum X from points values, necessary to offset points
-	 */
-	minX?: number;
-
-	/**
-	 * Minimum Y from points values, necessary to offset points
-	 */
-	minY?: number;
-}
-export interface Polyline extends IPolylineOptions {}
-export class Polyline extends Object {
-	/**
-	 * Constructor
-	 * @param points Array of points (where each point is an object with x and y)
-	 * @param [options] Options object
-	 * @param [skipOffset] Whether points offsetting should be skipped
-	 */
-	constructor(points: Array<{ x: number; y: number }>, options?: IPolylineOptions);
-	initialize(points: Point[], options?: IPolylineOptions): void;
-	/**
-	 * Returns complexity of an instance
-	 * @return complexity of this instance
-	 */
-	complexity(): number;
-	/**
-	 * Returns object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return Object representation of an instance
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns SVG representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-
-	/**
-	 * List of attribute names to account for when parsing SVG element (used by `fabric.Polygon.fromElement`)
-	 */
-	static ATTRIBUTE_NAMES: string[];
-
-	/**
-	 * Returns Polyline  instance from an SVG element
-	 * @param element Element to parse
-	 * @param [options] Options object
-	 */
-	static fromElement(element: SVGElement, options?: IPolylineOptions): Polyline;
-	/**
-	 * Returns fabric.Polyline instance from an object representation
-	 * @param object Object to create an instance from
-	 */
-	static fromObject(object: any): Polyline;
-}
-
-interface IRectOptions extends IObjectOptions {
-	x?: number;
-	y?: number;
-	/**
-	 * Horizontal border radius
-	 */
-	rx?: number;
-
-	/**
-	 * Vertical border radius
-	 */
-	ry?: number;
-}
-
-export interface Rect extends IRectOptions {}
-export class Rect extends Object {
-	/**
-	 * Constructor
-	 * @param [options] Options object
-	 */
-	constructor(options?: IRectOptions);
-	initialize(points?: number[], options?: any): Rect;
-	/**
-	 * Returns complexity of an instance
-	 * @return complexity
-	 */
-	complexity(): number;
-	/**
-	 * Returns object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return object representation of an instance
-	 */
-	toObject(propertiesToInclude: any[]): any;
-	/**
-	 * Returns svg representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-
-	/**
-	 * List of attribute names to account for when parsing SVG element (used by `fabric.Rect.fromElement`)
-	 */
-	static ATTRIBUTE_NAMES: string[];
-	/**
-	 * Returns Rect instance from an SVG element
-	 * @param element Element to parse
-	 * @param [options] Options object
-	 */
-	static fromElement(element: SVGElement, options?: IRectOptions): Rect;
-	/**
-	 * Returns Rect instance from an object representation
-	 * @param object Object to create an instance from
-	 */
-	static fromObject(object: any): Rect;
-}
-
-interface ITextOptions extends IObjectOptions {
-	/**
-	 * Font size (in pixels)
-	 */
-	fontSize?: number;
-	/**
-	 * Font weight (e.g. bold, normal, 400, 600, 800)
-	 */
-	fontWeight?: number|string;
-	/**
-	 * Font family
-	 */
-	fontFamily?: string;
-	/**
-	 * Text decoration Possible values?: "", "underline", "overline" or "line-through".
-	 */
-	textDecoration?: string;
-	/**
-	 * Text alignment. Possible values?: "left", "center", or "right".
-	 */
-	textAlign?: string;
-	/**
-	 * Font style . Possible values?: "", "normal", "italic" or "oblique".
-	 */
-	fontStyle?: string;
-	/**
-	 * Line height
-	 */
-	lineHeight?: number;
-	/**
-	 * When defined, an object is rendered via stroke and this property specifies its color.
-	 * <b>Backwards incompatibility note?:</b> This property was named "strokeStyle" until v1.1.6
-	 */
-	stroke?: string;
-	/**
-	 * Shadow object representing shadow of this shape.
-	 * <b>Backwards incompatibility note?:</b> This property was named "textShadow" (String) until v1.2.11
-	 */
-	shadow?: Shadow|string;
-	/**
-	 * Background color of text lines
-	 */
-	textBackgroundColor?: string;
-
-	path?: string;
-	useNative?: boolean;
-	text?: string;
-}
-export interface Text extends ITextOptions {}
-export class Text extends Object {
-	/**
-	 * Constructor
-	 * @param text Text string
-	 * @param [options] Options object
-	 */
-	constructor(text: string, options?: ITextOptions);
-	/**
-	 * Returns complexity of an instance
-	 */
-	complexity(): number;
-	/**
-	 * Returns string representation of an instance
-	 */
-	toString(): string;
-	/**
-	 * Renders text instance on a specified context
-	 * @param ctx Context to render on
-	 */
-	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
-	/**
-	 * Returns object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-	/**
-	 * Returns SVG representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 */
-	toSVG(reviver?: Function): string;
-	/**
-	 * Retrieves object's fontSize
-	 */
-	getFontSize(): number;
-	/**
-	 * Sets object's fontSize
-	 * @param fontSize Font size (in pixels)
-	 */
-	setFontSize(fontSize: number): Text;
-	/**
-	 * Retrieves object's fontWeight
-	 */
-	getFontWeight(): number|string;
-	/**
-	 * Sets object's fontWeight
-	 * @param fontWeight Font weight
-	 */
-	setFontWeight(fontWeight: string|number): Text;
-	/**
-	 * Retrieves object's fontFamily
-	 */
-	getFontFamily(): string;
-	/**
-	 * Sets object's fontFamily
-	 * @param fontFamily Font family
-	 */
-	setFontFamily(fontFamily: string): Text;
-	/**
-	 * Retrieves object's text
-	 */
-	getText(): string;
-	/**
-	 * Sets object's text
-	 * @param text Text
-	 */
-	setText(text: string): Text;
-	/**
-	 * Retrieves object's textDecoration
-	 */
-	getTextDecoration(): string;
-	/**
-	 * Sets object's textDecoration
-	 * @param textDecoration Text decoration
-	 */
-	setTextDecoration(textDecoration: string): Text;
-	/**
-	 * Retrieves object's fontStyle
-	 */
-	getFontStyle(): string;
-	/**
-	 * Sets object's fontStyle
-	 * @param fontStyle Font style
-	 */
-	setFontStyle(fontStyle: string): Text;
-	/**
-	 * Retrieves object's lineHeight
-	 */
-	getLineHeight(): number;
-	/**
-	 * Sets object's lineHeight
-	 * @param lineHeight Line height
-	 */
-	setLineHeight(lineHeight: number): Text;
-	/**
-	 * Retrieves object's textAlign
-	 */
-	getTextAlign(): string;
-	/**
-	 * Sets object's textAlign
-	 * @param textAlign Text alignment
-	 */
-	setTextAlign(textAlign: string): Text;
-	/**
-	 * Retrieves object's textBackgroundColor
-	 */
-	getTextBackgroundColor(): string;
-	/**
-	 * Sets object's textBackgroundColor
-	 * @param textBackgroundColor Text background color
-	 */
-	setTextBackgroundColor(textBackgroundColor: string): Text;
-
-	/**
-	 * List of attribute names to account for when parsing SVG element (used by `fabric.Text.fromElement`)
-	 */
-	static ATTRIBUTE_NAMES: string[];
-	/**
-	 * Default SVG font size
-	 */
-	static DEFAULT_SVG_FONT_SIZE: number;
-
-	/**
-	 * Returns fabric.Text instance from an SVG element (<b>not yet implemented</b>)
-	 * @param element Element to parse
-	 * @param [options] Options object
-	 */
-	static fromElement(element: SVGElement, options?: ITextOptions): Text;
-	/**
-	 * Returns fabric.Text instance from an object representation
-	 * @param object Object to create an instance from
-	 */
-	static fromObject(object: any): Text;
-}
-
-interface IITextOptions extends IObjectOptions, ITextOptions {
-	/**
-	 * Index where text selection starts (or where cursor is when there is no selection)
-	 */
-	selectionStart?: number;
-
-	/**
-	 * Index where text selection ends
-	 */
-	selectionEnd?: number;
-
-	/**
-	 * Color of text selection
-	 */
-	selectionColor?: string;
-
-	/**
-	 * Indicates whether text is in editing mode
-	 */
-	isEditing?: boolean;
-
-	/**
-	 * Indicates whether a text can be edited
-	 */
-	editable?: boolean;
-
-	/**
-	 * Border color of text object while it's in editing mode
-	 */
-	editingBorderColor?: string;
-
-	/**
-	 * Width of cursor (in px)
-	 */
-	cursorWidth?: number;
-
-	/**
-	 * Color of default cursor (when not overwritten by character style)
-	 */
-	cursorColor?: string;
-
-	/**
-	 * Delay between cursor blink (in ms)
-	 */
-	cursorDelay?: number;
-
-	/**
-	 * Duration of cursor fadein (in ms)
-	 */
-	cursorDuration?: number;
-
-	/**
-	 * Object containing character styles
-	 * (where top-level properties corresponds to line number and 2nd-level properties -- to char number in a line)
-	 */
-	styles?: any;
-
-	/**
-	 * Indicates whether internal text char widths can be cached
-	 */
-	caching?: boolean;
-}
-export interface IText extends Text, IITextOptions {}
-export class IText extends Object {
-	/**
-	 * Constructor
-	 * @param text Text string
-	 * @param [options] Options object
-	 */
-	constructor(text: string, options?: IITextOptions);
-	/**
-	 * Returns true if object has no styling
-	 */
-	isEmptyStyles(): boolean;
-	render(ctx: CanvasRenderingContext2D, noTransform: boolean): void;
-	/**
-	 * Returns object representation of an instance
-	 * @param [propertiesToInclude] Any properties that you might want to additionally include in the output
-	 * @return object representation of an instance
-	 */
-	toObject(propertiesToInclude?: string[]): any;
-
-	setText(value: string): Text;
-	/**
-	 * Sets selection start (left boundary of a selection)
-	 * @param index Index to set selection start to
-	 */
-	setSelectionStart(index: number): void;
-	/**
-	 * Sets selection end (right boundary of a selection)
-	 * @param index Index to set selection end to
-	 */
-	setSelectionEnd(index: number): void;
-	/**
-	 * Gets style of a current selection/cursor (at the start position)
-	 * @param [startIndex] Start index to get styles at
-	 * @param [endIndex] End index to get styles at
-	 * @return styles Style object at a specified (or current) index
-	 */
-	getSelectionStyles(startIndex: number, endIndex: number): any;
-	/**
-	 * Sets style of a current selection
-	 * @param [styles] Styles object
-	 * @return thisArg
-	 * @chainable
-	 */
-	setSelectionStyles(styles: any): Text;
-
-	/**
-	 * Renders cursor or selection (depending on what exists)
-	 */
-	renderCursorOrSelection(): void;
-
-	/**
-	 * Returns 2d representation (lineIndex and charIndex) of cursor (or selection start)
-	 * @param [selectionStart] Optional index. When not given, current selectionStart is used.
-	 */
-	get2DCursorLocation(selectionStart?: number): void;
-	/**
-	 * Returns complete style of char at the current cursor
-	 * @param lineIndex Line index
-	 * @param charIndex Char index
-	 * @return Character style
-	 */
-	getCurrentCharStyle(lineIndex: number, charIndex: number): any;
-
-	/**
-	 * Returns fontSize of char at the current cursor
-	 * @param lineIndex Line index
-	 * @param charIndex Char index
-	 * @return Character font size
-	 */
-	getCurrentCharFontSize(lineIndex: number, charIndex: number): number;
-
-	/**
-	 * Returns color (fill) of char at the current cursor
-	 * @param lineIndex Line index
-	 * @param charIndex Char index
-	 * @return Character color (fill)
-	 */
-	getCurrentCharColor(lineIndex: number, charIndex: number): string;
-	/**
-	 * Renders cursor
-	 */
-	renderCursor(boundaries: any): void;
-
-	/**
-	 * Renders text selection
-	 * @param chars Array of characters
-	 * @param boundaries Object with left/top/leftOffset/topOffset
-	 */
-	renderSelection(chars: string[], boundaries: any): void;
-
-	// functions from itext behavior mixin
-	// ------------------------------------------------------------------------------------------------------------------------
-	/**
-	 * Initializes all the interactive behavior of IText
-	 */
-	initBehavior(): void;
-
-	/**
-	 * Initializes "selected" event handler
-	 */
-	initSelectedHandler(): void;
-
-	/**
-	 * Initializes "added" event handler
-	 */
-	initAddedHandler(): void;
-
-	initRemovedHandler(): void;
-
-	/**
-	 * Initializes delayed cursor
-	 */
-	initDelayedCursor(restart: boolean): void;
-
-	/**
-	 * Aborts cursor animation and clears all timeouts
-	 */
-	abortCursorAnimation(): void;
-
-	/**
-	 * Selects entire text
-	 */
-	selectAll(): void;
-
-	/**
-	 * Returns selected text
-	 */
-	getSelectedText(): string;
-
-	/**
-	 * Find new selection index representing start of current word according to current selection index
-	 * @param startFrom Surrent selection index
-	 * @return New selection index
-	 */
-	findWordBoundaryLeft(startFrom: number): number;
-
-	/**
-	 * Find new selection index representing end of current word according to current selection index
-	 * @param startFrom Current selection index
-	 * @return New selection index
-	 */
-	findWordBoundaryRight(startFrom: number): number;
-
-	/**
-	 * Find new selection index representing start of current line according to current selection index
-	 * @param startFrom Current selection index
-	 */
-	findLineBoundaryLeft(startFrom: number): number;
-
-	/**
-	 * Find new selection index representing end of current line according to current selection index
-	 * @param startFrom Current selection index
-	 */
-	findLineBoundaryRight(startFrom: number): number;
-
-	/**
-	 * Returns number of newlines in selected text
-	 */
-	getNumNewLinesInSelectedText(): number;
-
-	/**
-	 * Finds index corresponding to beginning or end of a word
-	 * @param selectionStart Index of a character
-	 * @param direction: 1 or -1
-	 */
-	searchWordBoundary(selectionStart: number, direction: number): number;
-
-	/**
-	 * Selects a word based on the index
-	 * @param selectionStart Index of a character
-	 */
-	selectWord(selectionStart: number): void;
-	/**
-	 * Selects a line based on the index
-	 * @param selectionStart Index of a character
-	 */
-	selectLine(selectionStart: number): void;
-
-	/**
-	 * Enters editing state
-	 */
-	enterEditing(): IText;
-
-	/**
-	 * Initializes "mousemove" event handler
-	 */
-	initMouseMoveHandler(): void;
-	/**
-	 * Exits from editing state
-	 * @return thisArg
-	 * @chainable
-	 */
-	exitEditing(): IText;
-
-	/**
-	 * Inserts a character where cursor is (replacing selection if one exists)
-	 * @param _chars Characters to insert
-	 */
-	insertChars(_chars: string, useCopiedStyle?: boolean): void;
-	/**
-	 * Inserts new style object
-	 * @param lineIndex Index of a line
-	 * @param charIndex Index of a char
-	 * @param isEndOfLine True if it's end of line
-	 */
-	insertNewlineStyleObject(lineIndex: number, charIndex: number, isEndOfLine: boolean): void;
-
-	/**
-	 * Inserts style object for a given line/char index
-	 * @param lineIndex Index of a line
-	 * @param charIndex Index of a char
-	 * @param [style] Style object to insert, if given
-	 */
-	insertCharStyleObject(lineIndex: number, charIndex: number, isEndOfLine: boolean): void;
-
-	/**
-	 * Inserts style object(s)
-	 * @param _chars Characters at the location where style is inserted
-	 * @param isEndOfLine True if it's end of line
-	 * @param [useCopiedStyle] Style to insert
-	 */
-	insertStyleObjects(_chars: string, isEndOfLine: boolean, useCopiedStyle?: boolean): void;
-
-	/**
-	 * Shifts line styles up or down
-	 * @param lineIndex Index of a line
-	 * @param offset Can be -1 or +1
-	 */
-	shiftLineStyles(lineIndex: number, offset: number): void;
-
-	/**
-	 * Removes style object
-	 * @param isBeginningOfLine True if cursor is at the beginning of line
-	 * @param [index] Optional index. When not given, current selectionStart is used.
-	 */
-	removeStyleObject(isBeginningOfLine: boolean, index?: number): void;
-	/**
-	 * Inserts new line
-	 */
-	insertNewline(): void;
-
-	/**
-	 * Returns fabric.IText instance from an object representation
-	 * @param object Object to create an instance from
-	 */
-	static fromObject(object: any): IText;
-}
-
-interface ITriangleOptions extends IObjectOptions { }
-export class Triangle extends Object {
-	/**
-	 * Constructor
-	 * @param [options] Options object
-	 */
-	constructor(options?: ITriangleOptions);
-
-	/**
-	 * Returns complexity of an instance
-	 * @return complexity of this instance
-	 */
-	complexity(): number;
-	/**
-	 * Returns SVG representation of an instance
-	 * @param [reviver] Method for further parsing of svg representation.
-	 * @return svg representation of an instance
-	 */
-	toSVG(reviver?: Function): string;
-
-	/**
-	 * Returns Triangle instance from an object representation
-	 * @param object Object to create an instance from
-	 */
-	static fromObject(object: any): Triangle;
-}
-
-////////////////////////////////////////////////////////////
-// Filters
-////////////////////////////////////////////////////////////
-interface IAllFilters {
-	BaseFilter: {
-		/**
-		 * Constructor
-		 * @param [options] Options object
-		 */
-		new (options?: any): IBaseFilter;
-	};
-	Blend: {
-		/**
-		 * Constructor
-		 * @param [options] Options object
-		 */
-		new (options?: { color?: string; mode?: string; alpha?: number; image?: Image }): IBlendFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IBlendFilter
-	};
-	Brightness: {
-		new (options?: {
-			/**
-			 * Value to brighten the image up (0..255)
-			 * @default 0
-			 */
-			brightness: number
-		}): IBrightnessFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IBrightnessFilter
-	};
-	Convolute: {
-		new (options?: {
-			opaque?: boolean,
-			/** Filter matrix */
-			matrix?: number[],
-		}): IConvoluteFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IConvoluteFilter
-	};
-	GradientTransparency: {
-		new (options?: {
-			/** @default 100 */
-			threshold?: number;
-		}): IGradientTransparencyFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IGradientTransparencyFilter
-	};
-	Grayscale: {
-		new (options?: any): IGrayscaleFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IGrayscaleFilter
-	};
-	Invert: {
-		/**
-		 * Constructor
-		 * @param [options] Options object
-		 */
-		new (options?: any): IInvertFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IInvertFilter
-	};
-	Mask: {
-		new (options?: {
-			/** Mask image object */
-			mask?: Image,
-			/**
-			 * Rgb channel (0, 1, 2 or 3)
-			 * @default 0
-			 */
-			channel: number,
-		}): IMaskFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IMaskFilter
-	};
-	Multiply: {
-		new (options?: {
-			/**
-			 * Color to multiply the image pixels with
-			 * @default #000000
-			 */
-			color: string;
-		}): IMultiplyFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IMultiplyFilter
-	};
-	Noise: {
-		new (options?: {
-			/** @default 0 */
-			noise: number,
-		}): INoiseFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): INoiseFilter
-	};
-	Pixelate: {
-		new (options?: {
-			/**
-			 * Blocksize for pixelate
-			 * @default 4
-			 */
-			blocksize?: number,
-		}): IPixelateFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IPixelateFilter
-	};
-	RemoveWhite: {
-		new (options?: {
-			/** @default 30 */
-			threshold?: number,
-			/** @default 20 */
-			distance?: number,
-		}): IRemoveWhiteFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IRemoveWhiteFilter
-	};
-	Resize: {
-		new (options?: any): IResizeFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): IResizeFilter
-	};
-	Sepia2: {
-		new (options?: any): ISepia2Filter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): ISepia2Filter
-	};
-	Sepia: {
-		new (options?: any): ISepiaFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): ISepiaFilter
-	};
-	Tint: {
-		new (options?: {
-			/**
-			 * Color to tint the image with
-			 * @default #000000
-			 */
-			color?: string;
-			/** Opacity value that controls the tint effect's transparency (0..1) */
-			opacity?: number;
-		}): ITintFilter;
-		/**
-		 * Returns filter instance from an object representation
-		 * @param object Object to create an instance from
-		 */
-		fromObject(object: any): ITintFilter
-	};
-}
-interface IBaseFilter {
-	/**
-	 * Sets filter's properties from options
-	 * @param [options] Options object
-	 */
-	setOptions(options?: any): void;
-	/**
-	 * Returns object representation of an instance
-	 */
-	toObject(): any;
-	/**
-	 * Returns a JSON representation of an instance
-	 */
-	toJSON(): string;
-}
-interface IBlendFilter extends IBaseFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface IBrightnessFilter extends IBaseFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface IConvoluteFilter extends IBaseFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface IGradientTransparencyFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface IGrayscaleFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface IInvertFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface IMaskFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface IMultiplyFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface INoiseFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface IPixelateFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface IRemoveWhiteFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface IResizeFilter {
-	/**
-	 * Resize type
-	 */
-	resizeType: string;
-
-	/**
-	 * Scale factor for resizing, x axis
-	 */
-	scaleX: number;
-
-	/**
-	 * Scale factor for resizing, y axis
-	 */
-	scaleY: number;
-
-	/**
-	 * LanczosLobes parameter for lanczos filter
-	 */
-	lanczosLobes: number;
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface ISepiaFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface ISepia2Filter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-interface ITintFilter {
-	/**
-	 * Applies filter to canvas element
-	 * @param canvasEl Canvas element to apply filter to
-	 */
-	applyTo(canvasEl: HTMLCanvasElement): void;
-}
-
-////////////////////////////////////////////////////////////
-// Brushes
-////////////////////////////////////////////////////////////
-export class BaseBrush {
-	/**
-	 * Color of a brush
-	 */
-	color: string;
-
-	/**
-	 * Width of a brush
-	 */
-	width: number;
-
-	/**
-	 * Shadow object representing shadow of this shape.
-	 * <b>Backwards incompatibility note:</b> This property replaces "shadowColor" (String), "shadowOffsetX" (Number),
-	 * "shadowOffsetY" (Number) and "shadowBlur" (Number) since v1.2.12
-	 */
-	shadow: Shadow|string;
-	/**
-	 * Line endings style of a brush (one of "butt", "round", "square")
-	 */
-	strokeLineCap: string;
-
-	/**
-	 * Corner style of a brush (one of "bevil", "round", "miter")
-	 */
-	strokeLineJoin: string;
-
-	/**
-	 * Stroke Dash Array.
-	 */
-	strokeDashArray: any[];
-
-	/**
-	 * Sets shadow of an object
-	 * @param [options] Options object or string (e.g. "2px 2px 10px rgba(0,0,0,0.2)")
-	 */
-	setShadow(options: string|any): BaseBrush;
-}
-
-export class CircleBrush extends BaseBrush {
-	/**
-	 * Width of a brush
-	 */
-	width: number;
-	/**
-	 * Invoked inside on mouse down and mouse move
-	 */
-	drawDot(pointer: any): void;
-
-	/**
-	 * @return Just added pointer point
-	 */
-	addPoint(pointer: any): Point;
-}
-
-export class SprayBrush extends BaseBrush {
-	/**
-	 * Width of a brush
-	 */
-	width: number;
-	/**
-	 * Density of a spray (number of dots per chunk)
-	 */
-	density: number;
-
-	/**
-	 * Width of spray dots
-	 */
-	dotWidth: number;
-	/**
-	 * Width variance of spray dots
-	 */
-	dotWidthVariance: number;
-
-	/**
-	 * Whether opacity of a dot should be random
-	 */
-	randomOpacity: boolean;
-	/**
-	 * Whether overlapping dots (rectangles) should be removed (for performance reasons)
-	 */
-	optimizeOverlapping: boolean;
-
-	addSprayChunk(pointer: any): void;
-}
-export class PatternBrush extends PencilBrush {
-	getPatternSrc(): HTMLCanvasElement;
-
-	getPatternSrcFunction(): string;
-
-	/**
-	 * Creates "pattern" instance property
-	 */
-	getPattern(): any;
-	/**
-	 * Creates path
-	 */
-	createPath(pathData: string): Path;
-}
-export class PencilBrush extends BaseBrush {
-	/**
-	 * Converts points to SVG path
-	 * @param points Array of points
-	 */
-	convertPointsToSVGPath(points: Array<{ x: number; y: number }>, minX?: number, minY?: number): string[];
-
-	/**
-	 * Creates fabric.Path object to add on canvas
-	 * @param pathData Path data
-	 */
-	createPath(pathData: string): Path;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Fabric util Interface
-//////////////////////////////////////////////////////////////////////////////
-interface IUtilAnimationOptions {
-	/**
-	 * Starting value
-	 */
-	startValue?: number;
-	/**
-	 * Ending value
-	 */
-	endValue?: number;
-	/**
-	 * Value to modify the property by
-	 */
-	byValue: number;
-	/**
-	 * Duration of change (in ms)
-	 */
-	duration?: number;
-	/**
-	 * Callback; invoked on every value change
-	 */
-	onChange?: Function;
-	/**
-	 * Callback; invoked when value change is completed
-	 */
-	onComplete?: Function;
-	/**
-	 * Easing function
-	 */
-	easing?: Function;
-}
-interface IUtilAnimation {
-	/**
-	 * Changes value from one to another within certain period of time, invoking callbacks as value is being changed.
-	 * @param [options] Animation options
-	 */
-	animate(options?: IUtilAnimationOptions): void;
-	/**
-	 * requestAnimationFrame polyfill based on http://paulirish.com/2011/requestanimationframe-for-smart-animating/
-	 * In order to get a precise start time, `requestAnimFrame` should be called as an entry into the method
-	 * @param callback Callback to invoke
-	 */
-	requestAnimFrame(callback: Function): void;
-}
-
-type IUtilAminEaseFunction = (t: number, b: number, c: number, d: number) => number;
-
-interface IUtilAnimEase {
-	easeInBack: IUtilAminEaseFunction;
-	easeInBounce: IUtilAminEaseFunction;
-	easeInCirc: IUtilAminEaseFunction;
-	easeInCubic: IUtilAminEaseFunction;
-	easeInElastic: IUtilAminEaseFunction;
-	easeInExpo: IUtilAminEaseFunction;
-	easeInOutBack: IUtilAminEaseFunction;
-	easeInOutBounce: IUtilAminEaseFunction;
-	easeInOutCirc: IUtilAminEaseFunction;
-	easeInOutCubic: IUtilAminEaseFunction;
-	easeInOutElastic: IUtilAminEaseFunction;
-	easeInOutExpo: IUtilAminEaseFunction;
-	easeInOutQuad: IUtilAminEaseFunction;
-	easeInOutQuart: IUtilAminEaseFunction;
-	easeInOutQuint: IUtilAminEaseFunction;
-	easeInOutSine: IUtilAminEaseFunction;
-	easeInQuad: IUtilAminEaseFunction;
-	easeInQuart: IUtilAminEaseFunction;
-	easeInQuint: IUtilAminEaseFunction;
-	easeInSine: IUtilAminEaseFunction;
-	easeOutBack: IUtilAminEaseFunction;
-	easeOutBounce: IUtilAminEaseFunction;
-	easeOutCirc: IUtilAminEaseFunction;
-	easeOutCubic: IUtilAminEaseFunction;
-	easeOutElastic: IUtilAminEaseFunction;
-	easeOutExpo: IUtilAminEaseFunction;
-	easeOutQuad: IUtilAminEaseFunction;
-	easeOutQuart: IUtilAminEaseFunction;
-	easeOutQuint: IUtilAminEaseFunction;
-	easeOutSine: IUtilAminEaseFunction;
-}
-
-interface IUtilArc {
-	/**
-	 * Draws arc
-	 */
-	drawArc(ctx: CanvasRenderingContext2D, fx: number, fy: number, coords: number[]): void;
-	/**
-	 * Calculate bounding box of a elliptic-arc
-	 * @param fx start point of arc
-	 * @param rx horizontal radius
-	 * @param ry vertical radius
-	 * @param rot angle of horizontal axe
-	 * @param large 1 or 0, whatever the arc is the big or the small on the 2 points
-	 * @param sweep 1 or 0, 1 clockwise or counterclockwise direction
-	 * @param tx end point of arc
-	 */
-	getBoundsOfArc(fx: number, fy: number, rx: number, ry: number, rot: number, large: number, sweep: number, tx: number, ty: number): Point[];
-	/**
-	 * Calculate bounding box of a beziercurve
-	 * @param x0 starting point
-	 * @param x1 first control point
-	 * @param x2 secondo control point
-	 * @param x3 end of beizer
-	 */
-	getBoundsOfCurve(x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, x3: number, y3: number): Point[];
-}
-
-interface IUtilDomEvent {
-	/**
-	 * Cross-browser wrapper for getting event's coordinates
-	 * @param event Event object
-	 * @param upperCanvasEl &lt;canvas> element on which object selection is drawn
-	 */
-	getPointer(event: Event, upperCanvasEl: HTMLCanvasElement): Point;
-
-	/**
-	 * Adds an event listener to an element
-	 */
-	addListener(element: HTMLElement, eventName: string, handler: Function): void;
-
-	/**
-	 * Removes an event listener from an element
-	 */
-	removeListener(element: HTMLElement, eventName: string, handler: Function): void;
-}
-
-interface IUtilDomMisc {
-	/**
-	 * Takes id and returns an element with that id (if one exists in a document)
-	 */
-	getById(id: string|HTMLElement): HTMLElement;
-	/**
-	 * Converts an array-like object (e.g. arguments or NodeList) to an array
-	 */
-	toArray(arrayLike: any): any[];
-	/**
-	 * Creates specified element with specified attributes
-	 * @param tagName Type of an element to create
-	 * @param [attributes] Attributes to set on an element
-	 * @return Newly created element
-	 */
-	makeElement(tagName: string, attributes?: any): HTMLElement;
-	/**
-	 * Adds class to an element
-	 * @param element Element to add class to
-	 * @param className Class to add to an element
-	 */
-	addClass(element: HTMLElement, classname: string): void;
-	/**
-	 * Wraps element with another element
-	 * @param element Element to wrap
-	 * @param wrapper Element to wrap with
-	 * @param [attributes] Attributes to set on a wrapper
-	 */
-	wrapElement(element: HTMLElement, wrapper: HTMLElement|string, attributes?: any): HTMLElement;
-	/**
-	 * Returns element scroll offsets
-	 * @param element Element to operate on
-	 * @param upperCanvasEl Upper canvas element
-	 */
-	getScrollLeftTop(element: HTMLElement, upperCanvasEl: HTMLElement): { left: number; right: number; };
-	/**
-	 * Returns offset for a given element
-	 * @param element Element to get offset for
-	 */
-	getElementOffset(element: HTMLElement): { left: number; right: number; };
-	/**
-	 * Returns style attribute value of a given element
-	 * @param element Element to get style attribute for
-	 * @param attr Style attribute to get for element
-	 */
-	getElementStyle(elment: HTMLElement, attr: string): string;
-	/**
-	 * Inserts a script element with a given url into a document; invokes callback, when that script is finished loading
-	 * @param url URL of a script to load
-	 * @param callback Callback to execute when script is finished loading
-	 */
-	getScript(url: string, callback: Function): void;
-	/**
-	 * Makes element unselectable
-	 * @param element Element to make unselectable
-	 */
-	makeElementUnselectable(element: HTMLElement): HTMLElement;
-	/**
-	 * Makes element selectable
-	 * @param element Element to make selectable
-	 */
-	makeElementSelectable(element: HTMLElement): HTMLElement;
-}
-
-interface IUtilDomRequest {
-	/**
-	 * Cross-browser abstraction for sending XMLHttpRequest
-	 * @param url URL to send XMLHttpRequest to
-	 */
-	request(url: string, options?: {
-		/** @default "GET" */
-		method?: string,
-		/** Callback to invoke when request is completed */
-		onComplete: Function,
-	}): XMLHttpRequest;
-}
-
-interface IUtilDomStyle {
-	/**
-	 * Cross-browser wrapper for setting element's style
-	 */
-	setStyle(element: HTMLElement, styles: any): HTMLElement;
-}
-
-interface IUtilArray {
-	/**
-	 * Invokes method on all items in a given array
-	 * @param array Array to iterate over
-	 * @param method Name of a method to invoke
-	 */
-	invoke(array: any[], method: string): any[];
-	/**
-	 * Finds minimum value in array (not necessarily "first" one)
-	 * @param array Array to iterate over
-	 */
-	min(array: any[], byProperty: string): any;
-	/**
-	 * Finds maximum value in array (not necessarily "first" one)
-	 * @param array Array to iterate over
-	 */
-	max(array: any[], byProperty: string): any;
-}
-
-interface IUtilClass {
-	/**
-	 * Helper for creation of "classes".
-	 * @param [parent] optional "Class" to inherit from
-	 * @param [properties] Properties shared by all instances of this class
-	 *                  (be careful modifying objects defined here as this would affect all instances)
-	 */
-	createClass(parent: Function, properties?: any): void;
-	/**
-	 * Helper for creation of "classes".
-	 * @param [properties] Properties shared by all instances of this class
-	 *                  (be careful modifying objects defined here as this would affect all instances)
-	 */
-	createClass(properties?: any): void;
-}
-
-interface IUtilObject {
-	/**
-	 * Copies all enumerable properties of one object to another
-	 * @param destination Where to copy to
-	 * @param source Where to copy from
-	 */
-	extend(destination: any, source: any): any;
-
-	/**
-	 * Creates an empty object and copies all enumerable properties of another object to it
-	 * @param object Object to clone
-	 */
-	clone(object: any): any;
-}
-
-interface IUtilString {
-	/**
-	 * Camelizes a string
-	 * @param string String to camelize
-	 */
-	camelize(string: string): string;
-
-	/**
-	 * Capitalizes a string
-	 * @param string String to capitalize
-	 * @param [firstLetterOnly] If true only first letter is capitalized
-	 * and other letters stay untouched, if false first letter is capitalized
-	 * and other letters are converted to lowercase.
-	 */
-	capitalize(string: string, firstLetterOnly: boolean): string;
-
-	/**
-	 * Escapes XML in a string
-	 * @param string String to escape
-	 */
-	escapeXml(string: string): string;
-}
-
-interface IUtilMisc {
-	/**
-	 * Removes value from an array.
-	 * Presence of value (and its position in an array) is determined via `Array.prototype.indexOf`
-	 */
-	removeFromArray(array: any[], value: any): any[];
-
-	/**
-	 * Returns random number between 2 specified ones.
-	 * @param min lower limit
-	 * @param max upper limit
-	 */
-	getRandomInt(min: number, max: number): number;
-
-	/**
-	 * Transforms degrees to radians.
-	 * @param degrees value in degrees
-	 */
-	degreesToRadians(degrees: number): number;
-
-	/**
-	 * Transforms radians to degrees.
-	 * @param radians value in radians
-	 */
-	radiansToDegrees(radians: number): number;
-
-	/**
-	 * Rotates `point` around `origin` with `radians`
-	 * @param point The point to rotate
-	 * @param origin The origin of the rotation
-	 * @param radians The radians of the angle for the rotation
-	 */
-	rotatePoint(point: Point, origin: Point, radians: number): Point;
-
-	/**
-	 * Rotates `vector` with `radians`
-	 * @param vector The vector to rotate (x and y)
-	 * @param radians The radians of the angle for the rotation
-	 */
-	rotateVector(vector: { x: number, y: number }, radians: number): { x: number, y: number };
-
-	/**
-	 * Apply transform t to point p
-	 * @param  p The point to transform
-	 * @param  t The transform
-	 * @param  [ignoreOffset] Indicates that the offset should not be applied
-	 */
-	transformPoint(p: Point, t: any[], ignoreOffset?: boolean): Point;
-
-	/**
-	 * Invert transformation t
-	 * @param t The transform
-	 */
-	invertTransform(t: any[]): any[];
-
-	/**
-	 * A wrapper around Number#toFixed, which contrary to native method returns number, not string.
-	 * @param number number to operate on
-	 * @param fractionDigits number of fraction digits to "leave"
-	 */
-	toFixed(number: number, fractionDigits: number): number;
-
-	/**
-	 * Converts from attribute value to pixel value if applicable.
-	 * Returns converted pixels or original value not converted.
-	 * @param value number to operate on
-	 */
-	parseUnit(value: number|string, fontSize?: number): number|string;
-
-	/**
-	 * Function which always returns `false`.
-	 */
-	falseFunction(): boolean;
-
-	/**
-	 * Returns klass "Class" object of given namespace
-	 * @param type Type of object (eg. 'circle')
-	 * @param namespace Namespace to get klass "Class" object from
-	 */
-	getKlass(type: string, namespace: string): any;
-
-	/**
-	 * Returns object of given namespace
-	 * @param namespace Namespace string e.g. 'fabric.Image.filter' or 'fabric'
-	 */
-	resolveNamespace(namespace: string): any;
-
-	/**
-	 * Loads image element from given url and passes it to a callback
-	 * @param url URL representing an image
-	 * @param callback Callback; invoked with loaded image
-	 * @param [context] Context to invoke callback in
-	 * @param [crossOrigin] crossOrigin value to set image element to
-	 */
-	loadImage(url: string, callback: (image: HTMLImageElement) => {}, context?: any, crossOrigin?: boolean): void;
-
-	/**
-	 * Creates corresponding fabric instances from their object representations
-	 * @param objects Objects to enliven
-	 * @param callback Callback to invoke when all objects are created
-	 * @param namespace Namespace to get klass "Class" object from
-	 * @param reviver Method for further parsing of object elements, called after each fabric object created.
-	 */
-	enlivenObjects(objects: any[], callback: Function, namespace: string, reviver?: Function): void;
-
-	/**
-	 * Groups SVG elements (usually those retrieved from SVG document)
-	 * @param elements SVG elements to group
-	 * @param [options] Options object
-	 */
-	groupSVGElements(elements: any[], options?: any, path?: any): PathGroup;
-
-	/**
-	 * Populates an object with properties of another object
-	 * @param source Source object
-	 * @param destination Destination object
-	 * @param properties Propertie names to include
-	 */
-	populateWithProperties(source: any, destination: any, properties: any): void;
-
-	/**
-	 * Draws a dashed line between two points
-	 * This method is used to draw dashed line around selection area.
-	 * @param ctx context
-	 * @param x  start x coordinate
-	 * @param y start y coordinate
-	 * @param x2 end x coordinate
-	 * @param y2 end y coordinate
-	 * @param da dash array pattern
-	 */
-	drawDashedLine(ctx: CanvasRenderingContext2D, x: number, y: number, x2: number, y2: number, da: any[]): void;
-
-	/**
-	 * Creates canvas element and initializes it via excanvas if necessary
-	 * @param [canvasEl] optional canvas element to initialize;
-	 * when not given, element is created implicitly
-	 */
-	createCanvasElement(canvasEl?: HTMLCanvasElement): HTMLCanvasElement;
-
-	/**
-	 * Creates image element (works on client and node)
-	 */
-	createImage(): HTMLImageElement;
-
-	/**
-	 * Creates accessors (getXXX, setXXX) for a "class", based on "stateProperties" array
-	 * @param klass "Class" to create accessors for
-	 */
-	createAccessors(klass: any): any;
-
-	/**
-	 * @param receiver Object implementing `clipTo` method
-	 * @param ctx Context to clip
-	 */
-	clipContext(receiver: Object, ctx: CanvasRenderingContext2D): void;
-
-	/**
-	 * Multiply matrix A by matrix B to nest transformations
-	 * @param  a First transformMatrix
-	 * @param  b Second transformMatrix
-	 */
-	multiplyTransformMatrices(a: number[], b: number[]): number[];
-
-	/**
-	 * Decomposes standard 2x2 matrix into transform componentes
-	 * @param a transformMatrix
-	 */
-	qrDecompose(a: number[]): { angle: number, scaleX: number, scaleY: number, skewX: number, skewY: number, translateX: number, translateY: number };
-
-	/**
-	 * Returns string representation of function body
-	 * @param fn Function to get body of
-	 */
-	getFunctionBody(fn: Function): string;
-
-	/**
-	 * Returns true if context has transparent pixel
-	 * at specified location (taking tolerance into account)
-	 * @param ctx context
-	 * @param x x coordinate
-	 * @param y y coordinate
-	 * @param tolerance Tolerance
-	 */
-	isTransparent(ctx: CanvasRenderingContext2D, x: number, y: number, tolerance: number): boolean;
-}
-
-export const util: IUtil;
-interface IUtil extends IUtilAnimation, IUtilArc, IObservable<IUtil>, IUtilDomEvent, IUtilDomMisc,
-	IUtilDomRequest, IUtilDomStyle, IUtilClass, IUtilMisc {
-	ease: IUtilAnimEase;
-	array: IUtilArray;
-	object: IUtilObject;
-	string: IUtilString;
-}
+export import fabric = require("./fabric-impl");
diff --git a/types/fabric/test/import.ts b/types/fabric/test/import.ts
new file mode 100644
index 0000000000..c1aa7a2896
--- /dev/null
+++ b/types/fabric/test/import.ts
@@ -0,0 +1,2 @@
+import { fabric } from "fabric";
+new fabric.Canvas("C");
diff --git a/types/fabric/fabric-tests.ts b/types/fabric/test/index.ts
similarity index 100%
rename from types/fabric/fabric-tests.ts
rename to types/fabric/test/index.ts
diff --git a/types/fabric/tsconfig.json b/types/fabric/tsconfig.json
index fc7ce8ddc9..eca1407551 100644
--- a/types/fabric/tsconfig.json
+++ b/types/fabric/tsconfig.json
@@ -19,6 +19,7 @@
     },
     "files": [
         "index.d.ts",
-        "fabric-tests.ts"
+        "test/index.ts",
+        "test/import.ts"
     ]
 }
\ No newline at end of file

From 1d841b17e82df903ca3ade77f6b6f44504346da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Jedli=C4=8Dka?= <jedlicka.r@gmail.com>
Date: Tue, 20 Feb 2018 22:06:14 +0100
Subject: [PATCH 181/388] Fix global object

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

diff --git a/types/fingerprintjs2/index.d.ts b/types/fingerprintjs2/index.d.ts
index b4d8d5ff6c..5778eebeed 100644
--- a/types/fingerprintjs2/index.d.ts
+++ b/types/fingerprintjs2/index.d.ts
@@ -43,3 +43,4 @@ interface Fingerprint2Options {
 }
 
 export = Fingerprint2;
+export as namespace Fingerprint2;

From 97724883382b14fa256f201f4ea2ef328c727193 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Tue, 20 Feb 2018 16:43:26 +0200
Subject: [PATCH 182/388] improve types for mark.js

---
 types/mark.js/index.d.ts       | 142 ++++++++++++++++++++++++---------
 types/mark.js/mark.js-tests.ts |  17 ++++
 2 files changed, 122 insertions(+), 37 deletions(-)

diff --git a/types/mark.js/index.d.ts b/types/mark.js/index.d.ts
index 2215c4e65c..c519c56108 100644
--- a/types/mark.js/index.d.ts
+++ b/types/mark.js/index.d.ts
@@ -1,61 +1,129 @@
 // Type definitions for mark.js 8.11
 // Project: https://markjs.io/
 // Definitions by: Soner Köksal <https://github.com/renjfk>
+//                 Roman Hotsiy <https://github.com/RomanGotsiy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
-type MarkAccuracy = "partially" | "complementary" | "exactly";
+declare namespace Mark {
+    type MarkAccuracy = 'partially' | 'complementary' | 'exactly';
 
-interface MarkOptions {
-    element?: string;
-    className?: string;
-    exclude?: string[];
-    separateWordSearch?: boolean;
-    accuracy?: MarkAccuracy | { value: MarkAccuracy };
-    diacritics?: boolean;
-    synonyms?: { [index: string]: string };
-    iframes?: boolean;
-    iframesTimeout?: number;
-    acrossElements?: boolean;
-    caseSensitive?: boolean;
-    ignoreJoiners?: boolean;
-    wildcards?: "disabled" | "enabled" | "withSpaces";
+    interface MarkOptions {
+        element?: string;
+        className?: string;
+        exclude?: string[];
+        separateWordSearch?: boolean;
+        accuracy?: MarkAccuracy | { value: MarkAccuracy };
+        diacritics?: boolean;
+        synonyms?: { [index: string]: string };
+        iframes?: boolean;
+        iframesTimeout?: number;
+        acrossElements?: boolean;
+        caseSensitive?: boolean;
+        ignoreJoiners?: boolean;
+        wildcards?: 'disabled' | 'enabled' | 'withSpaces';
 
-    each?(element: Element): void;
+        each?(element: Element): void;
 
-    filter?(textNode: Element, term: string, marksSoFar: number, marksTotal: number): boolean;
+        filter?(
+            textNode: Element,
+            term: string,
+            marksSoFar: number,
+            marksTotal: number
+        ): boolean;
 
-    noMatch?(term: string): void;
+        noMatch?(term: string): void;
 
-    done?(marksTotal: number): void;
+        done?(marksTotal: number): void;
 
-    debug?: boolean;
-    log?: object;
+        debug?: boolean;
+        log?: object;
+    }
+
+    interface UnmarkOptions {
+        element?: string;
+        className?: string;
+        exclude?: string[];
+        iframes?: boolean;
+        iframesTimeout?: number;
+
+        done?(marksTotal: number): void;
+
+        debug?: boolean;
+        log?: object;
+    }
+
+    interface Range {
+        start: number;
+        length: number;
+    }
 }
 
-interface UnmarkOptions {
-    element?: string;
-    className?: string;
-    exclude?: string[];
-    iframes?: boolean;
-    iframesTimeout?: number;
+declare class Mark {
+    constructor(
+        context: string | HTMLElement | ReadonlyArray<HTMLElement> | NodeList
+    );
 
-    done?(marksTotal: number): void;
+    /**
+     * highlight custom search terms.
+     * @param keyword The keyword to be marked. Can also be an array with multiple keywords.
+     * Note that keywords will be escaped. If you need to mark unescaped keywords (e.g. containing a pattern),
+     * have a look at the `markRegExp()`
+     * @param options Optional options
+     */
+    mark(
+        keyword: string | ReadonlyArray<string>,
+        options?: Mark.MarkOptions
+    ): void;
 
-    debug?: boolean;
-    log?: object;
+    /**
+     * highlight custom regular expressions.
+     * @param regexp The regular expression to be marked. Example: /Lor[^]?m/gmi.
+     * Note that groups will be ignored and mark.js will always find all matches, regardless of the g flag.
+     * @param options Optional options
+     */
+    markRegExp(regexp: RegExp, options?: Mark.MarkOptions): void;
+
+    /**
+     * A method to mark ranges with a start position and length. They will be applied
+     * to text nodes in the specified context.
+     * @param ranges An array of objects with a start and length property.
+     * Note that the start positions must be specified including whitespace characters.
+     * @param options Optional options
+     */
+    markRanges(
+        ranges: ReadonlyArray<Mark.Range>,
+        options?: Mark.MarkOptions
+    ): void;
+
+    /**
+     * A method to remove highlights created by mark.js.
+     * @param options Optional options
+     */
+    unmark(options?: Mark.MarkOptions): void;
 }
 
-interface JQuery {
-    mark(term: string, options?: MarkOptions): void;
+export = Mark;
 
-    unmark(options?: UnmarkOptions): void;
-}
+/* augment JQuery */
+declare global {
+    interface JQuery {
+        mark(
+            term: string | ReadonlyArray<string>,
+            options?: Mark.MarkOptions
+        ): void;
 
-interface JQueryStatic {
-    mark(term: string, options?: MarkOptions): void;
+        unmark(options?: Mark.UnmarkOptions): void;
+    }
 
-    unmark(options?: UnmarkOptions): void;
+    interface JQueryStatic {
+        mark(
+            term: string | ReadonlyArray<string>,
+            options?: Mark.MarkOptions
+        ): void;
+
+        unmark(options?: Mark.UnmarkOptions): void;
+    }
 }
diff --git a/types/mark.js/mark.js-tests.ts b/types/mark.js/mark.js-tests.ts
index 136098d39d..a979990521 100644
--- a/types/mark.js/mark.js-tests.ts
+++ b/types/mark.js/mark.js-tests.ts
@@ -1,3 +1,20 @@
+import * as Mark from 'mark.js';
+
+/* test instance */
+const mark = new Mark(document.querySelectorAll('div'));
+const markBySelector = new Mark('div');
+const markByElement = new Mark(document.body);
+
+mark.mark('keyword');
+mark.mark('keyword', {
+    element: "span",
+    className: "highlight"
+});
+mark.mark(['keyword1', 'keyword2']);
+mark.markRegExp(/regex/, {className: 'highlight'});
+mark.markRanges([{start: 0, length: 10}], {className: 'highlight'});
+
+/* test jquery */
 $("div.context").mark("text", {
     element: "span",
     className: "highlight"

From 8183457f0c84ecb8f65520fc086d56520f96c60c Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 20 Feb 2018 22:20:11 +0100
Subject: [PATCH 183/388] New typings for recluster

---
 types/recluster/index.d.ts         | 46 ++++++++++++++++++++++++++++++
 types/recluster/recluster-tests.ts |  9 ++++++
 types/recluster/tsconfig.json      | 24 ++++++++++++++++
 types/recluster/tslint.json        |  1 +
 4 files changed, 80 insertions(+)
 create mode 100644 types/recluster/index.d.ts
 create mode 100644 types/recluster/recluster-tests.ts
 create mode 100644 types/recluster/tsconfig.json
 create mode 100644 types/recluster/tslint.json

diff --git a/types/recluster/index.d.ts b/types/recluster/index.d.ts
new file mode 100644
index 0000000000..71d198b8f5
--- /dev/null
+++ b/types/recluster/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for recluster 0.4
+// Project: https://github.com/doxout/recluster
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { ChildProcess } from "child_process";
+
+export interface LogOptions {
+  respawns?: boolean;
+}
+
+export interface Logger {
+  log(message?: any, ...optionalParams: any[]): void;
+}
+
+export interface BalancerOptions {
+  /** number of active workers */
+  workers?: number;
+  /** kill timeout for old workers after reload (sec) */
+  timeout?: number;
+  /** min time between respawns when workers die */
+  respawn?: number;
+  /** max time between respawns when workers die */
+  backoff?: number;
+  /** when does the worker become ready? 'listening' or 'started' */
+  readyWhen?: string;
+  /** arguments to pass to the worker (default: []) */
+  args?: string[];
+  /** what to log to stdout (default: {respawns: true}) */
+  log?: LogOptions;
+  /** logger to use, needs `log` method (default: console) */
+  logger?: Logger;
+}
+
+export class Balancer {
+  constructor(file: string, options: BalancerOptions);
+  run(): void;
+  reload(cb?: () => void): void;
+  stop(): void;
+  workers(): ChildProcess[];
+  activeWorkers(): ChildProcess[];
+}
+
+export default function recluster(file: string, options?: BalancerOptions): Balancer;
diff --git a/types/recluster/recluster-tests.ts b/types/recluster/recluster-tests.ts
new file mode 100644
index 0000000000..b2641f03ff
--- /dev/null
+++ b/types/recluster/recluster-tests.ts
@@ -0,0 +1,9 @@
+import recluster from "recluster";
+import path = require("path");
+
+const cluster = recluster(path.join(__dirname, 'server.js'));
+cluster.run();
+
+process.on('SIGUSR2', () => {
+  cluster.reload();
+});
diff --git a/types/recluster/tsconfig.json b/types/recluster/tsconfig.json
new file mode 100644
index 0000000000..adf4dd0664
--- /dev/null
+++ b/types/recluster/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,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "recluster-tests.ts"
+    ]
+}
diff --git a/types/recluster/tslint.json b/types/recluster/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/recluster/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 7c24fc4070f2fea0ead030975dab06560091c80e Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Tue, 20 Feb 2018 22:45:36 +0100
Subject: [PATCH 184/388] Move bootstrap to v3 directory

---
 types/bootstrap/{ => v3}/bootstrap-tests.ts | 0
 types/bootstrap/{ => v3}/index.d.ts         | 0
 types/bootstrap/{ => v3}/tsconfig.json      | 9 +++++++--
 types/bootstrap/{ => v3}/tslint.json        | 0
 types/knockstrap/index.d.ts                 | 5 ++---
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename types/bootstrap/{ => v3}/bootstrap-tests.ts (100%)
 rename types/bootstrap/{ => v3}/index.d.ts (100%)
 rename types/bootstrap/{ => v3}/tsconfig.json (75%)
 rename types/bootstrap/{ => v3}/tslint.json (100%)

diff --git a/types/bootstrap/bootstrap-tests.ts b/types/bootstrap/v3/bootstrap-tests.ts
similarity index 100%
rename from types/bootstrap/bootstrap-tests.ts
rename to types/bootstrap/v3/bootstrap-tests.ts
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/v3/index.d.ts
similarity index 100%
rename from types/bootstrap/index.d.ts
rename to types/bootstrap/v3/index.d.ts
diff --git a/types/bootstrap/tsconfig.json b/types/bootstrap/v3/tsconfig.json
similarity index 75%
rename from types/bootstrap/tsconfig.json
rename to types/bootstrap/v3/tsconfig.json
index 536901e8a6..585af4f8b2 100644
--- a/types/bootstrap/tsconfig.json
+++ b/types/bootstrap/v3/tsconfig.json
@@ -9,11 +9,16 @@
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "typeRoots": [
-            "../"
+            "../../"
         ],
         "types": [],
+        "paths": {
+            "bootstrap": [
+                "bootstrap/v3"
+            ]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/bootstrap/tslint.json b/types/bootstrap/v3/tslint.json
similarity index 100%
rename from types/bootstrap/tslint.json
rename to types/bootstrap/v3/tslint.json
diff --git a/types/knockstrap/index.d.ts b/types/knockstrap/index.d.ts
index ae9aee438b..bb6042a4b6 100644
--- a/types/knockstrap/index.d.ts
+++ b/types/knockstrap/index.d.ts
@@ -4,9 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-///<reference types="jquery" /> 
-///<reference types="bootstrap" /> 
-///<reference types="knockout" /> 
+/// <reference types="jquery" />
+/// <reference types="knockout" />
 
 interface KnockoutUtils {
     uniqueId(prefix: string): string;

From b5abbd1ead78005e91eba4ef939d3ee395c60d90 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Tue, 20 Feb 2018 22:54:20 +0100
Subject: [PATCH 185/388] Add bootstrap v4

---
 types/bootstrap/bootstrap-tests.ts | 204 ++++++++++++++++++++
 types/bootstrap/index.d.ts         | 299 +++++++++++++++++++++++++++++
 types/bootstrap/tsconfig.json      |  25 +++
 types/bootstrap/tslint.json        |   1 +
 4 files changed, 529 insertions(+)
 create mode 100755 types/bootstrap/bootstrap-tests.ts
 create mode 100755 types/bootstrap/index.d.ts
 create mode 100755 types/bootstrap/tsconfig.json
 create mode 100755 types/bootstrap/tslint.json

diff --git a/types/bootstrap/bootstrap-tests.ts b/types/bootstrap/bootstrap-tests.ts
new file mode 100755
index 0000000000..17d6e088cf
--- /dev/null
+++ b/types/bootstrap/bootstrap-tests.ts
@@ -0,0 +1,204 @@
+// --------------------------------------------------------------------------------------
+// Alert
+// --------------------------------------------------------------------------------------
+
+$("#alert").alert();
+
+$("#alert").alert("close");
+
+$("#alert").on("close.bs.alert", () => {});
+
+// --------------------------------------------------------------------------------------
+// Button
+// --------------------------------------------------------------------------------------
+
+// $("#button").button(); // must fail
+
+$("#button").button("toggle");
+
+// --------------------------------------------------------------------------------------
+// Carousel
+// --------------------------------------------------------------------------------------
+
+$("#carousel").carousel();
+
+$("#carousel").carousel("pause");
+
+$("#carousel").carousel(100);
+
+$("#carousel").carousel({
+    interval: 5000,
+    keyboard: true,
+    pause: "hover",
+    wrap: true,
+});
+
+$("#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;
+});
+
+// --------------------------------------------------------------------------------------
+// Dropdown
+// --------------------------------------------------------------------------------------
+
+$("#dropdown").dropdown();
+
+$("#dropdown").dropdown("update");
+
+$("#dropdown").on("hide.bs.dropdown", () => {});
+
+$("#dropdown").dropdown({
+    offset: 10,
+    flip: false,
+    boundary: "window",
+});
+
+$("#dropdown").dropdown({
+    offset: "10px",
+});
+
+$("#dropdown").dropdown({
+    offset(offsets: BootstrapOffsetsExtend) {
+        if (!this.flip)
+            return { popper: { left: 100 } };
+        return {};
+    },
+});
+
+$("#dropdown").dropdown({
+    boundary: document.body,
+});
+
+// --------------------------------------------------------------------------------------
+// Modal
+// --------------------------------------------------------------------------------------
+
+$("#modal").modal();
+
+$("#modal").modal("show");
+
+$("#modal").on("hide.bs.modal", () => {});
+
+$("#modal").modal({
+    backdrop: false,
+    focus: false,
+    keyboard: false,
+    show: false,
+});
+
+$("#modal").modal({
+    backdrop: "static",
+});
+
+// --------------------------------------------------------------------------------------
+// Tooltip
+// --------------------------------------------------------------------------------------
+
+$("#tooltip").tooltip();
+
+$("#tooltip").tooltip("show");
+
+$("#tooltip").on("hide.bs.tooltip", () => {});
+
+$("#tooltip").tooltip({
+    animation: false,
+});
+
+$("#tooltip").tooltip({
+    container: "#container",
+});
+
+$("#tooltip").tooltip({
+    container: document.getElementById("#container") as HTMLElement,
+});
+
+$("#tooltip").tooltip({
+    container: false,
+});
+
+$("#tooltip").tooltip({
+    delay: 250,
+});
+
+$("#tooltip").tooltip({
+    delay: {show: 500, hide: 100},
+});
+
+$("#tooltip").tooltip({
+    html: true,
+});
+
+$("#tooltip").tooltip({
+    placement: "auto",
+});
+
+$("#tooltip").tooltip({
+    placement(this, tooltip, trigger) {
+        console.log(this.tip === tooltip);
+        console.log(this.element === trigger);
+        console.log(this.config.html);
+        return "left";
+    },
+});
+
+$("#tooltip").tooltip({
+    selector: "[rel=\"tooltip\"]",
+});
+
+$("#tooltip").tooltip({
+    selector: false,
+});
+
+$("#tooltip").tooltip({
+    template: '<div class="tooltip empty" role="tooltip"></div>',
+});
+
+$("#tooltip").tooltip({
+    title: "Hello world",
+});
+
+$("#tooltip").tooltip({
+    title: document.getElementById("title-element") as HTMLElement,
+});
+
+$("#tooltip").tooltip({
+    title(this: Element) {
+        return this.textContent as string;
+    },
+});
+
+$("#tooltip").tooltip({
+    trigger: "focus hover",
+});
+
+$("#tooltip").tooltip({
+    offset: 10,
+});
+
+$("#tooltip").tooltip({
+    offset: "10px",
+});
+
+$("#tooltip").tooltip({
+    fallbackPlacement: "clockwise",
+});
+
+$("#tooltip").tooltip({
+    fallbackPlacement: ["flip", "clockwise"],
+});
+
+$("#tooltip").tooltip({
+    boundary: "scrollParent",
+});
+
+$("#tooltip").tooltip({
+    boundary: document.body,
+});
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
new file mode 100755
index 0000000000..110d795128
--- /dev/null
+++ b/types/bootstrap/index.d.ts
@@ -0,0 +1,299 @@
+// Type definitions for Bootstrap 4.0
+// Project: https://github.com/twbs/bootstrap/
+// Definitions by: denisname <https://github.com/denisname>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`;
+// TypeScript Version: 2.3
+
+// TODO: collapse, tab (list-group, navs), popovers, scrollspy
+
+/// <reference types="jquery" />
+
+// --------------------------------------------------------------------------
+// Some Types and Interfaces
+// --------------------------------------------------------------------------
+
+type BootstrapPlacement = "auto" | "top" | "bottom" | "left" | "right";
+type PopperBehavior = "flip" | "clockwise" | "counterclockwise";
+
+interface BootstrapDelay {
+    show: number;
+    hide: number;
+}
+
+interface BootstrapTooltipInstance {
+    config: BootstrapTooltipOption;
+    element: Element;
+    tip: HTMLElement;
+}
+
+interface BootstrapOffsetExtend {
+    top?: number;
+    left?: number;
+    width?: number;
+    height?: number;
+}
+
+interface BootstrapOffsetsExtend {
+    popper?: BootstrapOffsetExtend;
+    reference?: BootstrapOffsetExtend;
+}
+
+// --------------------------------------------------------------------------------------
+// Options Interfaces
+// --------------------------------------------------------------------------------------
+
+interface BootstrapCarouselOption {
+    /**
+     * The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle.
+     *
+     * @default 5000
+     */
+    interval?: number;
+
+    /**
+     * Whether the carousel should react to keyboard events.
+     *
+     * @default true
+     */
+    keyboard?: boolean;
+
+    /**
+     * 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.
+     * On touch-enabled devices, when set to "hover", cycling will pause on touchend (once the user finished interacting with the carousel)
+     * for two intervals, before automatically resuming. Note that this is in addition to the above mouse behavior.
+     *
+     * @default "hover"
+     */
+    pause?: "hover" | false;
+
+    /**
+     * Whether the carousel should cycle continuously or have hard stops.
+     *
+     * @default true
+     */
+    wrap?: boolean;
+}
+
+interface BootstrapDropdownOption {
+    /**
+     * 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);
+
+    /**
+     * Allow Dropdown to flip in case of an overlapping on the reference element.
+     * For more information refer to Popper.js's flip docs.
+     *
+     * @default true
+     */
+    flip?: boolean;
+
+    /**
+     * Overflow constraint boundary of the dropdown menu.
+     * Accepts the values of 'viewport', 'window', 'scrollParent', or an HTMLElement reference (JavaScript only).
+     * For more information refer to Popper.js's preventOverflow docs.
+     *
+     * @default "scrollParent"
+     */
+    boundary?: "viewport" | "window" | "scrollParent" | HTMLElement;
+}
+
+interface BootstrapModalOption {
+    /**
+     * Includes a modal-backdrop element.
+     * Alternatively, specify static for a backdrop which doesn't close the modal on click.
+     *
+     * @default true
+     */
+    backdrop?: boolean | "static";
+
+    /**
+     * Closes the modal when escape key is pressed.
+     *
+     * @default true
+     */
+    keyboard?: boolean;
+
+    /**
+     * Puts the focus on the modal when initialized.
+     *
+     * @default true
+     */
+    focus?: boolean;
+
+    /**
+     * Shows the modal when initialized.
+     *
+     * @default true
+     */
+    show?: boolean;
+}
+
+interface BootstrapTooltipOption {
+    /**
+     * Apply a CSS fade transition to the tooltip.
+     *
+     * @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
+     * 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.
+     *
+     * @default false
+     */
+    container?: string | Element | false;
+
+    /**
+     * Delay showing and hiding the tooltip (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 }`.
+     *
+     * @default 0
+     */
+    delay?: number | BootstrapDelay;
+
+    /**
+     * Allow HTML in the tooltip.
+     * If true, HTML tags in the tooltip's title will be rendered in the tooltip.
+     * If false, jQuery's text method will be used to insert content into the DOM.
+     * Use text if you're worried about XSS attacks.
+     *
+     * @default false
+     */
+    html?: boolean;
+
+    /**
+     * How to position the tooltip - auto | top | bottom | left | right.
+     * When auto is specified, it will dynamically reorient the tooltip.
+     * 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.
+     *
+     * @default "top"
+     */
+    placement?: BootstrapPlacement | ((this: BootstrapTooltipInstance, tooltip: HTMLElement, trigger: Element) => BootstrapPlacement);
+
+    /**
+     * If a selector is provided, tooltip objects will be delegated to the specified targets.
+     * In practice, this is used to enable dynamic HTML content to have popovers added.
+     *
+     * @default false
+     */
+    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"`.
+     *
+     * @default '<div class="tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></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.
+     *
+     * @default ""
+     */
+    title?: string | Element | ((this: Element) => string);
+
+    /**
+     * 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.
+     *
+     * @default "hover focus"
+     */
+    trigger?: string;
+
+    /**
+     * Offset of the tooltip relative to its target.
+     * For more information refer to Popper.js's offset docs.
+     *
+     * @default 0
+     */
+     offset?: number | string;
+
+    /**
+     * Allow to specify which position Popper will use on fallback.
+     * For more information refer to Popper.js's behavior docs.
+     *
+     * @default "flip"
+     */
+    fallbackPlacement?: PopperBehavior | PopperBehavior[];
+
+    /**
+     * Overflow constraint boundary of the tooltip.
+     * Accepts the values of 'viewport', 'window', 'scrollParent',
+     * or an HTMLElement reference (JavaScript only).
+     * For more information refer to Popper.js's preventOverflow docs.
+     *
+     * @default "scrollParent"
+     */
+    boundary?: "viewport" | "window" | "scrollParent" | HTMLElement;
+}
+
+// --------------------------------------------------------------------------------------
+// Events
+// --------------------------------------------------------------------------------------
+
+interface BootstrapCarouselEventHandler<TElement> extends JQuery.Event<TElement, undefined> {
+    /**
+     * The direction in which the carousel is sliding.
+     */
+    direction: "left" | "right";
+
+    /**
+     * The index of the current item.
+     */
+    from: number;
+
+    /**
+     * The index of the next item.
+     */
+    to: number;
+}
+
+type BootstrapAlertEvent = "close.bs.alert" | "closed.bs.alert";
+type BootstrapCarouselEvent = "slide.bs.carousel" | "slid.bs.carousel";
+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 BootstrapTooltipEvent = "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;
+
+    button(action: "toggle" | "dispose"): this;
+
+    carousel(action: "cycle" | "pause" | number | "prev" | "next" | "dispose"): this;
+    carousel(options?: BootstrapCarouselOption): this;
+
+    dropdown(action: "toggle" | "update" | "dispose"): this;
+    dropdown(options?: BootstrapDropdownOption): this;
+
+    modal(action: "toggle" | "show" | "hide" | "handleUpdate" | "dispose"): this;
+    modal(options?: BootstrapModalOption): 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,
+        handler: JQuery.EventHandler<TElement>): this;
+}
diff --git a/types/bootstrap/tsconfig.json b/types/bootstrap/tsconfig.json
new file mode 100755
index 0000000000..7f55f82c6f
--- /dev/null
+++ b/types/bootstrap/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",
+        "bootstrap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/bootstrap/tslint.json b/types/bootstrap/tslint.json
new file mode 100755
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/bootstrap/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From 5935040c4b052254d8d5424c225e8ebbf4207c33 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Tue, 20 Feb 2018 23:03:42 +0100
Subject: [PATCH 186/388] Typo

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

diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index 110d795128..c158bbd807 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for Bootstrap 4.0
 // Project: https://github.com/twbs/bootstrap/
 // Definitions by: denisname <https://github.com/denisname>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`;
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 // TODO: collapse, tab (list-group, navs), popovers, scrollspy

From f9314de6349e5d42470355495557f0eb02781be0 Mon Sep 17 00:00:00 2001
From: s0m3on3 <amedvedev@ciferox.com>
Date: Wed, 21 Feb 2018 01:00:35 +0200
Subject: [PATCH 187/388] [adone] refactoring * adone.exception -> adone.error
 * adone.fatal -> adone.logFatal * adone.error -> adone.logError * adone.warn
 -> adone.logWarn * adone.info -> adone.logInfo * adone.debug ->
 adone.logDebug * adone.trace -> adone.logTrace

---
 types/adone/adone.d.ts                        | 12 +++----
 types/adone/glosses/assertion.d.ts            |  2 +-
 types/adone/glosses/data.d.ts                 |  2 +-
 .../glosses/{exceptions.d.ts => errors.d.ts}  |  2 +-
 types/adone/index.d.ts                        |  2 +-
 types/adone/test/glosses/assertion.ts         |  6 ++--
 types/adone/test/glosses/errors.ts            | 36 +++++++++++++++++++
 types/adone/test/glosses/exceptions.ts        | 36 -------------------
 types/adone/test/index.ts                     | 12 +++----
 types/adone/tsconfig.json                     |  4 +--
 10 files changed, 57 insertions(+), 57 deletions(-)
 rename types/adone/glosses/{exceptions.d.ts => errors.d.ts} (98%)
 create mode 100644 types/adone/test/glosses/errors.ts
 delete mode 100644 types/adone/test/glosses/exceptions.ts

diff --git a/types/adone/adone.d.ts b/types/adone/adone.d.ts
index 0d6e3255ee..f1f5cbf694 100644
--- a/types/adone/adone.d.ts
+++ b/types/adone/adone.d.ts
@@ -11,12 +11,12 @@ declare namespace adone {
     export const bad: "BAD";
     export const exts: [".js", ".tjs", ".ajs"];
     export function log(...args: any[]): void;
-    export function fatal(...args: any[]): void;
-    export function error(...args: any[]): void;
-    export function warn(...args: any[]): void;
-    export function info(...args: any[]): void;
-    export function debug(...args: any[]): void;
-    export function trace(...args: any[]): void;
+    export function logFatal(...args: any[]): void;
+    export function logError(...args: any[]): void;
+    export function logWarn(...args: any[]): void;
+    export function logInfo(...args: any[]): void;
+    export function logDebug(...args: any[]): void;
+    export function logTrace(...args: any[]): void;
     export function o(...props: any[]): object;
     export const Date: typeof global.Date;
     export const hrtime: typeof global.process.hrtime;
diff --git a/types/adone/glosses/assertion.d.ts b/types/adone/glosses/assertion.d.ts
index ca0d75bdf5..f0cf377a21 100644
--- a/types/adone/glosses/assertion.d.ts
+++ b/types/adone/glosses/assertion.d.ts
@@ -1019,7 +1019,7 @@ declare namespace adone {
             }
         }
 
-        class AssertionError extends exception.Exception {
+        class AssertionError extends error.Exception {
             constructor(message?: string, props?: object, ssf?: object)
         }
 
diff --git a/types/adone/glosses/data.d.ts b/types/adone/glosses/data.d.ts
index 4d3dae7b2b..3a979cae98 100644
--- a/types/adone/glosses/data.d.ts
+++ b/types/adone/glosses/data.d.ts
@@ -582,7 +582,7 @@ declare namespace adone {
             /**
              * Represents a YAML exception
              */
-            class Exception extends adone.exception.Exception {
+            class Exception extends adone.error.Exception {
                 reason: string;
                 mark: Mark;
 
diff --git a/types/adone/glosses/exceptions.d.ts b/types/adone/glosses/errors.d.ts
similarity index 98%
rename from types/adone/glosses/exceptions.d.ts
rename to types/adone/glosses/errors.d.ts
index 1b1981f80e..c3d9e1f632 100644
--- a/types/adone/glosses/exceptions.d.ts
+++ b/types/adone/glosses/errors.d.ts
@@ -1,5 +1,5 @@
 declare namespace adone {
-    namespace exception {
+    namespace error {
         class Exception extends Error {
             constructor(message?: string | Error, captureStackTrace?: boolean);
         }
diff --git a/types/adone/index.d.ts b/types/adone/index.d.ts
index ea3b208438..e0ddfec26b 100644
--- a/types/adone/index.d.ts
+++ b/types/adone/index.d.ts
@@ -14,7 +14,7 @@
 /// <reference path="./glosses/data.d.ts" />
 /// <reference path="./glosses/datetime.d.ts" />
 /// <reference path="./glosses/events.d.ts" />
-/// <reference path="./glosses/exceptions.d.ts" />
+/// <reference path="./glosses/errors.d.ts" />
 /// <reference path="./glosses/fake.d.ts" />
 /// <reference path="./glosses/fast.d.ts" />
 /// <reference path="./glosses/fs.d.ts" />
diff --git a/types/adone/test/glosses/assertion.ts b/types/adone/test/glosses/assertion.ts
index 3e457dc876..292cfa190c 100644
--- a/types/adone/test/glosses/assertion.ts
+++ b/types/adone/test/glosses/assertion.ts
@@ -3,9 +3,9 @@ namespace assertionTests {
 
     namespace assertionInterface {
         namespace exception {
-            const a: adone.exception.Exception = new assertion.AssertionError();
-            const b: adone.exception.Exception = new assertion.AssertionError("hello");
-            const c: adone.exception.Exception = new assertion.AssertionError("hello", { actual: 2, expected: 3 }, () => {});
+            const a: adone.error.Exception = new assertion.AssertionError();
+            const b: adone.error.Exception = new assertion.AssertionError("hello");
+            const c: adone.error.Exception = new assertion.AssertionError("hello", { actual: 2, expected: 3 }, () => {});
         }
 
         namespace config {
diff --git a/types/adone/test/glosses/errors.ts b/types/adone/test/glosses/errors.ts
new file mode 100644
index 0000000000..d84a267b07
--- /dev/null
+++ b/types/adone/test/glosses/errors.ts
@@ -0,0 +1,36 @@
+namespace ErrorsTests {
+    { const a: Error = new adone.error.Exception(); }
+    { const a: Error = new adone.error.Exception("message"); }
+    { const a: Error = new adone.error.Exception(new Error()); }
+    { const a: Error = new adone.error.Exception(new Error(), true); }
+    { const a: adone.error.Exception = new adone.error.Runtime(); }
+    { const a: adone.error.Exception = new adone.error.IncompleteBufferError(); }
+    { const a: adone.error.Exception = new adone.error.NotImplemented(); }
+    { const a: adone.error.Exception = new adone.error.IllegalState(); }
+    { const a: adone.error.Exception = new adone.error.NotValid(); }
+    { const a: adone.error.Exception = new adone.error.Unknown(); }
+    { const a: adone.error.Exception = new adone.error.NotExists(); }
+    { const a: adone.error.Exception = new adone.error.Exists(); }
+    { const a: adone.error.Exception = new adone.error.Empty(); }
+    { const a: adone.error.Exception = new adone.error.InvalidAccess(); }
+    { const a: adone.error.Exception = new adone.error.NotSupported(); }
+    { const a: adone.error.Exception = new adone.error.InvalidArgument(); }
+    { const a: adone.error.Exception = new adone.error.InvalidNumberOfArguments(); }
+    { const a: adone.error.Exception = new adone.error.NotFound(); }
+    { const a: adone.error.Exception = new adone.error.Timeout(); }
+    { const a: adone.error.Exception = new adone.error.Incorrect(); }
+    { const a: adone.error.Exception = new adone.error.NotAllowed(); }
+    { const a: adone.error.Exception = new adone.error.LimitExceeded(); }
+    { const a: adone.error.Exception = new adone.error.Encoding(); }
+    { const a: adone.error.Exception = new adone.error.Network(); }
+    { const a: adone.error.Exception = new adone.error.Bind(); }
+    { const a: adone.error.Exception = new adone.error.Connect(); }
+    { const a: adone.error.Exception = new adone.error.Database(); }
+    { const a: adone.error.Exception = new adone.error.DatabaseInitialization(); }
+    { const a: adone.error.Exception = new adone.error.DatabaseOpen(); }
+    { const a: adone.error.Exception = new adone.error.DatabaseRead(); }
+    { const a: adone.error.Exception = new adone.error.DatabaseWrite(); }
+    { const a: adone.error.Exception = new adone.error.NetronIllegalState(); }
+    { const a: adone.error.Exception = new adone.error.NetronPeerDisconnected(); }
+    { const a: adone.error.Exception = new adone.error.NetronTimeout(); }
+}
diff --git a/types/adone/test/glosses/exceptions.ts b/types/adone/test/glosses/exceptions.ts
deleted file mode 100644
index d9694990d0..0000000000
--- a/types/adone/test/glosses/exceptions.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace ExcetpionsTests {
-    { const a: Error = new adone.exception.Exception(); }
-    { const a: Error = new adone.exception.Exception("message"); }
-    { const a: Error = new adone.exception.Exception(new Error()); }
-    { const a: Error = new adone.exception.Exception(new Error(), true); }
-    { const a: adone.exception.Exception = new adone.exception.Runtime(); }
-    { const a: adone.exception.Exception = new adone.exception.IncompleteBufferError(); }
-    { const a: adone.exception.Exception = new adone.exception.NotImplemented(); }
-    { const a: adone.exception.Exception = new adone.exception.IllegalState(); }
-    { const a: adone.exception.Exception = new adone.exception.NotValid(); }
-    { const a: adone.exception.Exception = new adone.exception.Unknown(); }
-    { const a: adone.exception.Exception = new adone.exception.NotExists(); }
-    { const a: adone.exception.Exception = new adone.exception.Exists(); }
-    { const a: adone.exception.Exception = new adone.exception.Empty(); }
-    { const a: adone.exception.Exception = new adone.exception.InvalidAccess(); }
-    { const a: adone.exception.Exception = new adone.exception.NotSupported(); }
-    { const a: adone.exception.Exception = new adone.exception.InvalidArgument(); }
-    { const a: adone.exception.Exception = new adone.exception.InvalidNumberOfArguments(); }
-    { const a: adone.exception.Exception = new adone.exception.NotFound(); }
-    { const a: adone.exception.Exception = new adone.exception.Timeout(); }
-    { const a: adone.exception.Exception = new adone.exception.Incorrect(); }
-    { const a: adone.exception.Exception = new adone.exception.NotAllowed(); }
-    { const a: adone.exception.Exception = new adone.exception.LimitExceeded(); }
-    { const a: adone.exception.Exception = new adone.exception.Encoding(); }
-    { const a: adone.exception.Exception = new adone.exception.Network(); }
-    { const a: adone.exception.Exception = new adone.exception.Bind(); }
-    { const a: adone.exception.Exception = new adone.exception.Connect(); }
-    { const a: adone.exception.Exception = new adone.exception.Database(); }
-    { const a: adone.exception.Exception = new adone.exception.DatabaseInitialization(); }
-    { const a: adone.exception.Exception = new adone.exception.DatabaseOpen(); }
-    { const a: adone.exception.Exception = new adone.exception.DatabaseRead(); }
-    { const a: adone.exception.Exception = new adone.exception.DatabaseWrite(); }
-    { const a: adone.exception.Exception = new adone.exception.NetronIllegalState(); }
-    { const a: adone.exception.Exception = new adone.exception.NetronPeerDisconnected(); }
-    { const a: adone.exception.Exception = new adone.exception.NetronTimeout(); }
-}
diff --git a/types/adone/test/index.ts b/types/adone/test/index.ts
index a9de1ab34b..efb8fc8fd7 100644
--- a/types/adone/test/index.ts
+++ b/types/adone/test/index.ts
@@ -10,12 +10,12 @@ namespace AdoneRootTests {
     { const a: string = adone.bad; }
     { const a: string[] = adone.exts; }
     adone.log();
-    adone.fatal();
-    adone.error();
-    adone.warn();
-    adone.info();
-    adone.debug();
-    adone.trace();
+    adone.logFatal();
+    adone.logError();
+    adone.logWarn();
+    adone.logInfo();
+    adone.logDebug();
+    adone.logTrace();
     { const a: object = adone.o(); }
     { const a: object = adone.o({}); }
     { const a: typeof Date = adone.Date; }
diff --git a/types/adone/tsconfig.json b/types/adone/tsconfig.json
index 18f90a5ae9..729fb82734 100644
--- a/types/adone/tsconfig.json
+++ b/types/adone/tsconfig.json
@@ -52,7 +52,7 @@
         "glosses/data.d.ts",
         "glosses/datetime.d.ts",
         "glosses/events.d.ts",
-        "glosses/exceptions.d.ts",
+        "glosses/errors.d.ts",
         "glosses/fake.d.ts",
         "glosses/fast.d.ts",
         "glosses/fs.d.ts",
@@ -117,7 +117,7 @@
         "test/glosses/data.ts",
         "test/glosses/datetime.ts",
         "test/glosses/events.ts",
-        "test/glosses/exceptions.ts",
+        "test/glosses/errors.ts",
         "test/glosses/fake.ts",
         "test/glosses/fast.ts",
         "test/glosses/fs.ts",

From f807b33420e2221f9dd6ce979507ff6819582aee Mon Sep 17 00:00:00 2001
From: Todd Bealmear <todd@users.noreply.github.com>
Date: Tue, 20 Feb 2018 16:47:35 -0800
Subject: [PATCH 188/388] Fix issue where Sequelize.Model.scope would not
 respect children (#23494)

---
 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 4de155e6ee..643a9a8167 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -11,6 +11,7 @@
 //                 Carven Zhang <https://github.com/zjy01>
 //                 Nikola Vidic <https://github.com/nidzov>
 //                 Florian Oellerich <https://github.com/Raigen>
+//                 Todd Bealmear <https://github.com/todd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -3780,7 +3781,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>): this;
+        scope(options?: string | ScopeOptions | AnyWhereOptions | Array<string | ScopeOptions | AnyWhereOptions>): Model<TInstance, TAttributes>;
 
         /**
          * Search for multiple instances.

From 03be5516a48031bc9fe41a1d6718077aabb21e5b Mon Sep 17 00:00:00 2001
From: Mischa King <mischa@webaction.com.au>
Date: Wed, 21 Feb 2018 15:11:46 +1000
Subject: [PATCH 189/388] Update Type to match v2.3.0

Added trimWhitespace boolean to match version 2.3.0
---
 types/react-truncate/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-truncate/index.d.ts b/types/react-truncate/index.d.ts
index cb97ccafe7..54618a9a8e 100644
--- a/types/react-truncate/index.d.ts
+++ b/types/react-truncate/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-truncate 2.1
+// Type definitions for react-truncate 2.3.0
 // Project: https://github.com/One-com/react-truncate
 // Definitions by: Matt Perry <https://github.com/mattvperry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,6 +9,7 @@ import * as React from 'react';
 export interface TruncateProps extends React.HTMLProps<Truncate> {
     lines?: number | false;
     ellipsis?: React.ReactNode;
+    trimWhitespace?: boolean;
     onTruncate?(isTruncated: boolean): void;
 }
 

From 2623588675a7b5ea2c3845edb8af7df9b13840c0 Mon Sep 17 00:00:00 2001
From: Anatoly Belonog <anatoly.belonog@xored.com>
Date: Wed, 21 Feb 2018 14:44:09 +0700
Subject: [PATCH 190/388] enable all tslint rules

---
 types/async-lock/async-lock-tests.ts |  3 +-
 types/async-lock/index.d.ts          |  9 ++--
 types/async-lock/tslint.json         | 76 +---------------------------
 3 files changed, 5 insertions(+), 83 deletions(-)

diff --git a/types/async-lock/async-lock-tests.ts b/types/async-lock/async-lock-tests.ts
index 64a1e89c75..9e8920ca4b 100755
--- a/types/async-lock/async-lock-tests.ts
+++ b/types/async-lock/async-lock-tests.ts
@@ -1,4 +1,3 @@
-
 import * as AsyncLock from "async-lock";
 const lock = new AsyncLock();
 
@@ -23,7 +22,7 @@ lock.acquire([ "key1", "key2" ], (done) => {
 }, (err, ret) => { /* ... */ });
 
 lock.isBusy();
-lock.isBusy('key')
+lock.isBusy('key');
 
 const lock2 = new AsyncLock({ timeout : 5000 });
 const lock3 = new AsyncLock({ maxPending : 5000 });
diff --git a/types/async-lock/index.d.ts b/types/async-lock/index.d.ts
index 9e56e00a21..cd2b1e4b40 100755
--- a/types/async-lock/index.d.ts
+++ b/types/async-lock/index.d.ts
@@ -1,15 +1,12 @@
-// Type definitions for async-lock 1.1.0
+// Type definitions for async-lock 1.1
 // Project: https://github.com/rain1017/async-lock
-// Definitions by: Elisée MAURER <https://github.com/elisee> 
+// Definitions by: Elisée MAURER <https://github.com/elisee>
 //                 Alejandro <https://github.com/afharo>
 //                 Anatoly <https://github.com/rhymmor>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-
-interface AsyncLockDoneCallback<T> {
-    (err?: Error, ret?: T): void;
-}
+type AsyncLockDoneCallback<T> = (err?: Error, ret?: T) => void;
 
 interface AsyncLockOptions {
     timeout?: number;
diff --git a/types/async-lock/tslint.json b/types/async-lock/tslint.json
index 35039ba334..f93cf8562a 100755
--- a/types/async-lock/tslint.json
+++ b/types/async-lock/tslint.json
@@ -1,77 +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,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": 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 d52f4f7b327af576cd33174d48602ad4ce47f9aa Mon Sep 17 00:00:00 2001
From: Anatoly Belonog <anatoly.belonog@xored.com>
Date: Wed, 21 Feb 2018 14:45:37 +0700
Subject: [PATCH 191/388] change file permissions to 644

---
 types/async-lock/async-lock-tests.ts | 0
 types/async-lock/index.d.ts          | 0
 types/async-lock/tsconfig.json       | 0
 types/async-lock/tslint.json         | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 types/async-lock/async-lock-tests.ts
 mode change 100755 => 100644 types/async-lock/index.d.ts
 mode change 100755 => 100644 types/async-lock/tsconfig.json
 mode change 100755 => 100644 types/async-lock/tslint.json

diff --git a/types/async-lock/async-lock-tests.ts b/types/async-lock/async-lock-tests.ts
old mode 100755
new mode 100644
diff --git a/types/async-lock/index.d.ts b/types/async-lock/index.d.ts
old mode 100755
new mode 100644
diff --git a/types/async-lock/tsconfig.json b/types/async-lock/tsconfig.json
old mode 100755
new mode 100644
diff --git a/types/async-lock/tslint.json b/types/async-lock/tslint.json
old mode 100755
new mode 100644

From a49f413c6b7b5e90d3db1ddee195e9724b3671d9 Mon Sep 17 00:00:00 2001
From: jnizet <jb@ninja-squad.com>
Date: Sun, 18 Feb 2018 10:56:16 +0100
Subject: [PATCH 192/388] luxon: add changes introduced in versions 0.5.0,
 0.5.1 and 0.5.2

---
 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 fac0b90fe6..7ff27f909c 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for luxon 0.2
+// Type definitions for luxon 0.5
 // Project: https://github.com/moment/luxon#readme
 // Definitions by: Colby DeHart <https://github.com/colbydehart>
 //                 Hyeonseok Yang <https://github.com/FourwingsY>
@@ -165,6 +165,7 @@ declare module 'luxon' {
             offsetNameShort: string;
             ordinal: number;
             outputCalendar: string;
+            quarter: number;
             second: number;
             weekNumber: number;
             weekYear: number;
@@ -251,6 +252,7 @@ declare module 'luxon' {
             minutes: number;
             months: number;
             numberingSystem: string;
+            quarters: number;
             seconds: number;
             weeks: number;
             years: number;
@@ -335,7 +337,7 @@ declare module 'luxon' {
             abutsStart(other: Interval): boolean;
             contains(dateTime: DateTime): boolean;
             count(unit?: string): number;
-            difference(...intervals: Interval[]): Interval;
+            difference(...intervals: Interval[]): Interval[];
             divideEqually(numberOfParts?: number): Interval[];
             engulfs(other: Interval): boolean;
             equals(other: Interval): boolean;

From f9f4a8036345360a3c83757a253c87e9a864acb5 Mon Sep 17 00:00:00 2001
From: Florian Keller <github@floriankeller.de>
Date: Thu, 22 Feb 2018 00:04:50 +0100
Subject: [PATCH 193/388] Add single-line-log

---
 types/single-line-log/index.d.ts              | 13 +++++++++++
 .../single-line-log/single-line-log-tests.ts  | 20 ++++++++++++++++
 types/single-line-log/tsconfig.json           | 23 +++++++++++++++++++
 types/single-line-log/tslint.json             |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 types/single-line-log/index.d.ts
 create mode 100644 types/single-line-log/single-line-log-tests.ts
 create mode 100644 types/single-line-log/tsconfig.json
 create mode 100644 types/single-line-log/tslint.json

diff --git a/types/single-line-log/index.d.ts b/types/single-line-log/index.d.ts
new file mode 100644
index 0000000000..ecb60f1d3a
--- /dev/null
+++ b/types/single-line-log/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for single-line-log 1.1
+// Project: https://github.com/freeall/single-line-log
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface SingleLineLog {
+    (data: string): void;
+    clear(): void;
+    write(data: string): void;
+}
+
+export const stdout: SingleLineLog;
+export const stderr: SingleLineLog;
diff --git a/types/single-line-log/single-line-log-tests.ts b/types/single-line-log/single-line-log-tests.ts
new file mode 100644
index 0000000000..3814c64400
--- /dev/null
+++ b/types/single-line-log/single-line-log-tests.ts
@@ -0,0 +1,20 @@
+// @ts-check
+/// <reference types="node"/>
+
+import singleLineLog = require('single-line-log');
+const log = singleLineLog.stderr;
+
+let i = 0;
+
+setInterval(() => {
+  i++;
+
+  const s = `line 1: ${Math.random()}`;
+
+  log(s);
+
+  if (i === 50) {
+    log.clear();
+    process.exit(0);
+  }
+}, 200);
diff --git a/types/single-line-log/tsconfig.json b/types/single-line-log/tsconfig.json
new file mode 100644
index 0000000000..f353aaca45
--- /dev/null
+++ b/types/single-line-log/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",
+        "single-line-log-tests.ts"
+    ]
+}
diff --git a/types/single-line-log/tslint.json b/types/single-line-log/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/single-line-log/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 11ed09a5f3a601cf979a919d4bf03e6e4c452bc4 Mon Sep 17 00:00:00 2001
From: Nicholas Steicke <nicholas.steicke@alcidion.com>
Date: Wed, 21 Feb 2018 15:41:15 +1030
Subject: [PATCH 194/388] react-jsonschema-form uses AVJ5 which defaults to
 JSON Schema 6

---
 types/react-jsonschema-form/index.d.ts             | 14 +++++++-------
 .../react-jsonschema-form-tests.tsx                |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index 0a43e0f0c8..dec2ad0509 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -9,10 +9,10 @@
 
 declare module "react-jsonschema-form" {
     import * as React from "react";
-    import { JSONSchema4 } from "json-schema";
+    import { JSONSchema6 } from "json-schema";
 
     export interface FormProps {
-        schema: JSONSchema4;
+        schema: JSONSchema6;
         uiSchema?: UiSchema;
         formData?: any;
         formContext?: any;
@@ -60,7 +60,7 @@ declare module "react-jsonschema-form" {
 
     export interface WidgetProps extends React.HTMLAttributes<HTMLElement> {
         id: string;
-        schema: JSONSchema4;
+        schema: JSONSchema6;
         value: any;
         required: boolean;
         disabled: boolean;
@@ -74,7 +74,7 @@ declare module "react-jsonschema-form" {
     export type Widget = React.StatelessComponent<WidgetProps> | React.ComponentClass<WidgetProps>;
 
     export interface FieldProps extends React.HTMLAttributes<HTMLElement> {
-        schema: JSONSchema4;
+        schema: JSONSchema6;
         uiSchema: UiSchema;
         idSchema: IdSchema;
         formData: any;
@@ -114,7 +114,7 @@ declare module "react-jsonschema-form" {
         disabled: boolean;
         displayLabel: boolean;
         fields: Field[];
-        schema: JSONSchema4;
+        schema: JSONSchema6;
         uiSchema: UiSchema;
         formContext: any;
     }
@@ -142,7 +142,7 @@ declare module "react-jsonschema-form" {
         onAddClick: (event: any) => (event: any) => void;
         readonly: boolean;
         required: boolean;
-        schema: JSONSchema4;
+        schema: JSONSchema6;
         uiSchema: UiSchema;
         title: string;
         formContext: any;
@@ -161,7 +161,7 @@ declare module "react-jsonschema-form" {
             readonly: boolean;
         }[],
         required: boolean;
-        schema: JSONSchema4;
+        schema: JSONSchema6;
         uiSchema: UiSchema;
         idSchema: IdSchema;
         formData: any;
diff --git a/types/react-jsonschema-form/react-jsonschema-form-tests.tsx b/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
index 2b4a7e0d67..519a642ebb 100644
--- a/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
+++ b/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
@@ -1,11 +1,11 @@
 import * as React from "react";
 import Form, { UiSchema } from "react-jsonschema-form";
-import { JSONSchema4 } from "json-schema";
+import { JSONSchema6 } from "json-schema";
 
 // example taken from the react-jsonschema-form playground:
 // https://github.com/mozilla-services/react-jsonschema-form/blob/fedd830294417969d88e38fb9f6b3a85e6ad105e/playground/samples/simple.js
 
-const schema: JSONSchema4 =  {
+const schema: JSONSchema6 =  {
     "title": "A registration form",
     "type": "object",
     "required": [

From 22531c82981bdb9218e0f8505726e8cc50a34849 Mon Sep 17 00:00:00 2001
From: rtaseen <ryeyan.taseen@usherbrooke.ca>
Date: Wed, 21 Feb 2018 21:20:28 -0500
Subject: [PATCH 195/388] "plugins" key moved from ChartConfiguration to
 ChartOptions

https://stackoverflow.com/questions/44308458/inline-plugin-doesnt-work
---
 types/chart.js/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 9a8269bee4..03d3b988ce 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -168,6 +168,8 @@ declare namespace Chart {
         type?: ChartType | string;
         data?: ChartData;
         options?: ChartOptions;
+        // Plugins can require any options
+        plugins?: any;
     }
 
     interface ChartData {
@@ -195,8 +197,6 @@ declare namespace Chart {
         cutoutPercentage?: number;
         circumference?: number;
         rotation?: number;
-        // Plugins can require any options
-        plugins?: any;
     }
 
     interface ChartFontOptions {

From 5409ea85f91c87f10610c39f1d141916a64e8e33 Mon Sep 17 00:00:00 2001
From: rtaseen <ryeyan.taseen@usherbrooke.ca>
Date: Wed, 21 Feb 2018 21:38:12 -0500
Subject: [PATCH 196/388] Remove arbitrary plugin key in test object

Incorrect interface implementation
---
 types/chart.js/chart.js-tests.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/chart.js/chart.js-tests.ts b/types/chart.js/chart.js-tests.ts
index 8ba81e8747..6041889b66 100644
--- a/types/chart.js/chart.js-tests.ts
+++ b/types/chart.js/chart.js-tests.ts
@@ -45,7 +45,6 @@ const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
                 }
             }]
         },
-        plugins: { arbitraryPlugin: {option: "value"} },
         legend: {
             display: true,
             labels: {

From 5e21fb500e1993003e13a95ca079ded17e272788 Mon Sep 17 00:00:00 2001
From: York Yao <plantain-00@users.noreply.github.com>
Date: Thu, 22 Feb 2018 11:54:39 +0800
Subject: [PATCH 197/388] Update zipkin version

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

diff --git a/types/zipkin-instrumentation-fetch/package.json b/types/zipkin-instrumentation-fetch/package.json
index 371d115490..07bdb0d223 100644
--- a/types/zipkin-instrumentation-fetch/package.json
+++ b/types/zipkin-instrumentation-fetch/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "zipkin": "^0.11.2"
+    "zipkin": ">=0.11.0"
   }
 }

From 252e542b35f9aa1d97e5696e210dc36fef38be5b Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Thu, 22 Feb 2018 08:36:20 +0200
Subject: [PATCH 198/388] Added no-const-enum disable to tslint.json

---
 types/activex-wia/index.d.ts  | 12 ------------
 types/activex-wia/tslint.json |  5 ++++-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index ae21c9c77c..18e474e09c 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -6,7 +6,6 @@
 
 declare namespace WIA {
     /** String versions of globally unique identifiers (GUIDs) that identify common Device and Item commands. */
-    // tslint:disable-next-line no-const-enum
     const enum CommandID {
         wiaCommandChangeDocument = '{04E725B0-ACAE-11D2-A093-00C04F72DC3C}',
         wiaCommandDeleteAllItems = '{E208C170-ACAD-11D2-A093-00C04F72DC3C}',
@@ -16,7 +15,6 @@ declare namespace WIA {
     }
 
     /** String versions of globally unique identifiers (GUIDs) that identify DeviceManager events. */
-    // tslint:disable-next-line no-const-enum
     const enum EventID {
         wiaEventDeviceConnected = '{A28BBADE-64B6-11D2-A231-00C04FA31809}',
         wiaEventDeviceDisconnected = '{143E4E83-6497-11D2-A231-00C04FA31809}',
@@ -34,7 +32,6 @@ declare namespace WIA {
     }
 
     /** String versions of globally unique identifiers (GUIDs) that indicate the file format of an image. */
-    // tslint:disable-next-line no-const-enum
     const enum FormatID {
         wiaFormatBMP = '{B96B3CAB-0728-11D3-9D7B-0000F81EF32E}',
         wiaFormatGIF = '{B96B3CB0-0728-11D3-9D7B-0000F81EF32E}',
@@ -44,7 +41,6 @@ declare namespace WIA {
     }
 
     /** Miscellaneous string constants */
-    // tslint:disable-next-line no-const-enum
     const enum Miscellaneous {
         wiaAnyDeviceID = '*',
         wiaIDUnknown = '{00000000-0000-0000-0000-000000000000}',
@@ -54,7 +50,6 @@ declare namespace WIA {
      * The WiaDeviceType enumeration specifies the type of device attached to a user's computer. Use the Type property on the DeviceInfo object or the Device
      * object to obtain these values from the device.
      */
-    // tslint:disable-next-line no-const-enum
     const enum WiaDeviceType {
         CameraDeviceType = 2,
         ScannerDeviceType = 1,
@@ -66,21 +61,18 @@ declare namespace WIA {
      * A DeviceEvent's type is composed of bits from the WiaEventFlags enumeration. You can test a DeviceEvent's type by using the AND operation with
      * DeviceEvent.Type and a member from the WiaEventFlags enumeration.
      */
-    // tslint:disable-next-line no-const-enum
     const enum WiaEventFlag {
         ActionEvent = 2,
         NotificationEvent = 1,
     }
 
     /** The WiaImageBias enumeration helps specify what type of data the image is intended to represent. */
-    // tslint:disable-next-line no-const-enum
     const enum WiaImageBias {
         MaximizeQuality = 131072,
         MinimizeSize = 65536,
     }
 
     /** The WiaImageIntent enumeration helps specify what type of data the image is intended to represent. */
-    // tslint:disable-next-line no-const-enum
     const enum WiaImageIntent {
         ColorIntent = 1,
         GrayscaleIntent = 2,
@@ -92,7 +84,6 @@ declare namespace WIA {
      * The WiaImagePropertyType enumeration specifies the type of the value of an image property. Image properties can be found in the Properties collection
      * of an ImageFile object.
      */
-    // tslint:disable-next-line no-const-enum
     const enum WiaImagePropertyType {
         ByteImagePropertyType = 1001,
         LongImagePropertyType = 1004,
@@ -115,7 +106,6 @@ declare namespace WIA {
      * An Item's type is composed of bits from the WiaItemFlags enumeration. You can test an Item's type by using the AND operation with
      * Item.Properties("Item Flags") and a member from the WiaItemFlags enumeration.
      */
-    // tslint:disable-next-line no-const-enum
     const enum WiaItemFlag {
         AnalyzeItemFlag = 16,
         AudioItemFlag = 32,
@@ -142,7 +132,6 @@ declare namespace WIA {
      * The WiaPropertyType enumeration specifies the type of the value of an item property. Item properties can be found in the Properties collection of a
      * Device or Item object.
      */
-    // tslint:disable-next-line no-const-enum
     const enum WiaPropertyType {
         BooleanPropertyType = 1,
         BytePropertyType = 2,
@@ -187,7 +176,6 @@ declare namespace WIA {
      * The WiaSubType enumeration specifies more detail about the property value. Use the SubType property on the Property object to obtain these values for
      * the property.
      */
-    // tslint:disable-next-line no-const-enum
     const enum WiaSubType {
         FlagSubType = 3,
         ListSubType = 2,
diff --git a/types/activex-wia/tslint.json b/types/activex-wia/tslint.json
index f93cf8562a..457cebbb55 100644
--- a/types/activex-wia/tslint.json
+++ b/types/activex-wia/tslint.json
@@ -1,3 +1,6 @@
 {
-    "extends": "dtslint/dt.json"
+    "extends": "dtslint/dt.json",
+    "rules":{
+        "no-const-enum": false
+    }
 }

From 4966b96680a54654026163729ec03289103ddb55 Mon Sep 17 00:00:00 2001
From: Syncfusion-JavaScript <packages@syncfusion.com>
Date: Thu, 22 Feb 2018 13:58:56 +0530
Subject: [PATCH 199/388] 16.1.24 added

---
 types/ej.web.all/ej.web.all-tests.ts | 6768 +++++++++++++-------------
 types/ej.web.all/index.d.ts          | 3784 ++++++++++----
 2 files changed, 6306 insertions(+), 4246 deletions(-)

diff --git a/types/ej.web.all/ej.web.all-tests.ts b/types/ej.web.all/ej.web.all-tests.ts
index 9ccc1ca9f9..ddfdc39876 100644
--- a/types/ej.web.all/ej.web.all-tests.ts
+++ b/types/ej.web.all/ej.web.all-tests.ts
@@ -1,3307 +1,3461 @@
-module AccordionComponent {
-    $(function () {
-        var sample = new ej.Accordion($("#basicAccordion"), {
-            width: "100%",
-            allowKeyboardNavigation: true,
-            collapseSpeed: 500,
-            collapsible: true,
-            enableAnimation: true,
-            enableMultipleOpen: true,
-            events: "click",
-            expandSpeed: 500,
-            headerSize: "40px",
-            htmlAttributes: { title: "Demo" },
-            selectedItemIndex: 1,
-            showCloseButton: true,
-            showRoundedCorner: true
-        });
-    });
-}
-
-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"), {
-            width: "100%",
-            watermarkText: "Select a car",
-            dataSource: carList,
-            enableAutoFill: true,
-            showPopupButton: true,
-            multiSelectMode: "delimiter"
-        });
-    });
-}
-
-
-
-module Barcodecomponent {
-    $(function () {
-        var barcodesample = new ej.datavisualization.Barcode($("#Barcode"), {
-            text:"http://www.syncfusion.com"
-        });
-    });
-}
-
-
-module Bulletgraphcomponent {
-    $(function () {
-        var bulletsample = new ej.datavisualization.BulletGraph($("#BulletGraph"), {
-            isResponsive: true,
-            load: function () {
-                var sender = $("#BulletGraph").data("ejBulletGraph");
-                var bulletTheme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
-                if (bulletTheme) {
-                    switch (bulletTheme) {
-                        case "flatdark":
-                        case "flatazuredark":
-                        case "flatlimedark":
-                        case "flatsaffrondark":
-                        case "gradientdark":
-                        case "gradientazuredark":
-                        case "gradientlimedark":
-                        case "gradientsaffrondark":
-                        case "flathigh-contrast-01dark":
-                        case "flathigh-contrast-02dark":
-                            bulletTheme = "flatdark";
-                            break;
-                        case "flatoffice-365light":
-                        case "flatmateriallight":
-                            bulletTheme = "material";
-                            break;
-                        default:
-                            bulletTheme = "flatlight";
-                            break;
-                    }
-                    sender.model.theme = bulletTheme;
-                }
-
-            },
-            tooltipSettings: { visible: true },
-            quantitativeScaleSettings: {
-                featureMeasures: [{
-                    value: 8, comparativeMeasureValue:6.7
-                }]
-            },
-            qualitativeRanges: [{
-                rangeEnd: 4.3, rangeStroke:"#ebebeb",
-            },
-                {
-                    rangeEnd: 7.3, rangeStroke:"#d8d8d8"
-                },
-                {
-                    rangeEnd: 10, rangeStroke: "#7f7f7f"
-                }
-            ],
-            captionSettings: {
-                textPosition: 'right', text: 'Revenue YTD',
-                subTitle: {
-                    text: "$ in Thousands", textPosition:"right"
-                }
-            }
-        });
-    });
-}
-
-
-module ButtonComponent {
-    $(function () {
-        var basicButton = new ej.Button($("#buttonnormal"), {
-            size: "large",
-            showRoundedCorner: true,
-            contentType: "textandimage",
-            prefixIcon: "e-icon e-save",
-            text: "Save"
-        });
-        var toggleButton = new ej.ToggleButton($("#TextOnly"), {
-            showRoundedCorner: true,
-            size: "large",
-            contentType: "textandimage",
-            defaultPrefixIcon: "e-icon e-save",
-            activePrefixIcon: "e-icon e-delete",
-            defaultText: "Save",
-            activeText: "Delete"
-        });
-        var splitbuttonnormal = new ej.SplitButton($("#splitbuttonnormal"), {
-            showRoundedCorner: true,
-            size: "large",
-            prefixIcon: "e-icon e-file-empty",
-            targetID: "menu1",
-            contentType: "textandimage",
-            text: "File"
-        });
-        var groupButton = new ej.GroupButton($("#groupButton"), {
-            showRoundedCorner: true,
-            size: "large"
-        });
-        var check1 = new ej.CheckBox($("#check1"), {
-            size: "medium", enableTriState: true
-        });
-        var check2 = new ej.CheckBox($("#check2"), {
-            size: "medium", enableTriState: true
-        });
-        var radio1 = new ej.RadioButton($("#radio1"), {
-            size: "medium"
-        });
-        var radio2 = new ej.RadioButton($("#radio2"), {
-            size: "medium", checked: true
-        });
-    });
-}
-
-module ChartComponent {
-    $(function () {
-        var chartsample = new ej.datavisualization.Chart($("#Chart"), {
-            primaryXAxis: {
-                range: { min: 2005, max: 2011, interval: 1 },
-                title: { text: "Year" },
-                valueType: "category"
-            },
-            primaryYAxis: {
-                range: { min: 25, max: 50, interval: 5 },
-                labelFormat: "{value}%",
-                title: { text: "Efficiency" },
-
-            },
-            commonSeriesOptions:
-            {
-                type: 'line', enableAnimation: true,
-                tooltip: { visible: true, template: 'Tooltip' },
-                marker:
-                {
-                    shape: 'circle',
-                    size:
-                    {
-                        height: 10, width: 10
-                    },
-                    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'
-                },
-                {
-                    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 () {
-                var sender = $("#Chart").data("ejChart");
-                if (!!window.orientation && sender) {           //to modify chart properties for mobile view
-                    var model = sender.model,
-                        seriesLength = model.series.length;
-                    model.legend.visible = false;
-                    model.size.height = null;
-                    model.size.width = null;
-                    for (var i = 0; i < seriesLength; i++) {
-                        if (!model.series[i].marker)
-                            model.series[i].marker = {};
-                        if (!model.series[i].marker.size)
-                            model.series[i].marker.size = {};
-                        model.series[i].marker.size.width = 6;
-                        model.series[i].marker.size.height = 6;
-                    }
-                    model.primaryXAxis.labelIntersectAction = "rotate45";
-                    if (model.primaryXAxis.title)
-                        model.primaryXAxis.title.text = "";
-                    if (model.primaryYAxis.title)
-                        model.primaryYAxis.title.text = "";
-                    model.primaryXAxis.edgeLabelPlacement = "hide";
-                    model.primaryYAxis.labelIntersectAction = "rotate45";
-                    model.primaryYAxis.edgeLabelPlacement = "hide";
-                }
-                var theme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
-                if (theme) {
-                    switch (theme) {
-                        case "flatdark":
-                        case "flatazuredark":
-                        case "flatlimedark":
-                        case "flatsaffrondark":
-                            theme = "flatdark";
-                            break;
-                        case "gradientlight":
-                        case "gradientazurelight":
-                        case "gradientlimelight":
-                        case "gradientsaffronlight":
-                            theme = "gradientlight";
-                            break;
-                        case "gradientdark":
-                        case "gradientazuredark":
-                        case "gradientlimedark":
-                        case "gradientsaffrondark":
-                            theme = "gradientdark";
-                            break;
-                        case "flatbootstraplight":
-                            theme = "bootstrap";
-                            break;
-                        case "flathigh-contrast-01dark":
-                        case "flathigh-contrast-02dark":
-                            theme = "high-contrast-01";
-                            break;
-                        case "flatmateriallight":
-                        case "flatoffice-365light":
-                            theme = "material";
-                            break;
-
-                        default:
-                            theme = "flatlight";
-                            break;
-                    }
-                    sender.model.theme = theme;
-                }
-            },
-            title: { text: 'Efficiency of oil-fired power production' },
-            size: { height: "600" },
-            legend: { visible: true },
-        });
-    });
-}
-
-module circulargaugecomponent {
-    $(function () {
-        var circularsample = new ej.datavisualization.CircularGauge($("#CircularGauge"), {
-            enableAnimation: false,
-            isResponsive: true,
-            backgroundColor: "transparent", width: 500,
-            scales: [{
-                showRanges: true,
-                startAngle: 122, sweepAngle: 296, radius: 130, showScaleBar: true, size: 1, maximum: 120, majorIntervalValue: 20, minorIntervalValue: 10,
-                border: {
-                    width: 0.5,
-                },
-                pointers: [{
-                    value: 60,
-                    showBackNeedle: true,
-                    backNeedleLength: 20,
-                    length: 95,
-                    width: 7
-                }],
-                ticks: [{
-                    type: "major",
-                    distanceFromScale: 2,
-                    height: 16,
-                    width: 1, color: "#8c8c8c"
-                }, { type: "minor", height: 8, width: 1, distanceFromScale: 2, color: "#8c8c8c" }],
-                labels: [{
-                    color: "#8c8c8c"
-                }],
-                ranges: [{
-                    distanceFromScale: -30,
-                    startValue: 0,
-                    endValue: 70
-                }, {
-                        distanceFromScale: -30,
-                        startValue: 70,
-                        endValue: 110,
-                        backgroundColor: "#fc0606",
-                        border: { color: "#fc0606" }
-                    },
-                    {
-                        distanceFromScale: -30,
-                        startValue: 110,
-                        endValue: 120,
-                        backgroundColor: "#f5b43f",
-                        border: { color: "#f5b43f" }
-                    }]
-            }]
-        });
-    });
-}
-
-module ColorPickerComponent {
-    $(function () {
-        var colorSample = new ej.ColorPicker($("#colorpick"), {
-            value: "#278787"
-        });
-    });
-}
-
-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"), {
-            width: "100%",
-            placeholder: "Select a Bike",
-            fields: { text: "text", value: "empid" },
-            dataSource: BikeList,
-            autofill: true
-        });
-    });
-}
-
-module DatePickerComponent {
-    $(function () {
-        var dateSample = new ej.DatePicker($("#datepick"), {
-            width: "100%"
-        });
-    });
-}
-
-module DateTimePickerComponent {
-    $(function () {
-        var datetimeSample = new ej.DateRangePicker($("#daterangepick"), {
-            width: "100%"
-        });
-    });
-}
-
-module DateTimePickerComponent {
-    $(function () {
-        var datetimeSample = new ej.DateTimePicker($("#datetimepick"), {
-            width: "100%"
-        });
-    });
-}
-
-$(function () {
-    var diagram = new ej.datavisualization.Diagram($("#diagram"), {
-        width: "1000px",
-        height: "600px",
-        pageSettings: {
-            //Sets page size
-            pageHeight: 500,
-            pageWidth: 500,
-            //Customizes the appearance of page
-            pageBorderWidth: 4,
-            pageBackgroundColor: "white",
-            pageBorderColor: "lightgray",
-            pageMargin: 25,
-            showPageBreak: true,
-            multiplePage: true,
-            pageOrientation: ej.datavisualization.Diagram.PageOrientations.Portrait
-        },
-        scrollSettings: {
-            horizontalOffset: 0,
-            verticalOffset: 0
-        },
-        snapSettings: {
-            snapConstraints: ej.datavisualization.Diagram.SnapConstraints.ShowLines
-        },
-        nodes: [
-            createNode({ name: "NewIdea", width: 150, height: 60, offsetX: 300, offsetY: 60, labels: [createLabel({ "text": "New idea identified" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Terminator }),
-            createNode({ name: "Meeting", width: 150, height: 60, offsetX: 300, offsetY: 155, labels: [createLabel({ "text": "Meeting with board" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
-            createNode({
-                name: "BoardDecision", width: 150, height: 110, offsetX: 300, offsetY: 280, labels: [createLabel({ text: "Board decides \nwhether \nto proceed", wrapText: "true", "margin": { left: 20, top: 0, right: 20, bottom: 0 } })],
-                type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Decision
-            }),
-            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
-            }),
-            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 })
-        ],
-        connectors: [
-            createConnector({ name: "connector1", sourceNode: "NewIdea", targetNode: "Meeting" }),
-            createConnector({ name: "connector2", sourceNode: "Meeting", targetNode: "BoardDecision" }),
-            createConnector({ name: "connector3", sourceNode: "BoardDecision", targetNode: "Project", labels: [createLabel({ "text": "Yes" })] }),
-            createConnector({ name: "connector4", sourceNode: "Project", targetNode: "End", labels: [createLabel({ "text": "Yes" })] }),
-            createConnector({ name: "connector5", sourceNode: "BoardDecision", targetNode: "Reject", labels: [createLabel({ "text": "No" })] }),
-            createConnector({ name: "connector6", sourceNode: "Project", targetNode: "Resources", labels: [createLabel({ "text": "No" })] })
-        ]
-    });
-
-});
-
-function createNode(option: ej.datavisualization.Diagram.Node) {
-    if (!option.fillColor) {
-        option.borderColor = "#1BA0E2";
-        option.fillColor = "#1BA0E2";
-    }
-    option.labels[0].fontColor = "white";
-    return option;
-}
-
-function createConnector(option: ej.datavisualization.Diagram.Connector) {
-    option.targetDecorator = { shape: ej.datavisualization.Diagram.DecoratorShapes.Arrow, borderColor: "#606060", width: 10, height: 10 };
-    option.lineColor = "#606060";
-    if (option.labels && option.labels.length > 0) {
-        option.labels[0].fillColor = "white";
-    }
-    return option;
-}
-
-function createLabel(options : any) {
-    return options;
-}
-
-module DialogComponent {
-    $(function () {
-        var dialogInstance = new ej.Dialog($("#basicDialog"), {
-            width: 550,
-            minWidth: 310,
-            minHeight: 215,
-			target:".control",
-            close:()=>{
-			$("#btnOpen").show();}
-        });
-        var btnInstance = new ej.Button($("#btnOpen"), {
-            size: "medium",
-            click: ()=>{
-			$("#btnOpen").hide();
-        $("#basicDialog").ejDialog("open");},
-            type: "button",
-            height: 30,
-            width: 150
-        });
-    });
-}
-
-
-module digitalgaugecomponent {
-    $(function () {
-        var digitalgaugesample = new ej.datavisualization.DigitalGauge($("#DigitalGauge"), {
-            width: 525,
-            height: 305,
-            isResponsive: true,
-            items: [{
-                segmentSettings: {
-                    width: 1,
-                    spacing: 0,
-                    color: "#8c8c8c"
-                },
-                characterSettings: {
-                    opacity: 0.8,
-                },
-                value: "Syncfusion",
-                position: { x: 52, y: 52 }
-            }]
-        });
-    });
-}
-
-
-
-module DropDownListComponent {
-    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 sample = new ej.DropDownList($("#bikeList"),{
-            dataSource: BikeList,
-            width: "100%",
-            watermarkText: "Select a bike",
-            fields: { id: "empid", text: "text", value: "text" },
-            enableFilterSearch: true,
-            caseSensitiveSearch: true,
-            enableIncrementalSearch: true,
-            enablePopupResize: true,
-            delimiterChar: ";",
-            multiSelectMode: ej.MultiSelectMode.Delimiter,
-            maxPopupHeight: "300px",
-            minPopupHeight: "150px",
-            maxPopupWidth: "500px",
-            minPopupWidth: "350px",
-            showCheckbox: true,
-            showRoundedCorner: true
-        });
-    });
-
-}
-
-
-
-module ExplorerComponent {
-    $(function () {
-        var file = new ej.FileExplorer($("#fileExplorer"), {
-            path: (<any>window).baseurl + "Content/FileBrowser/",
-            width: "100%",
-            minWidth: "150px",
-            layout: "tile",
-            isResponsive: true,
-            ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
-        });
-    });
-}
-
-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,
-        });
-    });
-}
-module GridComponent {
-    $(function () {
-        var gridInstance = new ej.Grid($("#Grid"), {
-            dataSource: (<any>window).gridData,
-            allowGrouping: true,
-            allowSorting: true,
-            allowMultiSorting: true,
-            enableAltRow: true,
-            allowPaging: true,
-            allowReordering: true,
-            allowResizing: true,
-            allowFiltering: true,
-            allowScrolling: true,
-            enableRowHover: true,
-            selectionType: "multiple",
-            selectionSettings: { enableToggle: true, selectionMode: ["row", "cell", "column"] },
-            allowKeyboardNavigation: true,
-            editSettings: { allowEditing: true, allowAdding: true, allowDeleting: true, allowEditOnDblClick: true, showDeleteConfirmDialog: true },
-            toolbarSettings: { showToolbar: true, toolbarItems: ["add", "edit", "delete", "update", "cancel", "search"] },
-            columns: [
-                { field: "OrderID", headerText: "Order ID", isPrimaryKey: true, width: 75, textAlign: ej.TextAlign.Right },
-                { field: "CustomerID", headerText: "Customer ID", editType: ej.Grid.EditingType.String, width: 80 },
-                { field: "EmployeeID", headerText: "Employee ID", width: 75, editType: ej.Grid.EditingType.Dropdown, textAlign: ej.TextAlign.Right, priority: 4 },
-                { field: "Freight", width: 75, format: "{0:C}", editType: ej.Grid.EditingType.Numeric, textAlign: ej.TextAlign.Right, priority: 3 },
-                { field: "OrderDate", headerText: "Order Date", width: 80, format: "{0:MM/dd/yyyy}", textAlign: ej.TextAlign.Right, priority: 2 },
-                { field: "ShipCity", headerText: "Ship City", editType: ej.Grid.EditingType.Dropdown, width: 110, priority: 2 }
-            ],
-            isResponsive: true,
-            minWidth: 700,
-            showSummary: true,
-            summaryRows: [{ title: "Sum", summaryColumns: [{ summaryType: ej.Grid.SummaryType.Sum, displayColumn: "Freight", dataMember: "Freight", format: "{0:C2}" }] }]
-        });
-    });
-}
-
-var columns = ["Vegie-spread", "Tofuaa", "Alice Mutton", "Konbu", "Fl�temysost"]
-var itemSource: any[] = [];
-for (var i = 0; i < columns.length; i++) {
-    for (var j = 0; j < 6; j++) {
-        var value = Math.floor((Math.random() * 100) + 1);
-        itemSource.push({ ProductName: columns[i], Year: "Y" + (2011 + j), Value: value })
-    }
-}
-
-$(function () {
-    var heatmap = new ej.datavisualization.HeatMap($("#heatmap"), {
-        colorMappingCollection: [
-            { value: 0, color: "#8ec8f8", label: { text: "0" } },
-            { value: 100, color: "#0d47a1", label: { text: "100" } }
-        ],
-        isResponsive: true,
-        itemsSource: itemSource,
-        width: "100%",
-        itemsMapping: {
-            column: { propertyName: "ProductName", displayName: "Product Name" },
-            row: { propertyName: "Year", displayName: "Year" },
-            value: { propertyName: "Value" },
-            columnMapping: [
-                { "propertyName": columns[0], "displayName": columns[0] },
-                { "propertyName": columns[1], "displayName": columns[1] },
-                { "propertyName": columns[2], "displayName": columns[2] },
-                { "propertyName": columns[3], "displayName": columns[3] },
-                { "propertyName": columns[4], "displayName": columns[4] },
-                { "propertyName": columns[5], "displayName": columns[5] }
-            ],
-            headerMapping: { propertyName: "Year", displayName: "Year", columnStyle: { width: 105, textAlign: "right" } },
-        },
-        legendCollection: ["heatmap_legend"]
-    });
-    var heatmaplegend = new ej.datavisualization.HeatMapLegend($("#heatmap_legend"), {
-        colorMappingCollection: [
-            { value: 0, color: "#8ec8f8", label: { text: "0" } },
-            { value: 100, color: "#0d47a1", label: { text: "100" } }
-        ],
-        height: "50px",
-        width: "75%",
-        isResponsive: true
-    });
-});
-
-declare var window:myWindow;
-export interface myWindow extends Window{
-kanbanData:any;
-}
-module KanbanComponent {
-    $(function () {
-        var sample = new ej.Kanban($("#Kanban"), {
-            dataSource: new ej.DataManager(<any>window["kanbanData"]).executeLocal(new ej.Query().take(20)),
-            columns: [
-                { headerText: "Backlog", key: "Open" },
-                { headerText: "In Progress", key: "InProgress" },
-                { headerText: "Testing", key: "Testing" },
-                { headerText: "Done", key: "Close" }
-            ],
-            keyField: "Status",
-            allowTitle: true,
-            fields: {
-                content: "Summary",
-                primaryKey: "Id",
-                imageUrl: "ImgUrl"
-            },
-            allowSelection: false
-        });
-    });
-}
-
-module lineargaugecomponent {
-    $(function () {
-        var linearsample = new ej.datavisualization.LinearGauge($("#LinearGauge"), {
-            labelColor: "#8c8c8c", width: 500,
-            isResponsive: true, enableAnimation: false,
-            scales: [{
-                width: 4, border: { color: "transparent", width: 0 }, showBarPointers: false, showRanges: true, length: 310,
-                position: { x: 52, y: 50 }, markerPointers: [{
-                    value: 50, length: 10, width: 10, backgroundColor: "#4D4D4D", border: { color: "#4D4D4D" }
-                }],
-                labels: [{ font: { size: "11px", fontFamily: "Segoe UI", fontStyle: "bold" }, distanceFromScale: { x: -13 } }],
-                ticks: [{ type: "majorinterval", width: 1, color: "#8c8c8c" }],
-                ranges: [{
-                    endValue: 60,
-                    startValue: 0,
-                    backgroundColor: "#F6B53F",
-                    border: { color: "#F6B53F" }, startWidth: 4, endWidth: 4
-                }, {
-                        endValue: 100,
-                        startValue: 60,
-                        backgroundColor: "#E94649",
-                        border: { color: "#E94649" }, startWidth: 4, endWidth: 4
-                    }]
-            }]
-        });
-    });
-}
-
-
-
-
-
-module ListBoxComponent {
-    $(function () {
-        var listboxInstance = new ej.ListBox($("#selectcar"), {
-            showCheckbox: true
-        });
-    });
-}
-
-module ListviewComponent {
-    $(function () {
-        var listviewInstance = new ej.ListView($("#defaultlistview"), {
-            enableCheckMark: true,
-		    width: 400
-        });
-    });
-}
-
-var world_map=
-    {
-        "type": "FeatureCollection",
-        "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
-        "features": [
-            { "type": "Feature", "properties": { "admin": "Afghanistan", "name": "Afghanistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[61.21081709172573, 35.650072333309218], [62.230651483005879, 35.270663967422287], [62.984662306576588, 35.404040839167614], [63.193538445900337, 35.857165635718907], [63.982895949158696, 36.007957465146596], [64.546479119733888, 36.31207326918426], [64.746105177677393, 37.111817735333297], [65.588947788357828, 37.305216783185628], [65.745630731066811, 37.661164048812061], [66.217384881459324, 37.393790188133913], [66.518606805288655, 37.362784328758785], [67.075782098259609, 37.35614390720928], [67.829999627559502, 37.144994004864678], [68.135562371701369, 37.023115139304302], [68.859445835245921, 37.344335842430588], [69.196272820924364, 37.15114350030742], [69.518785434857946, 37.608996690413413], [70.116578403610319, 37.588222764632086], [70.270574171840124, 37.73516469985401], [70.376304152309274, 38.138395901027515], [70.806820509732873, 38.486281643216408], [71.348131137990251, 38.258905341132156], [71.239403924448155, 37.953265082341879], [71.541917759084768, 37.905774441065631], [71.448693475230229, 37.065644843080513], [71.84463829945058, 36.738171291646914], [72.193040805962383, 36.94828766534566], [72.636889682917271, 37.047558091778349], [73.260055779924983, 37.495256862938994], [73.948695916646486, 37.421566270490786], [74.980002475895404, 37.419990139305888], [75.158027785140902, 37.13303091078911], [74.575892775372964, 37.02084137628345], [74.067551710917812, 36.836175645488446], [72.920024855444453, 36.720007025696312], [71.846291945283909, 36.509942328429851], [71.262348260385735, 36.074387518857797], [71.498767938121077, 35.650563259415996], [71.613076206350698, 35.153203436822857], [71.115018751921625, 34.733125718722228], [71.156773309213449, 34.348911444632144], [70.881803012988385, 33.988855902638512], [69.93054324735958, 34.020120144175102], [70.323594191371583, 33.358532619758385], [69.687147251264847, 33.105498969041228], [69.262522007122541, 32.501944078088293], [69.317764113242546, 31.901412258424436], [68.926676873657655, 31.620189113892064], [68.556932000609308, 31.713310044882011], [67.792689243444769, 31.582930406209623], [67.683393589147457, 31.303154201781414], [66.938891229118454, 31.304911200479346], [66.38145755398601, 30.738899237586448], [66.346472609324408, 29.88794342703617], [65.046862013616092, 29.472180691031902], [64.350418735618504, 29.560030625928089], [64.148002150331237, 29.340819200145965], [63.550260858011164, 29.468330796826162], [62.549856805272775, 29.318572496044304], [60.874248488208778, 29.829238999952604], [61.78122155136343, 30.735850328081231], [61.699314406180811, 31.379506130492661], [60.941944614511115, 31.548074652628745], [60.863654819588952, 32.182919623334421], [60.536077915290761, 32.981268825811561], [60.963700392505991, 33.528832302376252], [60.528429803311575, 33.676446031217999], [60.80319339380744, 34.404101874319856], [61.21081709172573, 35.650072333309218]]] } },
-            { "type": "Feature", "properties": { "admin": "Angola", "name": "Angola", "continent": "Africa" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[16.326528354567042, -5.877470391466217], [16.573179965896141, -6.622644545115092], [16.860190870845226, -7.222297865429978], [17.089995965247166, -7.545688978712474], [17.472970004962288, -8.068551120641656], [18.134221632569048, -7.987677504104865], [18.464175652752683, -7.847014255406475], [19.016751743249664, -7.988245944860138], [19.166613396896079, -7.738183688999724], [19.417502475673214, -7.155428562044277], [20.037723016040214, -7.116361179231658], [20.091621534920616, -6.943090101756949], [20.60182295093832, -6.939317722199688], [20.514748162526526, -7.299605808138663], [21.728110792739752, -7.290872491081315], [21.74645592620336, -7.920084730667113], [21.949130893652033, -8.305900974158304], [21.80180138518795, -8.908706556842985], [21.875181919042397, -9.523707777548564], [22.208753289486417, -9.894796237836529], [22.155268182064326, -11.084801120653777], [22.402798292742428, -10.99307545333569], [22.837345411884762, -11.017621758674334], [23.456790805767461, -10.867863457892481], [23.912215203555743, -10.926826267137541], [24.017893507592614, -11.237298272347115], [23.904153680118235, -11.722281589406332], [24.079905226342895, -12.191296888887305], [23.930922072045373, -12.565847670138821], [24.0161365088947, -12.91104623784855], [21.933886346125941, -12.898437188369353], [21.887842644953871, -16.080310153876891], [22.562478468524283, -16.898451429921831], [23.215048455506086, -17.523116143465952], [21.377176141045592, -17.930636488519706], [18.956186964603628, -17.789094740472233], [18.263309360434217, -17.309950860262003], [14.209706658595049, -17.353100681225708], [14.058501417709035, -17.423380629142653], [13.462362094789963, -16.971211846588741], [12.814081251688405, -16.941342868724075], [12.21546146001938, -17.111668389558059], [11.734198846085146, -17.301889336824498], [11.640096062881609, -16.673142185129205], [11.778537224991563, -15.793816013250687], [12.123580763404444, -14.878316338767927], [12.175618930722264, -14.449143568583889], [12.500095249083014, -13.547699883684398], [12.738478631245439, -13.137905775609934], [13.312913852601834, -12.483630466362511], [13.633721144269824, -12.038644707897189], [13.738727654686924, -11.297863050993142], [13.686379428775293, -10.73107594161584], [13.38732791510216, -10.373578383020726], [13.120987583069873, -9.766897067914112], [12.875369500386567, -9.166933689005488], [12.929061313537797, -8.959091078327573], [13.23643273280987, -8.56262948978434], [12.933040398824314, -7.596538588087752], [12.728298374083916, -6.927122084178803], [12.227347039446441, -6.294447523629372], [12.322431674863562, -6.100092461779651], [12.735171339578695, -5.965682061388476], [13.024869419006988, -5.984388929878106], [13.375597364971892, -5.864241224799555], [16.326528354567042, -5.877470391466217]]], [[[12.436688266660919, -5.684303887559223], [12.182336866920277, -5.789930515163801], [11.914963006242115, -5.037986748884733], [12.318607618873923, -4.606230157086158], [12.620759718484548, -4.438023369976121], [12.995517205465202, -4.781103203961918], [12.631611769265842, -4.991271254092935], [12.468004184629759, -5.248361504744991], [12.436688266660919, -5.684303887559223]]]] } },
-            { "type": "Feature", "properties": { "admin": "Albania", "name": "Albania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.590247430104906, 41.855404161133592], [20.463175083099195, 41.515089016275333], [20.605181919037356, 41.086226304685219], [21.020040317476397, 40.842726955725873], [20.99998986174722, 40.580003973953964], [20.67499677906363, 40.43499990494302], [20.61500044117275, 40.110006822259365], [20.150015903410516, 39.624997666983965], [19.980000441170144, 39.694993394523401], [19.9600016618732, 39.915005805006039], [19.40608198413673, 40.250773423822459], [19.319058872157139, 40.727230129553554], [19.403549838954287, 41.409565741535445], [19.540027296637099, 41.71998607031275], [19.371768833094958, 41.87754751237064], [19.304486118250786, 42.195745144207812], [19.738051385179627, 42.688247382165564], [19.801613396898681, 42.500093492190835], [20.0707, 42.58863], [20.28375451018189, 42.320259507815074], [20.52295, 42.21787], [20.590247430104906, 41.855404161133592]]] } },
-            { "type": "Feature", "properties": { "admin": "United Arab Emirates", "name": "United Arab Emirates", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[51.579518670463258, 24.245497137951102], [51.757440626844172, 24.294072984305462], [51.794389275932865, 24.019826158132499], [52.577080519425593, 24.177439276622703], [53.404006788960139, 24.151316840099167], [54.008000929587574, 24.121757920828212], [54.693023716048614, 24.797892360935084], [55.439024692614126, 25.439145209244934], [56.070820753814544, 26.055464178973978], [56.261041701080948, 25.714606431576762], [56.396847365143991, 24.924732163995483], [55.886232537667993, 24.92083059335744], [55.804118686756212, 24.269604193615258], [55.981213820220454, 24.130542914317822], [55.528631626208231, 23.933604030853498], [55.525841098864461, 23.524869289640929], [55.234489373602869, 23.110992743415316], [55.208341098863187, 22.708329982997039], [55.006803012924898, 22.496947536707129], [52.000733270074321, 23.001154486578937], [51.617707553926969, 24.014219265228824], [51.579518670463258, 24.245497137951102]]] } },
-            { "type": "Feature", "properties": { "admin": "Argentina", "name": "Argentina", "continent": "South America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-65.5, -55.2], [-66.45, -55.25], [-66.95992, -54.89681], [-67.56244, -54.87001], [-68.63335, -54.8695], [-68.634010227583147, -52.636370458874453], [-68.25, -53.1], [-67.75, -53.85], [-66.45, -54.45], [-65.05, -54.7], [-65.5, -55.2]]], [[[-64.964892137294569, -22.075861504812348], [-64.377021043542257, -22.79809132252354], [-63.986838141522462, -21.993644301035953], [-62.84646847192154, -22.034985446869452], [-62.685057135657885, -22.249029229422401], [-60.846564704009928, -23.880712579038299], [-60.028966030503973, -24.032796319273238], [-58.807128465394939, -24.771459242453268], [-57.777217169817952, -25.162339776309032], [-57.633660040911124, -25.603656508081666], [-58.618173590719707, -27.123718763947117], [-57.609759690976134, -27.395898532828419], [-56.486701626192989, -27.548499037386243], [-55.695845506398186, -27.387837009390815], [-54.788794928595038, -26.621785577096087], [-54.625290696823541, -25.739255466415479], [-54.130049607954412, -25.547639255477243], [-53.628348965048716, -26.12486500417743], [-53.648735317587885, -26.923472588816104], [-54.490725267135517, -27.474756768505767], [-55.162286342984586, -27.881915378533414], [-56.290899624239088, -28.852760512000849], [-57.62513342958291, -30.21629485445424], [-57.874937303281897, -31.016556084926158], [-58.14244035504074, -32.044503676076182], [-58.132647671121404, -33.040566908502008], [-58.349611172098818, -33.263188978815428], [-58.427074144104367, -33.909454441057541], [-58.495442064026541, -34.4314897600701], [-57.225829637263629, -35.288026625307886], [-57.362358771378737, -35.977390232081497], [-56.737487352105447, -36.413125909166574], [-56.788285285048339, -36.901571547189327], [-57.749156867083421, -38.183870538079901], [-59.231857062401865, -38.720220228837199], [-61.2374452378656, -38.92842457454114], [-62.335956997310134, -38.827707208004362], [-62.125763108962914, -39.424104913084868], [-62.33053097191943, -40.172586358400316], [-62.145994432205228, -40.676896661136723], [-62.74580278181697, -41.028761488612083], [-63.770494757732514, -41.166789239263657], [-64.732089809819698, -40.802677097335128], [-65.118035244391578, -41.064314874028874], [-64.97856055363583, -42.058000990569312], [-64.303407965742466, -42.359016208669495], [-63.755947842042339, -42.043686618824495], [-63.458059048095883, -42.563138116222355], [-64.378803880456289, -42.873558444999638], [-65.181803961839691, -43.495380954767782], [-65.328823411710133, -44.501366062193689], [-65.565268927661592, -45.03678557716978], [-66.509965786389344, -45.039627780945843], [-67.293793911392427, -45.551896254255183], [-67.580546434180079, -46.301772963242527], [-66.597066413017259, -47.033924655953804], [-65.641026577401433, -47.23613453551188], [-65.98508826360073, -48.133289076531128], [-67.166178961847649, -48.697337334996931], [-67.816087612566449, -49.869668877970412], [-68.728745083273154, -50.26421843851886], [-69.138539191347789, -50.732510267947788], [-68.815561489523517, -51.771104011594097], [-68.149994879820397, -52.349983406127699], [-68.571545376241332, -52.299443855346247], [-69.498362189396076, -52.142760912637236], [-71.914803839796321, -52.009022305865912], [-72.329403856074023, -51.425956312872394], [-72.309973517532342, -50.677009779666342], [-72.975746832964617, -50.741450290734299], [-73.328050910114456, -50.378785088909865], [-73.415435757120022, -49.318436374712952], [-72.648247443314929, -48.878618259476774], [-72.331160854771937, -48.244238376661819], [-72.44735531278026, -47.738532810253517], [-71.917258470330196, -46.884838148791786], [-71.552009446891233, -45.560732924177117], [-71.659315558545316, -44.973688653341434], [-71.222778896759721, -44.784242852559409], [-71.329800788036195, -44.407521661151677], [-71.793622606071935, -44.207172133156099], [-71.464056159130493, -43.787611179378324], [-71.915423956983901, -43.408564548517404], [-72.148898078078517, -42.254888197601375], [-71.746803758415453, -42.051386407235988], [-71.915734015577542, -40.832339369470716], [-71.680761277946445, -39.808164157878061], [-71.413516608349042, -38.916022230791107], [-70.814664272734703, -38.552995293940732], [-71.118625047475419, -37.576827487947192], [-71.121880662709771, -36.65812387466233], [-70.364769253201658, -36.005088799789931], [-70.388049485949082, -35.169687595359441], [-69.817309129501453, -34.193571465798279], [-69.814776984319209, -33.273886000299839], [-70.074399380153622, -33.09120981214803], [-70.535068935819439, -31.365010267870279], [-69.919008348251921, -30.336339206668306], [-70.013550381129861, -29.367922865518544], [-69.656130337183143, -28.459141127233686], [-69.001234910748266, -27.521213881136127], [-68.295541551370391, -26.899339694935787], [-68.594799770772667, -26.50690886811126], [-68.386001146097342, -26.185016371365229], [-68.417652960876111, -24.518554782816874], [-67.328442959244128, -24.025303236590908], [-66.985233934177629, -22.986348565362825], [-67.106673550063604, -22.735924574476392], [-66.273339402924833, -21.832310479420677], [-64.964892137294569, -22.075861504812348]]]] } },
-            { "type": "Feature", "properties": { "admin": "Armenia", "name": "Armenia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[43.582745802592726, 41.09214325618256], [44.972480096218071, 41.248128567055588], [45.179495883979335, 40.985353908851401], [45.560351189970433, 40.812289537105919], [45.359174839058156, 40.561503811193447], [45.891907179555076, 40.218475653639992], [45.610012241402913, 39.899993801425175], [46.034534132680662, 39.628020738273058], [46.483498976432443, 39.464154771475528], [46.505719842317966, 38.770605373686287], [46.143623081248812, 38.74120148371221], [45.735379266143006, 39.319719143219736], [45.739978468616975, 39.473999131827114], [45.298144972521456, 39.471751207022422], [45.00198733905674, 39.740003567049548], [44.793989699081934, 39.713002631177041], [44.400008579288695, 40.005000311842267], [43.656436395040934, 40.253563951166178], [43.752657911968399, 40.740200914058754], [43.582745802592726, 41.09214325618256]]] } },
-            { "type": "Feature", "properties": { "admin": "French Southern and Antarctic Lands", "name": "Fr. S. Antarctic Lands", "continent": "Seven seas (open ocean)" }, "geometry": { "type": "Polygon", "coordinates": [[[68.935, -48.625], [69.58, -48.94], [70.525, -49.065], [70.56, -49.255], [70.28, -49.71], [68.745, -49.775], [68.72, -49.2425], [68.8675, -48.83], [68.935, -48.625]]] } },
-            { "type": "Feature", "properties": { "admin": "Australia", "name": "Australia", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[145.397978143494782, -40.792548516605883], [146.364120721623692, -41.137695407883335], [146.908583612250823, -41.000546156580668], [147.689259474884125, -40.808258152022681], [148.289067824495987, -40.875437514002122], [148.359864536735785, -42.062445163746439], [148.017301467073082, -42.40702361426861], [147.914051955353784, -43.211522312188485], [147.564564243763982, -42.937688897473855], [146.87034305235494, -43.634597263362082], [146.663327264593647, -43.580853773778543], [146.048377720320389, -43.54974456153888], [145.431929559510536, -42.693776137056268], [145.295090366801674, -42.03360971452755], [144.7180713238306, -41.162551771815707], [144.743754510679622, -40.703975111657705], [145.397978143494782, -40.792548516605883]]], [[[143.561811151299935, -13.763655694232209], [143.922099237238882, -14.548310642152], [144.563713820574804, -14.171176039285879], [144.894908075133515, -14.594457696188622], [145.374723748963419, -14.984976495018284], [145.271991001567244, -15.428205254785691], [145.48525963763575, -16.285672295804769], [145.637033319276952, -16.784918308176611], [145.888904250267672, -16.906926364817647], [146.160308872664473, -17.76165455492524], [146.063673944278662, -18.280072523677315], [146.387478469019584, -18.958274021075905], [147.471081577747896, -19.480722751546676], [148.177601760042478, -19.955939222902767], [148.848413527623222, -20.391209812097252], [148.717465448195583, -20.633468926681513], [149.289420200802056, -21.260510756111096], [149.678337030230637, -22.342511895438388], [150.07738244038859, -22.122783705333315], [150.482939081015161, -22.556142266533012], [150.727265252891158, -22.402404880464655], [150.899554478152254, -23.462236830338679], [151.609175246384211, -24.076256198830755], [152.07353966695905, -24.45788665130619], [152.855197381805908, -25.267501316023008], [153.136162144176751, -26.071173191026187], [153.161948683890358, -26.641319268502439], [153.09290897034856, -27.260299574494503], [153.569469028944184, -28.110066827102099], [153.512108189100218, -28.995077406532751], [153.339095493787056, -29.458201592732443], [153.069241164358857, -30.350240166954809], [153.089601678681788, -30.923641859665445], [152.891577590139377, -31.640445651985949], [152.450002476205327, -32.550002536755237], [151.709117466436766, -33.041342054986337], [151.343971795862387, -33.816023451473846], [151.010555454715103, -34.310360202777879], [150.714139439089024, -35.173459974916803], [150.328219842733233, -35.671879164371923], [150.075212030232251, -36.420205580390508], [149.946124302367139, -37.109052422841224], [149.997283970336127, -37.425260512035123], [149.423882277625523, -37.772681166333463], [148.304622430615893, -37.809061374666875], [147.38173302631526, -38.219217217767543], [146.922122837511324, -38.606532077795116], [146.317921991154776, -39.035756524411433], [145.489652134380549, -38.593767999019043], [144.876976353128157, -38.41744801203911], [145.032212355732952, -37.896187839510972], [144.485682407814011, -38.085323581699257], [143.609973586196077, -38.809465427405321], [142.745426873952965, -38.538267510737519], [142.17832970598198, -38.380034275059835], [141.606581659104677, -38.308514092767872], [140.638578729413211, -38.019332777662541], [139.992158237874321, -37.402936293285094], [139.806588169514043, -36.643602797188272], [139.574147577065219, -36.138362318670666], [139.082808058834075, -35.732754001611774], [138.120747918856296, -35.612296237939397], [138.449461704664998, -35.127261244447887], [138.207564325106659, -34.384722588845925], [137.719170363516128, -35.07682504653102], [136.829405552314711, -35.260534763328614], [137.352371047108477, -34.707338555644093], [137.503886346588331, -34.130267836240769], [137.890116001537649, -33.640478610978327], [137.810327590079112, -32.900007012668105], [136.996837192940347, -33.752771498348629], [136.372069126531642, -34.094766127256186], [135.98904341038434, -34.89011809666048], [135.208212518454104, -34.478670342752601], [135.239218377829161, -33.947953383114971], [134.613416782774607, -33.222778008763136], [134.085903761939107, -32.848072198214759], [134.273902622617015, -32.617233575166949], [132.990776808809812, -32.011224053680188], [132.288080682504869, -31.982646986622761], [131.326330601120901, -31.495803318001041], [129.535793898639668, -31.590422865527476], [128.240937534702198, -31.948488864877849], [127.102867466338282, -32.282266941051041], [126.148713820501129, -32.2159660784206], [125.088623488465586, -32.728751316052829], [124.22164798390493, -32.959486586236061], [124.028946567888511, -33.483847344701708], [123.65966678273071, -33.890179131812722], [122.811036411633609, -33.914467054989835], [122.18306440642283, -34.003402194964217], [121.299190708502579, -33.821036065406126], [120.580268182458113, -33.930176690406618], [119.893695103028222, -33.976065362281808], [119.298899367348781, -34.50936614353396], [119.007340936357977, -34.464149265278529], [118.505717808100769, -34.746819349915093], [118.024971958489516, -35.064732761374707], [117.295507440257438, -35.025458672832862], [116.62510908413492, -35.025096937806829], [115.564346958479689, -34.386427911111547], [115.026808709779516, -34.196517022438918], [115.048616164206763, -33.623425388322026], [115.545123325667078, -33.487257989232951], [115.714673700016661, -33.259571628554944], [115.679378696761376, -32.900368747694124], [115.801645135563959, -32.205062351207026], [115.689610630355105, -31.612437025683782], [115.160909051576937, -30.601594333622455], [114.99704308477942, -30.030724786094162], [115.040037876446249, -29.461095472940794], [114.64197431850198, -28.810230808224706], [114.61649783738217, -28.516398614213042], [114.173579136208446, -28.118076674107321], [114.048883905088132, -27.33476531342712], [113.477497593236876, -26.543134047147898], [113.338953078262477, -26.116545098578477], [113.77835778204026, -26.549025160429174], [113.440962355606587, -25.621278171493152], [113.936901076311642, -25.911234633082877], [114.232852004047288, -26.298446140245868], [114.216160516417006, -25.786281019801105], [113.721255324357685, -24.998938897402123], [113.625343866024025, -24.683971042583146], [113.393523390762667, -24.384764499613262], [113.502043898575607, -23.80635019297025], [113.706992629045146, -23.56021534596406], [113.843418410295669, -23.059987481378734], [113.736551548316072, -22.475475355725372], [114.149756300921865, -21.755881036061009], [114.225307244932651, -22.51748829517863], [114.64776207891866, -21.829519952076904], [115.460167270979298, -21.495173435148541], [115.94737267462699, -21.068687839443708], [116.711615431791529, -20.701681817306817], [117.166316359527684, -20.623598728113802], [117.441545037914238, -20.746898695562162], [118.229558953932951, -20.374208265873232], [118.836085239742701, -20.263310642174822], [118.987807244951753, -20.044202569257319], [119.252493931150624, -19.952941989829835], [119.805225050944543, -19.976506442954978], [120.856220330896633, -19.683707777589188], [121.399856398607199, -19.239755547769729], [121.655137974129062, -18.70531788500713], [122.241665480641757, -18.197648614171765], [122.286623976735655, -17.798603204013911], [122.312772251475408, -17.254967136303446], [123.012574497571904, -16.405199883695854], [123.433789097183009, -17.268558037996225], [123.859344517106592, -17.069035332917249], [123.503242222183232, -16.596506036040363], [123.817073195491915, -16.11131601325199], [124.258286574399847, -16.32794361741956], [124.379726190285794, -15.567059828353973], [124.926152785340022, -15.07510019293532], [125.167275018413875, -14.680395603090004], [125.670086704613823, -14.510070082256018], [125.685796340030493, -14.230655612853834], [126.125149367376096, -14.347340996968949], [126.142822707219864, -14.095986830301211], [126.582589146023736, -13.95279143642041], [127.065867140817332, -13.817967624570922], [127.804633416861932, -14.276906019755042], [128.359689976108939, -14.869169610252253], [128.985543247595899, -14.875990899314738], [129.621473423379598, -14.969783623924553], [129.409600050982988, -14.420669854391031], [129.888640578328591, -13.618703301653481], [130.339465773642928, -13.357375583553473], [130.183506300985982, -13.107520033422301], [130.617795037966971, -12.536392103732464], [131.223494500859999, -12.183648776908113], [131.73509118054946, -12.302452894747159], [132.575298293183096, -12.114040622611013], [132.557211541881031, -11.603012383676683], [131.824698114143644, -11.273781833545097], [132.357223748911395, -11.128519382372641], [133.019560581596409, -11.376411228076844], [133.550845981989028, -11.786515394745134], [134.393068475481982, -12.042365411022173], [134.678632440327021, -11.9411829565947], [135.298491245667975, -12.248606052299051], [135.882693312727611, -11.962266940969796], [136.258380975489445, -12.049341729381606], [136.492475213771627, -11.857208754120389], [136.951620314684988, -12.351958916882735], [136.685124953355739, -12.887223402562054], [136.305406528875096, -13.291229750219895], [135.961758254134111, -13.324509372615889], [136.077616815332533, -13.72427825282578], [135.783836297753226, -14.223989353088211], [135.4286641786112, -14.715432224183896], [135.500184360903177, -14.997740573794427], [136.295174595281367, -15.550264987859121], [137.065360142159477, -15.870762220933353], [137.580470819244795, -16.215082289294084], [138.303217401278971, -16.807604261952658], [138.58516401586337, -16.806622409739173], [139.108542922115475, -17.062679131745366], [139.260574985918197, -17.371600843986183], [140.215245396078274, -17.710804945550063], [140.875463495039241, -17.36906869880394], [141.071110467696258, -16.832047214426719], [141.274095493738798, -16.388870131091604], [141.398222284103781, -15.840531508042584], [141.702183058844611, -15.044921156476928], [141.563380161708665, -14.561333103089506], [141.635520461188094, -14.270394789286284], [141.519868605718955, -13.698078301653805], [141.650920038011009, -12.944687595270562], [141.842691278246207, -12.741547539931187], [141.68699018775078, -12.407614434461134], [141.928629185147543, -11.877465915578778], [142.118488397387978, -11.328042087451619], [142.14370649634634, -11.04273650476814], [142.51526004452495, -10.668185723516642], [142.797310011974048, -11.157354831591515], [142.866763136974271, -11.784706719614929], [143.11594689348567, -11.90562957117791], [143.158631626558758, -12.325655612846187], [143.522123651299864, -12.834358412327429], [143.597157830987669, -13.400422051652594], [143.561811151299935, -13.763655694232209]]]] } },
-            { "type": "Feature", "properties": { "admin": "Austria", "name": "Austria", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.979666782304033, 48.123497015976298], [16.903754103267257, 47.714865627628321], [16.340584344150411, 47.712901923201215], [16.534267612380372, 47.496170966169103], [16.202298211337361, 46.852385972676949], [16.011663852612653, 46.683610744811688], [15.137091912504982, 46.658702704447016], [14.632471551174827, 46.431817328469535], [13.806475457421524, 46.509306138691201], [12.376485223040813, 46.767559109069843], [12.153088006243051, 47.115393174826437], [11.164827915093268, 46.941579494812721], [11.048555942436533, 46.751358547546324], [10.442701450246627, 46.893546250997424], [9.932448357796657, 46.920728054382948], [9.479969516649019, 47.102809963563367], [9.632931756232974, 47.347601223329974], [9.594226108446346, 47.525058091820256], [9.896068149463188, 47.58019684507569], [10.402083774465209, 47.302487697939156], [10.544504021861625, 47.566399237653762], [11.426414015354736, 47.523766181012967], [12.141357456112784, 47.703083401065761], [12.620759718484491, 47.672387600284395], [12.932626987365945, 47.467645575543983], [13.025851271220487, 47.637583523135824], [12.884102817443901, 48.289145819687903], [13.243357374736998, 48.41611481382904], [13.595945672264433, 48.877171942737135], [14.33889773932472, 48.555305284207193], [14.901447381254055, 48.964401760445817], [15.253415561593979, 49.039074205107575], [16.029647251050218, 48.733899034207916], [16.49928266771877, 48.785808010445095], [16.960288120194573, 48.596982326850593], [16.879982944412998, 48.470013332709463], [16.979666782304033, 48.123497015976298]]] } },
-            { "type": "Feature", "properties": { "admin": "Azerbaijan", "name": "Azerbaijan", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[45.001987339056789, 39.740003567049591], [45.298144972521435, 39.471751207022422], [45.739978468616997, 39.473999131827149], [45.735379266143092, 39.319719143219785], [46.143623081248812, 38.74120148371221], [45.457721795438729, 38.874139105783108], [44.952688022650264, 39.33576467544642], [44.79398969908199, 39.713002631177027], [45.001987339056789, 39.740003567049591]]], [[[47.373315464066216, 41.219732367511249], [47.81566572448471, 41.151416124021338], [47.987283156126033, 41.405819200194223], [48.584352654826283, 41.808869533854669], [49.110263706260653, 41.282286688800518], [49.618914829309588, 40.572924302729966], [50.084829542853093, 40.526157131505776], [50.392821079312704, 40.256561184239096], [49.569202101444795, 40.176100979160701], [49.395259230350419, 39.39948171646224], [49.2232283872507, 39.04921885838791], [48.856532423707584, 38.815486355131775], [48.883249139202533, 38.320245266262638], [48.634375441284831, 38.270377509100925], [48.010744256386502, 38.794014797514528], [48.355529412637928, 39.288764960276886], [48.060095249225256, 39.582235419262439], [47.685079380083117, 39.508363959301185], [46.505719842317966, 38.770605373686251], [46.483498976432443, 39.464154771475528], [46.034534132680697, 39.628020738273044], [45.610012241402913, 39.899993801425175], [45.891907179555133, 40.21847565363997], [45.359174839058156, 40.561503811193482], [45.560351189970469, 40.812289537105947], [45.179495883979392, 40.98535390885143], [44.972480096218156, 41.248128567055623], [45.217426385281634, 41.411451931314041], [45.962600538930438, 41.123872585609789], [46.501637404166978, 41.064444688474104], [46.637908156120567, 41.181672675128219], [46.145431756378983, 41.72280243587263], [46.404950799348818, 41.860675157227341], [46.686070591016652, 41.827137152669899], [47.373315464066216, 41.219732367511249]]]] } },
-            { "type": "Feature", "properties": { "admin": "Burundi", "name": "Burundi", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[29.339997592900342, -4.499983412294092], [29.276383904749046, -3.293907159034063], [29.02492638521678, -2.839257907730157], [29.632176141078585, -2.917857761246096], [29.938359002407935, -2.348486830254238], [30.469696079232978, -2.413857517103458], [30.527677036264457, -2.807631931167534], [30.743012729624692, -3.034284763199686], [30.752262811004943, -3.359329522315569], [30.505559523243559, -3.568567396665364], [30.116332635221166, -4.090137627787242], [29.753512404099919, -4.45238941815328], [29.339997592900342, -4.499983412294092]]] } },
-            { "type": "Feature", "properties": { "admin": "Belgium", "name": "Belgium", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[3.314971144228536, 51.345780951536071], [4.047071160507527, 51.267258612668556], [4.973991326526913, 51.475023708698124], [5.60697594567, 51.037298488969768], [6.156658155958779, 50.803721015010574], [6.043073357781109, 50.128051662794221], [5.782417433300905, 50.090327867221205], [5.674051954784828, 49.52948354755749], [4.799221632515809, 49.985373033236371], [4.286022983425084, 49.90749664977254], [3.588184441755685, 50.378992418003563], [3.123251580425801, 50.780363267614561], [2.658422071960274, 50.796848049515731], [2.513573032246142, 51.148506171261815], [3.314971144228536, 51.345780951536071]]] } },
-            { "type": "Feature", "properties": { "admin": "Benin", "name": "Benin", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[2.691701694356254, 6.258817246928628], [1.865240512712318, 6.14215770102973], [1.618950636409238, 6.832038072126236], [1.664477573258381, 9.128590399609378], [1.46304284018467, 9.334624335157086], [1.425060662450136, 9.825395412632998], [1.077795037448737, 10.175606594275022], [0.772335646171484, 10.470808213742357], [0.899563022474069, 10.997339382364258], [1.243469679376488, 11.11051076908346], [1.447178175471066, 11.547719224488857], [1.93598554851988, 11.641150214072551], [2.154473504249921, 11.940150051313337], [2.49016360841793, 12.233052069543671], [2.84864301922667, 12.235635891158266], [3.611180454125558, 11.660167141155966], [3.572216424177469, 11.327939357951516], [3.797112257511713, 10.734745591673104], [3.600070021182801, 10.332186184119406], [3.705438266625918, 10.063210354040207], [3.220351596702101, 9.4441525333997], [2.912308383810255, 9.13760793704432], [2.723792758809509, 8.506845404489708], [2.74906253420022, 7.870734361192886], [2.691701694356254, 6.258817246928628]]] } },
-            { "type": "Feature", "properties": { "admin": "Burkina Faso", "name": "Burkina Faso", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-2.827496303712706, 9.642460842319775], [-3.511898972986272, 9.900326239456216], [-3.980449184576684, 9.862344061721698], [-4.330246954760383, 9.610834865757139], [-4.779883592131966, 9.821984768101741], [-4.954653286143098, 10.152713934769732], [-5.404341599946973, 10.370736802609144], [-5.470564947929004, 10.951269842976044], [-5.197842576508648, 11.375145778850136], [-5.220941941743119, 11.713858954307224], [-4.427166103523802, 12.542645575404292], [-4.280405035814879, 13.228443508349738], [-4.006390753587225, 13.472485459848112], [-3.52280270019986, 13.337661647998612], [-3.103706834312759, 13.54126679122859], [-2.967694464520576, 13.798150336151506], [-2.191824510090384, 14.246417548067352], [-2.001035122068771, 14.559008287000887], [-1.066363491205663, 14.973815009007764], [-0.515854458000348, 15.116157741755725], [-0.26625729003058, 14.924308986872147], [0.374892205414682, 14.928908189346128], [0.295646396495101, 14.444234930880651], [0.429927605805517, 13.988733018443922], [0.993045688490071, 13.335749620003821], [1.024103224297477, 12.851825669806573], [2.177107781593775, 12.625017808477532], [2.154473504249921, 11.940150051313337], [1.93598554851988, 11.641150214072551], [1.447178175471066, 11.547719224488857], [1.243469679376488, 11.11051076908346], [0.899563022474069, 10.997339382364258], [0.023802524423701, 11.018681748900802], [-0.438701544588582, 11.09834096927872], [-0.761575893548183, 10.936929633015053], [-1.203357713211431, 11.009819240762736], [-2.94040930827046, 10.962690334512557], [-2.963896246747111, 10.395334784380081], [-2.827496303712706, 9.642460842319775]]] } },
-            { "type": "Feature", "properties": { "admin": "Bangladesh", "name": "Bangladesh", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[92.672720981825549, 22.041238918541247], [92.652257114637976, 21.324047552978481], [92.30323449093865, 21.475485337809815], [92.368553501355606, 20.670883287025344], [92.082886183646124, 21.192195135985767], [92.025215285208361, 21.701569729086764], [91.834890985077408, 22.182935695885561], [91.417087029997646, 22.765019029221218], [90.496006300827247, 22.805016587815125], [90.586956821660948, 22.392793687422863], [90.272970819055544, 21.836367702720107], [89.847467075564268, 22.039146023033421], [89.70204959509492, 21.857115790285299], [89.41886274613546, 21.966178900637296], [89.031961297566198, 22.055708319582973], [88.876311883503064, 22.879146429937826], [88.529769728553759, 23.631141872649163], [88.699940220090895, 24.233714911388557], [88.084422235062405, 24.501657212821918], [88.30637251175601, 24.866079413344199], [88.931553989623069, 25.238692328384769], [88.209789259802477, 25.768065700782707], [88.56304935094974, 26.446525580342716], [89.355094028687276, 26.014407253518065], [89.832480910199592, 25.965082098895476], [89.920692580121838, 25.269749864192171], [90.872210727912105, 25.13260061288954], [91.799595981822065, 25.14743174895731], [92.376201613334786, 24.976692816664961], [91.915092807994398, 24.130413723237108], [91.467729933643668, 24.072639471934789], [91.158963250699713, 23.503526923104381], [91.706475050832083, 22.985263983649183], [91.869927606171302, 23.62434642180278], [92.146034783906799, 23.62749868417259], [92.672720981825549, 22.041238918541247]]] } },
-            { "type": "Feature", "properties": { "admin": "Bulgaria", "name": "Bulgaria", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.657149692482985, 44.234923000661276], [22.94483239105184, 43.823785305347123], [23.332302280376322, 43.897010809904707], [24.100679152124169, 43.741051337247846], [25.569271681426923, 43.688444729174712], [26.065158725699739, 43.943493760751259], [27.242399529740904, 44.175986029632398], [27.970107049275068, 43.812468166675202], [28.55808149589199, 43.707461656258118], [28.039095086384712, 43.293171698574177], [27.673897739378042, 42.577892361006214], [27.996720411905383, 42.007358710287775], [27.135739373490473, 42.141484890301335], [26.117041863720793, 41.826904608724554], [26.106138136507205, 41.328898830727766], [25.197201368925441, 41.234485988930523], [24.492644891058031, 41.583896185872028], [23.692073601992345, 41.309080918943842], [22.952377150166445, 41.337993882811141], [22.881373732197424, 41.999297186850242], [22.380525750424585, 42.320259507815081], [22.545011834409614, 42.461362006188025], [22.436594679461273, 42.580321153323929], [22.604801466571324, 42.898518785161137], [22.986018507588479, 43.211161200526959], [22.500156691180276, 43.642814439460977], [22.410446404721593, 44.008063462899948], [22.657149692482985, 44.234923000661276]]] } },
-            { "type": "Feature", "properties": { "admin": "The Bahamas", "name": "Bahamas", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-77.53466, 23.75975], [-77.78, 23.71], [-78.03405, 24.28615], [-78.40848, 24.57564], [-78.19087, 25.2103], [-77.89, 25.17], [-77.54, 24.34], [-77.53466, 23.75975]]], [[[-77.82, 26.58], [-78.91, 26.42], [-78.98, 26.79], [-78.51, 26.87], [-77.85, 26.84], [-77.82, 26.58]]], [[[-77.0, 26.59], [-77.17255, 25.87918], [-77.35641, 26.00735], [-77.34, 26.53], [-77.78802, 26.92516], [-77.79, 27.04], [-77.0, 26.59]]]] } },
-            { "type": "Feature", "properties": { "admin": "Bosnia and Herzegovina", "name": "Bosnia and Herz.", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[19.005486281010118, 44.860233669609144], [19.36803, 44.863], [19.11761, 44.42307], [19.59976, 44.03847], [19.454, 43.568100000000115], [19.21852, 43.52384], [19.03165, 43.43253], [18.70648, 43.20011], [18.56, 42.65], [17.674921502358981, 43.028562527023603], [17.297373488034449, 43.446340643887353], [16.916156447017325, 43.667722479825663], [16.456442905348862, 44.041239732431265], [16.239660271884528, 44.351143296885695], [15.750026075918978, 44.81871165626255], [15.959367303133373, 45.233776760430935], [16.318156772535868, 45.004126695325901], [16.534939406000202, 45.211607570977705], [17.00214603035101, 45.233776760430935], [17.861783481526398, 45.067740383477137], [18.553214145591646, 45.08158966733145], [19.005486281010118, 44.860233669609144]]] } },
-            { "type": "Feature", "properties": { "admin": "Belarus", "name": "Belarus", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[23.484127638449841, 53.912497667041123], [24.45068362803703, 53.905702216194747], [25.536353794056989, 54.282423407602515], [25.768432651479792, 54.846962592175082], [26.588279249790386, 55.167175604871659], [26.494331495883749, 55.61510691997762], [27.102459751094525, 55.783313707087672], [28.17670942557799, 56.169129950578807], [29.2295133806603, 55.918344224666356], [29.371571893030669, 55.67009064393617], [29.896294386522353, 55.789463202530406], [30.87390913262, 55.550976467503396], [30.971835971813132, 55.081547756564028], [30.75753380709871, 54.811770941784303], [31.384472283663733, 54.157056382862422], [31.791424187962232, 53.974638576872117], [31.731272820774503, 53.794029446012011], [32.405598585751157, 53.618045355842028], [32.693643019346034, 53.351420803432106], [32.304519484188226, 53.132726141972903], [31.497643670382924, 53.167426866256889], [31.30520063652801, 53.073995876673195], [31.540018344862254, 52.742052313846344], [31.78599816257158, 52.10167796488544], [30.927549269338975, 52.042353420614383], [30.619454380014837, 51.822806098022362], [30.55511722181145, 51.319503485715643], [30.157363722460889, 51.416138414101454], [29.254938185347921, 51.368234361366881], [28.992835320763522, 51.602044379271462], [28.617612745892242, 51.427713934934836], [28.241615024536564, 51.572227077839059], [27.454066196408426, 51.59230337178446], [26.337958611768549, 51.832288723347915], [25.327787713327005, 51.910656032918538], [24.553106316839511, 51.888461005249177], [24.005077752384206, 51.617443956094448], [23.52707075368437, 51.578454087930233], [23.508002150168689, 52.023646552124717], [23.19949384938618, 52.486977444053664], [23.799198846133375, 52.691099351606553], [23.804934930117774, 53.08973135030606], [23.527535841574995, 53.47012156840654], [23.484127638449841, 53.912497667041123]]] } },
-            { "type": "Feature", "properties": { "admin": "Belize", "name": "Belize", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-89.143080410503302, 17.808318996649316], [-89.150909389995519, 17.955467637600414], [-89.029857347351808, 18.001511338772485], [-88.848343878926585, 17.883198147040229], [-88.490122850279334, 18.486830552641603], [-88.300031094093669, 18.499982204659897], [-88.296336229184803, 18.353272813383263], [-88.106812913754368, 18.348673610909284], [-88.123478563168476, 18.076674709541003], [-88.285354987322776, 17.644142971258031], [-88.197866787452625, 17.489475409408453], [-88.302640753924422, 17.13169363043566], [-88.239517991879893, 17.036066392479551], [-88.355428229510551, 16.530774237529624], [-88.551824510435821, 16.265467434143144], [-88.732433641295927, 16.233634751851351], [-88.930612759135244, 15.887273464415072], [-89.229121670269265, 15.886937567605166], [-89.15080603713092, 17.015576687075832], [-89.143080410503302, 17.808318996649316]]] } },
-            { "type": "Feature", "properties": { "admin": "Bolivia", "name": "Bolivia", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-62.84646847192154, -22.034985446869442], [-63.986838141522462, -21.993644301035946], [-64.377021043542243, -22.798091322523533], [-64.964892137294598, -22.07586150481232], [-66.273339402924833, -21.832310479420713], [-67.10667355006359, -22.735924574476414], [-67.82817989772272, -22.872918796482171], [-68.219913092711266, -21.494346612231858], [-68.757167121033731, -20.372657972904459], [-68.442225104430904, -19.405068454671426], [-68.966818406841853, -18.9816834449041], [-69.100246955019472, -18.260125420812674], [-69.590423753524036, -17.580011895419329], [-68.959635382753291, -16.500697930571267], [-69.389764166934697, -15.66012908291165], [-69.160346645774936, -15.323973890853015], [-69.339534674747, -14.953195489158828], [-68.94888668483658, -14.45363941819328], [-68.929223802349526, -13.602683607643007], [-68.880079515239956, -12.89972909917665], [-68.665079718689611, -12.561300144097171], [-69.52967810736493, -10.951734307502193], [-68.786157599549469, -11.036380303596276], [-68.27125362819325, -11.014521172736817], [-68.048192308205373, -10.712059014532484], [-67.173801235610725, -10.30681243249961], [-66.646908331962791, -9.931331475466861], [-65.33843522811641, -9.76198780684639], [-65.444837002205375, -10.51145110437543], [-65.321898769783004, -10.895872084194675], [-65.402281460213018, -11.566270440317151], [-64.31635291203159, -12.461978041232191], [-63.196498786050562, -12.627032565972433], [-62.803060268796372, -13.000653171442682], [-62.127080857986371, -13.19878061284972], [-61.713204311760769, -13.489202162330049], [-61.084121263255646, -13.479383640194595], [-60.503304002511122, -13.775954685117656], [-60.459198167550014, -14.354007256734551], [-60.264326341377355, -14.645979099183638], [-60.251148851142922, -15.077218926659318], [-60.542965664295131, -15.093910414289592], [-60.158389655179022, -16.258283786690082], [-58.241219855366673, -16.299573256091289], [-58.388058437724027, -16.877109063385273], [-58.280804002502244, -17.271710300366014], [-57.734558274960989, -17.552468357007765], [-57.498371141170971, -18.174187513911289], [-57.676008877174297, -18.961839694904025], [-57.949997321185819, -19.400004164306814], [-57.853801642474494, -19.969995212486186], [-58.166392381408038, -20.176700941653674], [-58.183471442280492, -19.868399346600359], [-59.11504248720609, -19.356906019775398], [-60.043564622626477, -19.342746677327419], [-61.786326463453761, -19.633736667562957], [-62.265961269770784, -20.513734633061272], [-62.291179368729203, -21.051634616787389], [-62.685057135657871, -22.24902922942238], [-62.84646847192154, -22.034985446869442]]] } },
-            { "type": "Feature", "properties": { "admin": "Brazil", "name": "Brazil", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.625133429582945, -30.216294854454258], [-56.290899624239067, -28.852760512000884], [-55.162286342984558, -27.881915378533456], [-54.49072526713551, -27.474756768505785], [-53.648735317587885, -26.923472588816086], [-53.628348965048737, -26.124865004177465], [-54.130049607954376, -25.547639255477247], [-54.625290696823562, -25.739255466415507], [-54.428946092330577, -25.162184747012162], [-54.293476325077435, -24.570799655863958], [-54.292959560754511, -24.021014092710722], [-54.652834235235119, -23.839578138933955], [-55.027901780809543, -24.001273695575225], [-55.400747239795407, -23.956935316668797], [-55.517639329639621, -23.57199757252663], [-55.61068274598113, -22.655619398694839], [-55.797958136606894, -22.356929620047815], [-56.473317430229379, -22.086300144135279], [-56.881509568902885, -22.282153822521476], [-57.937155727761287, -22.090175876557169], [-57.870673997617786, -20.732687676681948], [-58.166392381408038, -20.176700941653674], [-57.853801642474494, -19.969995212486186], [-57.949997321185819, -19.400004164306814], [-57.676008877174297, -18.961839694904025], [-57.498371141170971, -18.174187513911289], [-57.734558274960989, -17.552468357007765], [-58.280804002502244, -17.271710300366014], [-58.388058437724027, -16.877109063385273], [-58.241219855366673, -16.299573256091289], [-60.158389655179022, -16.258283786690082], [-60.542965664295131, -15.093910414289592], [-60.251148851142922, -15.077218926659318], [-60.264326341377355, -14.645979099183638], [-60.459198167550014, -14.354007256734551], [-60.503304002511122, -13.775954685117656], [-61.084121263255646, -13.479383640194595], [-61.713204311760769, -13.489202162330049], [-62.127080857986371, -13.19878061284972], [-62.803060268796372, -13.000653171442682], [-63.196498786050562, -12.627032565972433], [-64.31635291203159, -12.461978041232191], [-65.402281460213018, -11.566270440317151], [-65.321898769783004, -10.895872084194675], [-65.444837002205375, -10.51145110437543], [-65.33843522811641, -9.76198780684639], [-66.646908331962791, -9.931331475466861], [-67.173801235610725, -10.30681243249961], [-68.048192308205373, -10.712059014532484], [-68.27125362819325, -11.014521172736817], [-68.786157599549469, -11.036380303596276], [-69.52967810736493, -10.951734307502193], [-70.093752204046879, -11.123971856331011], [-70.548685675728393, -11.009146823778462], [-70.481893886991159, -9.490118096558842], [-71.302412278921523, -10.079436130415372], [-72.184890713169821, -10.05359791426943], [-72.563033006465631, -9.520193780152715], [-73.226713426390148, -9.462212823121233], [-73.015382656532537, -9.03283334720806], [-73.571059332967053, -8.424446709835832], [-73.987235480429646, -7.523829847853063], [-73.723401455363486, -7.340998630404412], [-73.724486660441627, -6.918595472850638], [-73.120027431923575, -6.629930922068238], [-73.219711269814596, -6.089188734566076], [-72.964507208941185, -5.741251315944892], [-72.891927659787243, -5.274561455916979], [-71.748405727816532, -4.59398284263301], [-70.928843349883564, -4.401591485210367], [-70.79476884630229, -4.251264743673302], [-69.893635219996611, -4.298186944194326], [-69.444101935489599, -1.556287123219817], [-69.420485805932216, -1.122618503426409], [-69.577065395776586, -0.549991957200163], [-70.02065589057004, -0.185156345219539], [-70.015565761989293, 0.541414292804205], [-69.452396002872447, 0.706158758950693], [-69.252434048119042, 0.602650865070075], [-69.218637661400166, 0.985676581217433], [-69.804596727157701, 1.089081122233466], [-69.816973232691609, 1.714805202639624], [-67.868565029558823, 1.692455145673392], [-67.537810024674684, 2.037162787276329], [-67.25999752467358, 1.719998684084956], [-67.065048183852483, 1.130112209473225], [-66.876325853122566, 1.253360500489336], [-66.325765143484944, 0.724452215982012], [-65.548267381437554, 0.78925446207603], [-65.354713304288353, 1.0952822941085], [-64.611011928959854, 1.328730576987041], [-64.199305792890499, 1.49285492594602], [-64.083085496666072, 1.91636912679408], [-63.368788011311644, 2.200899562993129], [-63.422867397705105, 2.411067613124174], [-64.269999152265783, 2.497005520025566], [-64.408827887617903, 3.126786200366623], [-64.368494432214092, 3.797210394705246], [-64.816064012294007, 4.056445217297422], [-64.628659430587533, 4.14848094320925], [-63.888342861574145, 4.020530096854571], [-63.093197597899092, 3.770571193858784], [-62.804533047116692, 4.006965033377951], [-62.085429653559125, 4.162123521334308], [-60.966893276601517, 4.536467596856638], [-60.601179165271922, 4.918098049332129], [-60.733574184803707, 5.2002772078619], [-60.213683437731319, 5.2444863956876], [-59.980958624904865, 5.014061184098138], [-60.111002366767373, 4.574966538914082], [-59.767405768458701, 4.423502915866606], [-59.538039923731219, 3.958802598481937], [-59.815413174057852, 3.606498521332085], [-59.974524909084543, 2.755232652188055], [-59.718545701726732, 2.249630438644359], [-59.646043667221242, 1.786893825686789], [-59.030861579002639, 1.317697658692722], [-58.540012986878288, 1.26808828369252], [-58.429477098205957, 1.46394196207872], [-58.113449876525003, 1.507195135907025], [-57.660971035377358, 1.682584947105638], [-57.33582292339689, 1.948537705895759], [-56.782704230360814, 1.863710842288653], [-56.53938574891454, 1.89952260986692], [-55.995698004771739, 1.817667141116601], [-55.905600145070871, 2.021995754398659], [-56.073341844290283, 2.220794989425499], [-55.973322109589361, 2.510363877773016], [-55.569755011605984, 2.42150625244713], [-55.097587449755125, 2.523748073736612], [-54.524754197799709, 2.311848863123785], [-54.088062506717243, 2.105556545414629], [-53.778520677288903, 2.376702785650081], [-53.554839240113537, 2.33489655192595], [-53.4184651352953, 2.05338918701598], [-52.939657151894949, 2.124857692875636], [-52.556424730018414, 2.504705308437053], [-52.249337531123942, 3.241094468596244], [-51.657797410678882, 4.156232408053028], [-51.317146369010842, 4.203490505383953], [-51.069771287629649, 3.65039765056403], [-50.508875291533641, 1.901563828942456], [-49.974075893745045, 1.736483465986069], [-49.947100796088705, 1.046189683431223], [-50.699251268096901, 0.222984117021681], [-50.388210822132123, -0.078444512536819], [-48.620566779156313, -0.235489190271821], [-48.584496629416577, -1.237805271005001], [-47.824956427590621, -0.5816179337628], [-46.566583624851219, -0.941027520352776], [-44.9057030909904, -1.551739597178134], [-44.417619187993658, -2.137750339367975], [-44.581588507655773, -2.691308282078523], [-43.418791266440188, -2.383110039889793], [-41.47265682632824, -2.912018324397116], [-39.97866533055403, -2.87305429444904], [-38.50038347019656, -3.700652357603394], [-37.223252122535193, -4.820945733258915], [-36.45293738457638, -5.109403578312153], [-35.597795783010454, -5.149504489770648], [-35.235388963347553, -5.464937432480245], [-34.896029832486825, -6.738193047719709], [-34.729993455533027, -7.343220716992965], [-35.128212042774216, -8.996401462442284], [-35.636966518687707, -9.649281508017811], [-37.046518724096991, -11.040721123908799], [-37.683611619607355, -12.17119475672582], [-38.423876512188436, -13.038118584854285], [-38.673887091616507, -13.057652276260615], [-38.953275722802537, -13.79336964280002], [-38.882298143049645, -15.667053724838764], [-39.161092495264306, -17.208406670808468], [-39.267339240056394, -17.867746270420479], [-39.583521491034219, -18.262295830968934], [-39.76082333022763, -19.599113457927402], [-40.774740770010332, -20.90451181405242], [-40.944756232250597, -21.937316989837807], [-41.75416419123821, -22.370675551037454], [-41.988284267736546, -22.970070489190888], [-43.074703742024738, -22.967693373305462], [-44.647811855637798, -23.351959323827838], [-45.35213578955991, -23.796841729428579], [-46.472093268405523, -24.088968601174539], [-47.648972337420645, -24.885199069927715], [-48.495458136577689, -25.877024834905647], [-48.641004808127725, -26.623697605090928], [-48.474735887228647, -27.175911960561887], [-48.661520351747612, -28.186134535435713], [-48.888457404157393, -28.674115085567877], [-49.587329474472668, -29.224469089476333], [-50.696874152211478, -30.984465020472953], [-51.576226162306149, -31.777698256153204], [-52.256081305538032, -32.245369968394662], [-52.71209998229768, -33.196578057591175], [-53.373661668498229, -33.768377780900757], [-53.650543992718084, -33.202004082981823], [-53.209588995971529, -32.727666110974717], [-53.787951626182185, -32.047242526987617], [-54.572451544805105, -31.494511407193745], [-55.601510179249331, -30.853878676071385], [-55.97324459494093, -30.883075860316296], [-56.976025763564721, -30.109686374636119], [-57.625133429582945, -30.216294854454258]]] } },
-            { "type": "Feature", "properties": { "admin": "Brunei", "name": "Brunei", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[114.204016554828343, 4.525873928236805], [114.599961379048707, 4.900011298029965], [115.450710483869798, 5.447729803891532], [115.405700311343566, 4.955227565933837], [115.347460972150643, 4.316636053887009], [114.869557326315373, 4.348313706881924], [114.659595981913498, 4.007636826997753], [114.204016554828343, 4.525873928236805]]] } },
-            { "type": "Feature", "properties": { "admin": "Bhutan", "name": "Bhutan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[91.69665652869665, 27.771741848251661], [92.10371178585973, 27.4526140406332], [92.033483514375078, 26.838310451763554], [91.217512648486405, 26.808648179628019], [90.37327477413406, 26.875724188742872], [89.744527622438838, 26.71940298105995], [88.835642531289366, 27.098966376243755], [88.814248488320544, 27.299315904239361], [89.475810174521101, 28.04275889740639], [90.015828891971154, 28.296438503527209], [90.730513950567769, 28.064953925075748], [91.258853794319904, 28.040614325466287], [91.69665652869665, 27.771741848251661]]] } },
-            { "type": "Feature", "properties": { "admin": "Botswana", "name": "Botswana", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[25.649163445750155, -18.536025892818987], [25.850391473094724, -18.714412937090533], [26.164790887158478, -19.293085625894935], [27.296504754350501, -20.391519870690995], [27.724747348753247, -20.499058526290387], [27.727227817503252, -20.851801853114711], [28.02137007010861, -21.485975030200578], [28.794656202924209, -21.639454034107445], [29.432188348109033, -22.091312758067584], [28.017235955525244, -22.827753594659072], [27.119409620886238, -23.574323011979772], [26.78640669119741, -24.240690606383478], [26.485753208123292, -24.616326592713097], [25.941652052522151, -24.696373386333214], [25.765848829865206, -25.174845472923671], [25.664666375437712, -25.486816094669706], [25.025170525825782, -25.719670098576891], [24.211266717228792, -25.670215752873567], [23.733569777122703, -25.39012948985161], [23.312096795350179, -25.268689873965712], [22.824271274514896, -25.500458672794768], [22.579531691180584, -25.979447523708142], [22.105968865657864, -26.28025603607913], [21.60589603036939, -26.726533705351748], [20.889609002371731, -26.828542982695907], [20.666470167735437, -26.477453301704916], [20.758609246511831, -25.868136488551446], [20.165725538827186, -24.917961928000768], [19.895767856534427, -24.767790215760588], [19.895457797940672, -21.849156996347865], [20.881134067475866, -21.814327080983144], [20.910641310314531, -18.252218926672018], [21.655040317478971, -18.219146010005222], [23.196858351339298, -17.869038181227783], [23.579005568137713, -18.281261081620055], [24.217364536239209, -17.889347019118485], [24.520705193792534, -17.887124932529932], [25.084443393664564, -17.661815687737366], [25.264225701608005, -17.736539808831413], [25.649163445750155, -18.536025892818987]]] } },
-            { "type": "Feature", "properties": { "admin": "Central African Republic", "name": "Central African Rep.", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[15.279460483469107, 7.421924546737968], [16.106231723706767, 7.497087917506504], [16.290561557691884, 7.754307359239304], [16.456184523187343, 7.734773667832966], [16.705988396886251, 7.508327541529978], [17.964929640380884, 7.890914008002865], [18.389554884523218, 8.281303615751822], [18.911021762780504, 8.630894680206351], [18.81200971850927, 8.982914536978596], [19.094008009526018, 9.074846910025837], [20.059685499764267, 9.01270600019485], [21.00086836109616, 9.475985215691507], [21.723821648859452, 10.567055568885973], [22.231129184668784, 10.971888739460507], [22.864165480244218, 11.142395127807543], [22.977543572692603, 10.714462591998538], [23.554304233502187, 10.089255275915306], [23.557249790142826, 9.681218166538683], [23.394779087017181, 9.26506785729222], [23.459012892355979, 8.954285793488891], [23.805813429466745, 8.666318874542425], [24.567369012152078, 8.229187933785466], [25.114932488716786, 7.825104071479172], [25.12413089366472, 7.500085150579436], [25.796647983511171, 6.979315904158069], [26.21341840994511, 6.546603298362071], [26.465909458123232, 5.94671743410187], [27.213409051225163, 5.550953477394557], [27.374226108517483, 5.233944403500059], [27.044065382604703, 5.127852688004835], [26.402760857862535, 5.150874538590869], [25.650455356557465, 5.256087754737123], [25.278798455514302, 5.170408229997191], [25.128833449003274, 4.927244777847789], [24.805028924262409, 4.897246608902349], [24.41053104014625, 5.108784084489129], [23.297213982850135, 4.609693101414221], [22.841479526468103, 4.710126247573483], [22.704123569436284, 4.633050848810156], [22.405123732195531, 4.02916006104732], [21.659122755630019, 4.224341945813719], [20.927591180106273, 4.322785549329736], [20.290679152108932, 4.691677761245287], [19.467783644293146, 5.031527818212779], [18.932312452884755, 4.709506130385973], [18.542982211997778, 4.201785183118317], [18.453065219809925, 3.504385891123348], [17.809900343505259, 3.560196437998569], [17.133042433346297, 3.728196519379451], [16.537058139724135, 3.198254706226278], [16.01285241055535, 2.267639675298084], [15.907380812247649, 2.557389431158612], [15.862732374747479, 3.013537298998982], [15.405395948964379, 3.335300604664339], [15.036219516671249, 3.851367295747123], [14.950953403389658, 4.21038930909492], [14.478372430080466, 4.732605495620446], [14.558935988023501, 5.03059764243153], [14.459407179429345, 5.451760565610299], [14.536560092841111, 6.22695872642069], [14.776545444404572, 6.408498033062044], [15.279460483469107, 7.421924546737968]]] } },
-            { "type": "Feature", "properties": { "admin": "Canada", "name": "Canada", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-63.6645, 46.55001], [-62.9393, 46.41587], [-62.01208, 46.44314], [-62.50391, 46.03339], [-62.87433, 45.96818], [-64.1428, 46.39265], [-64.39261, 46.72747], [-64.01486, 47.03601], [-63.6645, 46.55001]]], [[[-61.806305, 49.10506], [-62.29318, 49.08717], [-63.58926, 49.40069], [-64.51912, 49.87304], [-64.17322, 49.95718], [-62.85829, 49.70641], [-61.835585, 49.28855], [-61.806305, 49.10506]]], [[[-123.510001587551116, 48.51001089130343], [-124.012890788399474, 48.370846259141402], [-125.655012777338342, 48.825004584338494], [-125.954994466792726, 49.179995835967638], [-126.850004435871853, 49.530000311880421], [-127.029993449544392, 49.814995835970073], [-128.059336304366212, 49.994959011426594], [-128.444584107102145, 50.53913768167611], [-128.358413656255408, 50.770648098343678], [-127.308581096029883, 50.552573554071948], [-126.695000977212302, 50.40090322529538], [-125.755006673823161, 50.295018215529367], [-125.415001587558791, 49.950000515332604], [-124.920768189119315, 49.47527497008339], [-123.92250870832099, 49.062483628935794], [-123.510001587551116, 48.51001089130343]]], [[[-56.134035814017111, 50.687009792679298], [-56.795881720595261, 49.812308661490945], [-56.143105027884289, 50.15011749938283], [-55.471492275602934, 49.935815334668447], [-55.822401089080913, 49.587128607779093], [-54.93514258484565, 49.313010972686833], [-54.473775397343772, 49.556691189159167], [-53.47654944519131, 49.24913890237405], [-53.786013759971233, 48.516780503933617], [-53.086133999226249, 48.687803656603528], [-52.95864824076223, 48.157164211614472], [-52.648098720904173, 47.53554840757549], [-53.069158291218336, 46.655498765644936], [-53.521456264853029, 46.618291734394823], [-54.178935512902527, 46.807065741556997], [-53.961868659060471, 47.625207017601909], [-54.240482143762122, 47.752279364607617], [-55.400773078011483, 46.88499380145312], [-55.997480841685835, 46.919720363953289], [-55.291219041552765, 47.389562486350982], [-56.250798712780508, 47.632545070987383], [-57.325229254777085, 47.572807115257987], [-59.26601518414676, 47.603347886742498], [-59.41949418805369, 47.89945384377485], [-58.796586473207398, 48.251525376979473], [-59.23162451845652, 48.523188381537793], [-58.391804979065213, 49.125580552764163], [-57.358689744686025, 50.718274034215845], [-56.738650071831998, 51.287438259478527], [-55.87097693543528, 51.632094224649187], [-55.406974249886602, 51.588272610065722], [-55.600218268442077, 51.317074693397913], [-56.134035814017111, 50.687009792679298]]], [[[-133.180004041711669, 54.169975490935308], [-132.710007884431292, 54.040009315423518], [-131.749989584003259, 54.120004380909208], [-132.049480347350965, 52.984621487024519], [-131.179042521826574, 52.18043284769827], [-131.577829549822894, 52.182370713909236], [-132.180428426778519, 52.639707139692391], [-132.549992432313843, 53.100014960332132], [-133.054611178755493, 53.411468817755363], [-133.239664482792676, 53.851080227262386], [-133.180004041711669, 54.169975490935308]]], [[[-79.26582, 62.158675], [-79.65752, 61.63308], [-80.09956, 61.7181], [-80.36215, 62.01649], [-80.315395, 62.085565], [-79.92939, 62.3856], [-79.52002, 62.36371], [-79.26582, 62.158675]]], [[[-81.89825, 62.7108], [-83.06857, 62.15922], [-83.77462, 62.18231], [-83.99367, 62.4528], [-83.25048, 62.91409], [-81.87699, 62.90458], [-81.89825, 62.7108]]], [[[-85.161307949549851, 65.657284654392797], [-84.975763719405933, 65.217518215588981], [-84.464012010419495, 65.371772365980163], [-83.88262630891974, 65.109617824963536], [-82.78757687043877, 64.766693020274673], [-81.642013719392509, 64.455135809986942], [-81.553440314444245, 63.979609280037131], [-80.817361212878851, 64.057485663500998], [-80.103451300766594, 63.725981350348597], [-80.991019863595653, 63.41124603947496], [-82.547178107416997, 63.651722317145229], [-83.108797573565042, 64.101875718839707], [-84.100416632813847, 63.569711819098004], [-85.523404710618991, 63.052379055424076], [-85.866768764982339, 63.637252916103542], [-87.221983201836721, 63.541238104905212], [-86.352759772471259, 64.035833238370699], [-86.224886440765133, 64.822916978608262], [-85.883847825854858, 65.738778388117041], [-85.161307949549851, 65.657284654392797]]], [[[-75.86588, 67.14886], [-76.98687, 67.09873], [-77.2364, 67.58809], [-76.81166, 68.14856], [-75.89521, 68.28721], [-75.1145, 68.01036], [-75.10333, 67.58202], [-75.21597, 67.44425], [-75.86588, 67.14886]]], [[[-95.647681203800488, 69.107690358321761], [-96.269521203800579, 68.757040358321731], [-97.61740120380054, 69.060030358321782], [-98.431801203800504, 68.950700358321768], [-99.797401203800504, 69.400030358321786], [-98.917401203800523, 69.710030358321788], [-98.218261203800466, 70.143540358321744], [-97.157401203800532, 69.860030358321794], [-96.557401203800524, 69.680030358321758], [-96.257401203800498, 69.490030358321761], [-95.647681203800488, 69.107690358321761]]], [[[-90.5471, 69.49766], [-90.55151, 68.47499], [-89.21515, 69.25873], [-88.01966, 68.61508], [-88.31749, 67.87338], [-87.35017, 67.19872], [-86.30607, 67.92146], [-85.57664, 68.78456], [-85.52197, 69.88211], [-84.10081, 69.80539], [-82.62258, 69.65826], [-81.28043, 69.16202], [-81.2202, 68.66567], [-81.96436, 68.13253], [-81.25928, 67.59716], [-81.38653, 67.11078], [-83.34456, 66.41154], [-84.73542, 66.2573], [-85.76943, 66.55833], [-86.0676, 66.05625], [-87.03143, 65.21297], [-87.32324, 64.77563], [-88.48296, 64.09897], [-89.91444, 64.03273], [-90.70398, 63.61017], [-90.77004, 62.96021], [-91.93342, 62.83508], [-93.15698, 62.02469], [-94.24153, 60.89865], [-94.62931, 60.11021], [-94.6846, 58.94882], [-93.21502, 58.78212], [-92.76462, 57.84571], [-92.297029999999893, 57.08709], [-90.89769, 57.28468], [-89.03953, 56.85172], [-88.03978, 56.47162], [-87.32421, 55.99914], [-86.07121, 55.72383], [-85.01181, 55.3026], [-83.36055, 55.24489], [-82.27285, 55.14832], [-82.4362, 54.28227], [-82.12502, 53.27703], [-81.40075, 52.15788], [-79.91289, 51.20842], [-79.14301, 51.53393], [-78.60191, 52.56208], [-79.12421, 54.14145], [-79.82958, 54.66772], [-78.22874, 55.13645], [-77.0956, 55.83741], [-76.54137, 56.53423], [-76.62319, 57.20263], [-77.30226, 58.05209], [-78.51688, 58.80458], [-77.33676, 59.85261], [-77.77272, 60.75788], [-78.10687, 62.31964], [-77.41067, 62.55053], [-75.69621, 62.2784], [-74.6682, 62.18111], [-73.83988, 62.4438], [-72.90853, 62.10507], [-71.67708, 61.52535], [-71.37369, 61.13717], [-69.59042, 61.06141], [-69.62033, 60.22125], [-69.2879, 58.95736], [-68.37455, 58.80106], [-67.64976, 58.21206], [-66.20178, 58.76731], [-65.24517, 59.87071], [-64.58352, 60.33558], [-63.80475, 59.4426], [-62.50236, 58.16708], [-61.39655, 56.96745], [-61.79866, 56.33945], [-60.46853, 55.77548], [-59.56962, 55.20407], [-57.97508, 54.94549], [-57.3332, 54.6265], [-56.93689, 53.78032], [-56.15811, 53.64749], [-55.75632, 53.27036], [-55.68338, 52.14664], [-56.40916, 51.7707], [-57.12691, 51.41972], [-58.77482, 51.0643], [-60.03309, 50.24277], [-61.72366, 50.08046], [-63.86251, 50.29099], [-65.36331, 50.2982], [-66.39905, 50.22897], [-67.23631, 49.51156], [-68.51114, 49.06836], [-69.95362, 47.74488], [-71.10458, 46.82171], [-70.25522, 46.98606], [-68.65, 48.3], [-66.55243, 49.1331], [-65.05626, 49.23278], [-64.17099, 48.74248], [-65.11545, 48.07085], [-64.79854, 46.99297], [-64.47219, 46.23849], [-63.17329, 45.73902], [-61.52072, 45.88377], [-60.51815, 47.00793], [-60.4486, 46.28264], [-59.80287, 45.9204], [-61.03988, 45.26525], [-63.25471, 44.67014], [-64.24656, 44.26553], [-65.36406, 43.54523], [-66.1234, 43.61867], [-66.16173, 44.46512], [-64.42549, 45.29204], [-66.02605, 45.25931], [-67.13741, 45.13753], [-67.79134, 45.70281], [-67.79046, 47.06636], [-68.23444, 47.35486], [-68.905, 47.185], [-69.237216, 47.447781], [-69.99997, 46.69307], [-70.305, 45.915], [-70.66, 45.46], [-71.08482, 45.30524], [-71.405, 45.255], [-71.50506, 45.0082], [-73.34783, 45.00738], [-74.867, 45.00048], [-75.31821, 44.81645], [-76.375, 44.09631], [-76.5, 44.018458893758712], [-76.820034145805565, 43.628784288093748], [-77.737885097957687, 43.62905558936329], [-78.720279914042365, 43.625089423184868], [-79.171673550111862, 43.466339423184216], [-79.01, 43.27], [-78.92, 42.965], [-78.939362148743683, 42.863611355148031], [-80.247447679347928, 42.366199856122584], [-81.277746548167144, 42.209025987306845], [-82.439277716791608, 41.675105088867149], [-82.690089280920162, 41.675105088867149], [-83.029810146806909, 41.832795722005834], [-83.141999681312555, 41.975681057292825], [-83.12, 42.08], [-82.9, 42.43], [-82.43, 42.98], [-82.137642381503881, 43.571087551439909], [-82.337763125431053, 44.44], [-82.550924648758169, 45.347516587905368], [-83.592850714843067, 45.816893622412373], [-83.469550747394621, 45.994686387712584], [-83.616130947590563, 46.116926988299056], [-83.890765347005726, 46.116926988299056], [-84.091851264161463, 46.27541860613816], [-84.14211951367335, 46.512225857115723], [-84.3367, 46.40877], [-84.6049, 46.4396], [-84.543748745445853, 46.538684190449132], [-84.779238247399888, 46.637101955749038], [-84.876079881514855, 46.900083319682366], [-85.652363247403414, 47.220218817730498], [-86.461990831228249, 47.553338019392037], [-87.439792623300207, 47.94], [-88.378114183286698, 48.302917588893727], [-89.272917446636654, 48.019808254582657], [-89.6, 48.01], [-90.83, 48.27], [-91.64, 48.14], [-92.61, 48.45], [-93.63087, 48.60926], [-94.32914, 48.67074], [-94.64, 48.84], [-94.81758, 49.38905], [-95.15609, 49.38425], [-95.159069509172014, 49.0], [-97.228720000004799, 49.0007], [-100.65, 49.0], [-104.04826, 48.99986], [-107.05, 49.0], [-110.05, 49.0], [-113.0, 49.0], [-116.04818, 49.0], [-117.03121, 49.0], [-120.0, 49.0], [-122.84, 49.0], [-122.97421, 49.002537777777789], [-124.91024, 49.98456], [-125.62461, 50.41656], [-127.43561, 50.83061], [-127.99276, 51.71583], [-127.85032, 52.32961], [-129.12979, 52.75538], [-129.30523, 53.56159], [-130.51497, 54.28757], [-130.53611, 54.80278], [-129.98, 55.285], [-130.00778, 55.91583], [-131.70781, 56.55212], [-132.73042, 57.69289], [-133.35556, 58.41028], [-134.27111, 58.86111], [-134.945, 59.27056], [-135.47583, 59.78778], [-136.47972, 59.46389], [-137.4525, 58.905], [-138.34089, 59.56211], [-139.039, 60.0], [-140.013, 60.27682], [-140.99778, 60.30639], [-140.9925, 66.00003], [-140.986, 69.712], [-139.12052, 69.47102], [-137.54636, 68.99002], [-136.50358, 68.89804], [-135.62576, 69.31512], [-134.41464, 69.62743], [-132.92925, 69.50534], [-131.43136, 69.94451], [-129.79471, 70.19369], [-129.10773, 69.77927], [-128.36156, 70.01286], [-128.13817, 70.48384], [-127.44712, 70.37721], [-125.75632, 69.48058], [-124.42483, 70.1584], [-124.28968, 69.39969], [-123.06108, 69.56372], [-122.6835, 69.85553], [-121.47226, 69.79778], [-119.94288, 69.37786], [-117.60268, 69.01128], [-116.22643, 68.84151], [-115.2469, 68.90591], [-113.89794, 68.3989], [-115.30489, 67.90261], [-113.49727, 67.68815], [-110.798, 67.80612], [-109.94619, 67.98104], [-108.8802, 67.38144], [-107.79239, 67.88736], [-108.81299, 68.31164], [-108.16721, 68.65392], [-106.95, 68.7], [-106.15, 68.8], [-105.34282, 68.56122], [-104.33791, 68.018], [-103.22115, 68.09775], [-101.45433, 67.64689], [-99.90195, 67.80566], [-98.4432, 67.78165], [-98.5586, 68.40394], [-97.66948, 68.57864], [-96.11991, 68.23939], [-96.12588, 67.29338], [-95.48943, 68.0907], [-94.685, 68.06383], [-94.23282, 69.06903], [-95.30408, 69.68571], [-96.47131, 70.08976], [-96.39115, 71.19482], [-95.2088, 71.92053], [-93.88997, 71.76015], [-92.87818, 71.31869], [-91.51964, 70.19129], [-92.40692, 69.69997], [-90.5471, 69.49766]]], [[[-114.167169999999871, 73.12145], [-114.66634, 72.65277], [-112.441019999999867, 72.9554], [-111.05039, 72.4504], [-109.920349999999857, 72.96113], [-109.00654, 72.63335], [-108.188349999999886, 71.65089], [-107.68599, 72.06548], [-108.39639, 73.08953], [-107.51645, 73.23598], [-106.522589999999866, 73.07601], [-105.402459999999877, 72.67259], [-104.77484, 71.6984], [-104.464759999999814, 70.99297], [-102.78537, 70.49776], [-100.980779999999868, 70.02432], [-101.089289999999892, 69.58447000000011], [-102.731159999999875, 69.50402], [-102.09329, 69.11962], [-102.43024, 68.75282], [-104.24, 68.91], [-105.96, 69.180000000000135], [-107.12254, 69.11922], [-108.999999999999872, 68.78], [-111.534148875200117, 68.630059156817921], [-113.3132, 68.53554], [-113.854959999999807, 69.007440000000102], [-115.22, 69.28], [-116.10794, 69.16821], [-117.34, 69.960000000000107], [-116.674729999999869, 70.06655], [-115.13112, 70.2373], [-113.72141, 70.19237], [-112.4161, 70.36638], [-114.35, 70.6], [-116.48684, 70.52045], [-117.9048, 70.540560000000127], [-118.43238, 70.9092], [-116.11311, 71.30918], [-117.65568, 71.2952], [-119.40199, 71.55859], [-118.56267, 72.30785], [-117.866419999999877, 72.70594], [-115.18909, 73.314590000000109], [-114.167169999999871, 73.12145]]], [[[-104.5, 73.42], [-105.38, 72.76], [-106.94, 73.46], [-106.6, 73.6], [-105.26, 73.64], [-104.5, 73.42]]], [[[-76.34, 73.102684989953005], [-76.251403808593736, 72.826385498046861], [-77.314437866210895, 72.85554504394527], [-78.391670227050795, 72.876655578613253], [-79.486251831054645, 72.742202758789062], [-79.775833129882827, 72.80290222167973], [-80.876098632812514, 73.333183288574205], [-80.833885192871051, 73.693183898925767], [-80.353057861328111, 73.75971984863277], [-78.064437866210923, 73.651931762695327], [-76.34, 73.102684989953005]]], [[[-86.562178514334107, 73.157447007938444], [-85.774371304044521, 72.534125881633798], [-84.850112474288224, 73.34027822538711], [-82.315590176100969, 73.750950832810574], [-80.600087653307611, 72.716543687624181], [-80.748941616524391, 72.061906643350753], [-78.770638597310764, 72.352173163534147], [-77.824623989559569, 72.749616604291035], [-75.605844692675717, 72.243678493937381], [-74.228616095664975, 71.767144273557889], [-74.099140794557698, 71.330840155717638], [-72.242225714797641, 71.556924546994495], [-71.200015428335192, 70.920012518997211], [-68.78605424668487, 70.525023708774242], [-67.914970465756923, 70.121947536897594], [-66.969033372654152, 69.18608734809186], [-68.805122850200533, 68.720198472764409], [-66.449866095633851, 68.067163397892003], [-64.862314419195215, 67.847538560651614], [-63.424934454996745, 66.928473212340649], [-61.851981370680569, 66.862120673277829], [-62.163176845942296, 66.160251369889593], [-63.91844438338417, 64.998668524832837], [-65.148860236253611, 65.426032619886669], [-66.72121904159853, 66.388041083432185], [-68.015016038673949, 66.262725735124391], [-68.141287400979152, 65.689789130304362], [-67.089646165623392, 65.108455105236985], [-65.732080451099748, 64.64840566675862], [-65.320167609301265, 64.382737128346051], [-64.669406297449669, 63.392926744227474], [-65.013803880458894, 62.674185085695974], [-66.275044725190455, 62.945098781986069], [-68.783186204692711, 63.745670071051805], [-67.369680752213029, 62.883965562584869], [-66.328297288667201, 62.28007477482204], [-66.165568203380147, 61.930897121825879], [-68.877366502544632, 62.330149237712803], [-71.023437059193824, 62.910708116295829], [-72.23537858751898, 63.397836005295154], [-71.886278449171286, 63.679989325608837], [-73.37830624051837, 64.193963121183813], [-74.834418911422588, 64.679075629323776], [-74.818502570276706, 64.389093329517962], [-77.709979824520019, 64.229542344816778], [-78.55594885935416, 64.572906399180127], [-77.897281053361908, 65.309192206474776], [-76.018274298797181, 65.326968899183143], [-73.95979529488271, 65.454764716240888], [-74.293883429649625, 65.81177134872938], [-73.94491248238262, 66.310578111426722], [-72.65116716173938, 67.284575507263853], [-72.926059943316076, 67.726925767682374], [-73.311617804645721, 68.069437160912898], [-74.8433072577768, 68.554627183701271], [-76.869100918266739, 68.894735622830254], [-76.228649054657339, 69.147769273547411], [-77.28736996123709, 69.769540106883269], [-78.168633999326588, 69.826487535268896], [-78.95724219431672, 70.166880194775402], [-79.492455003563649, 69.871807766388898], [-81.305470954091732, 69.743185126414332], [-84.944706183598456, 69.966634019644388], [-87.060003424817864, 70.260001125765356], [-88.681713223001495, 70.410741278760796], [-89.513419562523012, 70.762037665480975], [-88.467721116880753, 71.218185533321318], [-89.888151211287465, 71.222552191849942], [-90.205160285181989, 72.235074367960792], [-89.43657670770493, 73.129464219852352], [-88.408241543312784, 73.537888902471209], [-85.826151089200906, 73.803815823045213], [-86.562178514334107, 73.157447007938444]]], [[[-100.35642, 73.84389], [-99.16387, 73.63339], [-97.38, 73.76], [-97.12, 73.47], [-98.05359, 72.99052], [-96.54, 72.56], [-96.72, 71.66], [-98.35966, 71.27285], [-99.32286, 71.35639], [-100.01482, 71.73827], [-102.5, 72.51], [-102.48, 72.83], [-100.43836, 72.70588], [-101.54, 73.36], [-100.35642, 73.84389]]], [[[-93.196295539100205, 72.771992499473342], [-94.26904659704725, 72.024596259235949], [-95.409855516322637, 72.061880805134578], [-96.033745083382428, 72.940276801231789], [-96.01826799191096, 73.437429918095788], [-95.495793423224001, 73.862416897264154], [-94.503657599652328, 74.134906724739196], [-92.420012173211745, 74.100025132942179], [-90.509792853542578, 73.85673248971203], [-92.003965216829869, 72.966244208458477], [-93.196295539100205, 72.771992499473342]]], [[[-120.46, 71.383601793087578], [-123.09219, 70.90164], [-123.62, 71.34], [-125.92894873747332, 71.868688463011395], [-125.499999999999872, 72.292260811795003], [-124.80729, 73.02256], [-123.94, 73.680000000000135], [-124.917749999999899, 74.292750000000112], [-121.53788, 74.44893], [-120.10978, 74.24135], [-117.55564, 74.18577], [-116.58442, 73.89607], [-115.51081, 73.47519], [-116.767939999999882, 73.22292], [-119.22, 72.52], [-120.46, 71.82], [-120.46, 71.383601793087578]]], [[[-93.612755906940464, 74.979997260224437], [-94.156908738973812, 74.59234650338685], [-95.60868058956558, 74.666863918751758], [-96.820932176484561, 74.927623196096576], [-96.288587409229791, 75.377828274223333], [-94.850819871789113, 75.647217515760886], [-93.977746548217908, 75.296489569795952], [-93.612755906940464, 74.979997260224437]]], [[[-98.5, 76.72], [-97.735585, 76.25656], [-97.704415, 75.74344], [-98.16, 75.0], [-99.80874, 74.89744], [-100.88366, 75.05736], [-100.86292, 75.64075], [-102.50209, 75.5638], [-102.56552, 76.3366], [-101.48973, 76.30537], [-99.98349, 76.64634], [-98.57699, 76.58859], [-98.5, 76.72]]], [[[-108.21141, 76.20168], [-107.81943, 75.84552], [-106.92893, 76.01282], [-105.881, 75.9694], [-105.70498, 75.47951], [-106.31347, 75.00527], [-109.7, 74.85], [-112.22307, 74.41696], [-113.74381, 74.39427], [-113.87135, 74.72029], [-111.79421, 75.1625], [-116.31221, 75.04343], [-117.7104, 75.2222], [-116.34602, 76.19903], [-115.40487, 76.47887], [-112.59056, 76.14134], [-110.81422, 75.54919], [-109.0671, 75.47321], [-110.49726, 76.42982], [-109.5811, 76.79417], [-108.54859, 76.67832], [-108.21141, 76.20168]]], [[[-94.684085862999439, 77.097878323058367], [-93.573921068073105, 76.776295884906062], [-91.605023159536586, 76.778517971494594], [-90.741845872749209, 76.449597479956807], [-90.969661424507976, 76.074013170059445], [-89.822237921899244, 75.847773749485626], [-89.187082892599776, 75.610165513807615], [-87.838276333349611, 75.566188869927217], [-86.379192267588664, 75.482421373182163], [-84.789625210290595, 75.699204006646497], [-82.753444586910049, 75.784315090631225], [-81.12853084992436, 75.713983466282016], [-80.05751095245914, 75.336848863415867], [-79.833932868148324, 74.923127346487192], [-80.457770758775823, 74.657303778777774], [-81.948842536125511, 74.442459011524321], [-83.2288936022114, 74.564027818490928], [-86.097452358733292, 74.410032050261137], [-88.150350307960196, 74.392307033984977], [-89.764722052758358, 74.515555325001117], [-92.422440965529418, 74.837757880340973], [-92.768285488642789, 75.38681997344213], [-92.889905972041717, 75.882655341282629], [-93.893824022175977, 76.319243679500516], [-95.962457445035795, 76.44138092722244], [-97.121378953829463, 76.751077785947587], [-96.745122850312342, 77.161388658345132], [-94.684085862999439, 77.097878323058367]]], [[[-116.198586595507322, 77.645286770326194], [-116.335813361458349, 76.876961575010554], [-117.106050584768766, 76.530031846819114], [-118.040412157038119, 76.481171780087081], [-119.899317586885687, 76.053213406061971], [-121.499995077126471, 75.900018622532784], [-122.85492448615895, 76.116542873835684], [-122.854925293603188, 76.116542873835684], [-121.157535360328239, 76.864507554828336], [-119.103938971821023, 77.512219957174608], [-117.570130784965954, 77.498318996888102], [-116.198586595507322, 77.645286770326194]]], [[[-93.840003017943971, 77.51999726023449], [-94.295608283245244, 77.491342678528682], [-96.169654100310055, 77.55511139597688], [-96.436304490936109, 77.83462921824362], [-94.422577277386353, 77.820004787904978], [-93.720656297565867, 77.634331366680314], [-93.840003017943971, 77.51999726023449]]], [[[-110.186938035912945, 77.697014879050286], [-112.051191169058455, 77.409228827616843], [-113.534278937619035, 77.732206529441143], [-112.724586758253835, 78.051050116681935], [-111.264443325630822, 78.152956041161545], [-109.854451870547067, 77.996324774884812], [-110.186938035912945, 77.697014879050286]]], [[[-109.663145718202557, 78.601972561345676], [-110.88131425661885, 78.406919867659994], [-112.542091437615142, 78.407901719873493], [-112.525890876091566, 78.550554511215225], [-111.500010342233367, 78.849993598130538], [-110.96366065147599, 78.804440823065207], [-109.663145718202557, 78.601972561345676]]], [[[-95.830294969449312, 78.056941229963243], [-97.309842902397975, 77.85059723582178], [-98.124289313533964, 78.082856960757567], [-98.55286780474664, 78.458105373845086], [-98.631984422585504, 78.871930243638374], [-97.337231411512604, 78.831984361476756], [-96.754398769908761, 78.765812689926989], [-95.559277920294562, 78.41831452098026], [-95.830294969449312, 78.056941229963243]]], [[[-100.060191820052111, 78.324754340315891], [-99.670939093813601, 77.907544664207393], [-101.303940192452984, 78.018984890444798], [-102.949808722733025, 78.343228664860206], [-105.176132778731514, 78.38033234324574], [-104.210429450277147, 78.677420152491777], [-105.419580451258511, 78.918335679836431], [-105.492289191493128, 79.301593939929177], [-103.529282396237917, 79.16534902619162], [-100.8251580472688, 78.80046173777869], [-100.060191820052111, 78.324754340315891]]], [[[-87.02, 79.66], [-85.81435, 79.3369], [-87.18756, 79.0393], [-89.03535, 78.28723], [-90.80436, 78.21533], [-92.87669, 78.34333], [-93.95116, 78.75099], [-93.93574, 79.11373], [-93.14524, 79.3801], [-94.974, 79.37248], [-96.07614, 79.70502], [-96.70972, 80.15777], [-96.01644, 80.60233], [-95.32345, 80.90729], [-94.29843, 80.97727], [-94.73542, 81.20646], [-92.40984, 81.25739], [-91.13289, 80.72345], [-89.45, 80.509322033898258], [-87.81, 80.32], [-87.02, 79.66]]], [[[-68.5, 83.106321516765732], [-65.82735, 83.02801], [-63.68, 82.9], [-61.85, 82.6286], [-61.89388, 82.36165], [-64.334, 81.92775], [-66.75342, 81.72527], [-67.65755, 81.50141], [-65.48031, 81.50657], [-67.84, 80.9], [-69.4697, 80.61683], [-71.18, 79.8], [-73.2428, 79.63415], [-73.88, 79.430162204802073], [-76.90773, 79.32309], [-75.52924, 79.19766], [-76.22046, 79.01907], [-75.39345, 78.52581], [-76.34354, 78.18296], [-77.88851, 77.89991], [-78.36269, 77.50859], [-79.75951, 77.20968], [-79.61965, 76.98336], [-77.91089, 77.022045], [-77.88911, 76.777955], [-80.56125, 76.17812], [-83.17439, 76.45403], [-86.11184, 76.29901], [-87.6, 76.42], [-89.49068, 76.47239], [-89.6161, 76.95213], [-87.76739, 77.17833], [-88.26, 77.9], [-87.65, 77.970222222222205], [-84.97634, 77.53873], [-86.34, 78.18], [-87.96192, 78.37181], [-87.15198, 78.75867], [-85.37868, 78.9969], [-85.09495, 79.34543], [-86.50734, 79.73624], [-86.93179, 80.25145], [-84.19844, 80.20836], [-83.408695652173819, 80.1], [-81.84823, 80.46442], [-84.1, 80.58], [-87.59895, 80.51627], [-89.36663, 80.85569], [-90.2, 81.26], [-91.36786, 81.5531], [-91.58702, 81.89429], [-90.1, 82.085], [-88.93227, 82.11751], [-86.97024, 82.27961], [-85.5, 82.652273458057024], [-84.260005, 82.6], [-83.18, 82.32], [-82.42, 82.86], [-81.1, 83.02], [-79.30664, 83.13056], [-76.25, 83.172058823529369], [-75.71878, 83.06404], [-72.83153, 83.23324], [-70.665765, 83.169780758382828], [-68.5, 83.106321516765732]]]] } },
-            { "type": "Feature", "properties": { "admin": "Switzerland", "name": "Switzerland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[9.594226108446346, 47.525058091820256], [9.632931756232974, 47.347601223329974], [9.479969516649019, 47.102809963563367], [9.932448357796657, 46.920728054382948], [10.442701450246627, 46.893546250997424], [10.36337812667861, 46.483571275409851], [9.922836541390378, 46.314899400409182], [9.182881707403054, 46.440214748716976], [8.966305779667804, 46.036931871111186], [8.489952426801322, 46.005150865251672], [8.316629672894377, 46.163642483090847], [7.755992058959832, 45.824490057959302], [7.273850945676655, 45.776947740250769], [6.843592970414504, 45.991146552100595], [6.500099724970424, 46.429672756529428], [6.022609490593537, 46.272989813820466], [6.037388950229, 46.725778713561859], [6.768713820023605, 47.287708238303686], [6.736571079138058, 47.541801255882838], [7.192202182655505, 47.449765529971003], [7.466759067422228, 47.620581976911794], [8.31730146651415, 47.613579820336255], [8.522611932009765, 47.830827541691285], [9.594226108446346, 47.525058091820256]]] } },
-            { "type": "Feature", "properties": { "admin": "Chile", "name": "Chile", "continent": "South America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-68.634010227583147, -52.636370458874353], [-68.633349999999879, -54.8695], [-67.56244, -54.87001], [-66.95992, -54.89681], [-67.291029999999878, -55.30124], [-68.148629999999841, -55.61183], [-68.639990810811796, -55.580017999086877], [-69.2321, -55.49906], [-69.95809, -55.19843], [-71.00568, -55.05383], [-72.2639, -54.49514], [-73.2852, -53.957519999999874], [-74.66253, -52.83749], [-73.8381, -53.04743], [-72.43418, -53.7154], [-71.10773, -54.07433], [-70.591779999999787, -53.61583], [-70.26748, -52.93123], [-69.345649999999878, -52.5183], [-68.634010227583147, -52.636370458874353]]], [[[-68.219913092711224, -21.49434661223183], [-67.828179897722634, -22.872918796482178], [-67.106673550063604, -22.735924574476392], [-66.985233934177629, -22.986348565362825], [-67.328442959244128, -24.025303236590908], [-68.417652960876111, -24.518554782816874], [-68.386001146097342, -26.185016371365229], [-68.594799770772667, -26.50690886811126], [-68.295541551370391, -26.899339694935787], [-69.001234910748266, -27.521213881136127], [-69.656130337183143, -28.459141127233686], [-70.013550381129861, -29.367922865518544], [-69.919008348251921, -30.336339206668306], [-70.535068935819439, -31.365010267870279], [-70.074399380153622, -33.09120981214803], [-69.814776984319209, -33.273886000299839], [-69.817309129501453, -34.193571465798279], [-70.388049485949082, -35.169687595359441], [-70.364769253201658, -36.005088799789931], [-71.121880662709771, -36.65812387466233], [-71.118625047475419, -37.576827487947192], [-70.814664272734703, -38.552995293940732], [-71.413516608349042, -38.916022230791107], [-71.680761277946445, -39.808164157878061], [-71.915734015577542, -40.832339369470716], [-71.746803758415453, -42.051386407235988], [-72.148898078078517, -42.254888197601375], [-71.915423956983901, -43.408564548517404], [-71.464056159130493, -43.787611179378324], [-71.793622606071935, -44.207172133156099], [-71.329800788036195, -44.407521661151677], [-71.222778896759721, -44.784242852559409], [-71.659315558545316, -44.973688653341434], [-71.552009446891233, -45.560732924177117], [-71.917258470330196, -46.884838148791786], [-72.44735531278026, -47.738532810253517], [-72.331160854771937, -48.244238376661819], [-72.648247443314929, -48.878618259476774], [-73.415435757120022, -49.318436374712952], [-73.328050910114456, -50.378785088909865], [-72.975746832964617, -50.741450290734299], [-72.309973517532342, -50.677009779666342], [-72.329403856074023, -51.425956312872394], [-71.914803839796321, -52.009022305865912], [-69.498362189396076, -52.142760912637236], [-68.571545376241332, -52.299443855346247], [-69.461284349226617, -52.291950772663924], [-69.94277950710611, -52.537930590373243], [-70.8451016913545, -52.899200528525711], [-71.006332160105217, -53.833252042201345], [-71.429794684520928, -53.856454760300373], [-72.557942877884855, -53.531410001184447], [-73.702756720662862, -52.835069268607249], [-73.702756720662862, -52.835070076051487], [-74.946763475225154, -52.262753588419017], [-75.260026007778507, -51.62935475037321], [-74.976632453089806, -51.043395684615675], [-75.47975419788348, -50.378371677451547], [-75.608015102831942, -48.673772881871784], [-75.182769741502128, -47.711919447623153], [-74.126580980104677, -46.939253431995084], [-75.644395311165439, -46.647643324572016], [-74.69215369332305, -45.76397633238097], [-74.351709357384252, -44.10304412208788], [-73.240356004515192, -44.454960625995611], [-72.717803921179765, -42.383355808278985], [-73.388899909138232, -42.117532240569567], [-73.701335618774834, -43.365776462579738], [-74.33194312203257, -43.224958184584395], [-74.017957119427152, -41.794812920906828], [-73.677099372029943, -39.942212823243111], [-73.217592536090663, -39.258688653318508], [-73.505559455037044, -38.282882582351064], [-73.588060879191076, -37.156284681956016], [-73.166717088499283, -37.123780206044351], [-72.553136969681717, -35.508840020491022], [-71.861732143832555, -33.909092706031522], [-71.438450486929895, -32.418899428030819], [-71.668720669222424, -30.920644626592516], [-71.370082567007714, -30.095682061484997], [-71.48989437527645, -28.861442152625909], [-70.905123867461569, -27.640379734001193], [-70.724953986275963, -25.705924167587209], [-70.403965827095035, -23.628996677344542], [-70.091245897080668, -21.393319187101223], [-70.164419725205974, -19.756468194256183], [-70.372572394477714, -18.347975355708879], [-69.858443569605797, -18.092693780187027], [-69.590423753523979, -17.580011895419286], [-69.100246955019401, -18.260125420812653], [-68.966818406841824, -18.981683444904089], [-68.442225104430918, -19.405068454671419], [-68.757167121033703, -20.37265797290447], [-68.219913092711224, -21.49434661223183]]]] } },
-            { "type": "Feature", "properties": { "admin": "China", "name": "China", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[110.339187860151526, 18.678395087147603], [109.475209588663702, 18.19770091396861], [108.655207961056135, 18.507681993071397], [108.626217482540426, 19.367887885001974], [109.119055617308007, 19.821038519769385], [110.211598748822837, 20.101253973872073], [110.786550734502228, 20.077534491450077], [111.01005130416462, 19.695929877190732], [110.570646600386794, 19.255879218009305], [110.339187860151526, 18.678395087147603]]], [[[127.657407261262378, 49.760270494172929], [129.397817824420429, 49.440600084015429], [130.58229332898236, 48.729687404976112], [130.987281528853828, 47.790132351261391], [132.506671991099495, 47.788969631534876], [133.373595819228001, 48.183441677434914], [135.026311476786702, 48.478229885443902], [134.500813836810607, 47.578439846377833], [134.112362095272601, 47.212467352886719], [133.76964399631288, 46.116926988299056], [133.097126906466428, 45.14406647397216], [131.883454217659562, 45.32116160743643], [131.025212030156069, 44.967953192721573], [131.288555129115537, 44.111519680348252], [131.144687941614848, 42.929989732426932], [130.633866408409801, 42.903014634770543], [130.640015903852429, 42.39500946712527], [129.994267205933227, 42.985386867843793], [129.596668735879462, 42.424981797854592], [128.05221520397231, 41.994284572917984], [128.208433058790717, 41.466771552082534], [127.343782993683021, 41.503151760415953], [126.869083286649854, 41.816569322266155], [126.18204511932943, 41.107336127276362], [125.079941847840587, 40.569823716792449], [124.265624627785314, 39.928493353834135], [122.86757042856101, 39.637787583976255], [122.131387974130917, 39.170451768544623], [121.054554478032856, 38.89747101496291], [121.585994907722466, 39.360853583324136], [121.376757033372641, 39.750261338859524], [122.168595005381007, 40.422442531896046], [121.640358514493528, 40.946389878903304], [120.768628778161954, 40.593388169917596], [119.639602085449056, 39.898055935214209], [119.023463983233015, 39.252333075511096], [118.042748651197897, 39.204273993479674], [117.532702264477052, 38.73763580988409], [118.05969852098967, 38.061475531561051], [118.878149855628351, 37.897325344385898], [118.911636183753501, 37.448463853498723], [119.702802362142037, 37.156388658185072], [120.823457472823648, 37.870427761377968], [121.711258579597938, 37.481123358707165], [122.357937453298462, 37.454484157860684], [122.519994744965814, 36.930614325501828], [121.104163853033029, 36.651329047180432], [120.63700890511457, 36.111439520811125], [119.66456180224607, 35.609790554337728], [119.151208123858567, 34.909859117160458], [120.227524855633717, 34.360331936168613], [120.620369093916565, 33.37672272392512], [121.229014113450219, 32.460318711877186], [121.908145786630044, 31.692174384074683], [121.891919386890336, 30.949351508095098], [121.264257440273298, 30.676267401648712], [121.503519321784722, 30.14291494396425], [122.092113885589086, 29.832520453403156], [121.93842817595305, 29.018022365834803], [121.684438511238469, 28.225512600206677], [121.125661248866436, 28.135673122667178], [120.395473260582307, 27.053206895449385], [119.585496860839555, 25.740780544532605], [118.656871372554519, 24.547390855400234], [117.281606479970833, 23.624501451099714], [115.890735304835118, 22.782873236578094], [114.763827345846209, 22.668074042241663], [114.152546828265656, 22.223760077396204], [113.806779819800752, 22.548339748621423], [113.241077915501592, 22.051367499270462], [111.843592157032447, 21.550493679281512], [110.78546552942413, 21.39714386645533], [110.444039341271662, 20.34103261970639], [109.88986128137357, 20.282457383703441], [109.627655063924635, 21.008227037026725], [109.864488153118316, 21.395050970947516], [108.522812941524421, 21.715212307211821], [108.050180291782979, 21.552379869060101], [107.043420037872636, 21.8118989120299], [106.567273390735352, 22.21820486092474], [106.725403273548466, 22.794267889898375], [105.811247186305209, 22.976892401617899], [105.329209425886631, 23.352063300056976], [104.476858351664475, 22.819150092046918], [103.504514601660503, 22.703756618739217], [102.706992222100155, 22.708795070887696], [102.170435825613552, 22.464753119389336], [101.652017856861576, 22.318198757409554], [101.803119744882906, 21.174366766845051], [101.27002566936001, 21.201651923095167], [101.180005324307558, 21.436572984294052], [101.150032993578236, 21.849984442629015], [100.416537713627349, 21.558839423096654], [99.983489211021549, 21.742936713136451], [99.240898878987196, 22.118314317304559], [99.53199222208741, 22.949038804612591], [98.898749220782804, 23.142722072842581], [98.66026248575578, 24.063286037690002], [97.604719679762027, 23.897404690033049], [97.724609002679131, 25.083637193293036], [98.671838006589212, 25.91870250091349], [98.712093947344556, 26.743535874940243], [98.682690057370507, 27.508812160750658], [98.246230910233351, 27.747221381129172], [97.91198774616943, 28.335945136014367], [97.327113885490007, 28.261582749946339], [96.248833449287829, 28.411030992134467], [96.586590610747521, 28.830979519154361], [96.117678664131006, 29.452802028922513], [95.404802280664626, 29.031716620392157], [94.565990431702929, 29.27743805593996], [93.413347609432662, 28.640629380807233], [92.503118931043616, 27.896876329046442], [91.696656528696693, 27.771741848251615], [91.258853794319876, 28.040614325466343], [90.730513950567797, 28.064953925075738], [90.015828891971182, 28.296438503527177], [89.475810174521158, 28.042758897406365], [88.814248488320573, 27.299315904239389], [88.730325962278528, 28.086864732367552], [88.120440708369941, 27.876541652939572], [86.954517043000635, 27.974261786403524], [85.823319940131526, 28.203575954698742], [85.011638218123053, 28.642773952747369], [84.23457970575015, 28.839893703724691], [83.89899295444674, 29.320226141877633], [83.337115106137176, 29.463731594352193], [82.327512648450877, 30.115268052688204], [81.525804477874786, 30.422716986608659], [81.111256138029276, 30.183480943313402], [79.721366815107118, 30.882714748654728], [78.738894484374001, 31.515906073527045], [78.458446486326025, 32.61816437431272], [79.176128777995544, 32.483779812137747], [79.208891636068543, 32.994394639613738], [78.811086460285722, 33.506198025032397], [78.912268914713209, 34.321936346975768], [77.83745079947461, 35.494009507787794], [76.192848341785705, 35.89840342868785], [75.896897414050173, 36.666806138651872], [75.158027785140987, 37.133030910789152], [74.980002475895404, 37.419990139305888], [74.829985792952144, 37.990007025701445], [74.864815708316783, 38.378846340481587], [74.25751427602269, 38.606506862943476], [73.928852166646394, 38.505815334622717], [73.675379266254836, 39.431236884105566], [73.960013055318427, 39.660008449861714], [73.822243686828315, 39.893973497063136], [74.776862420556043, 40.366425279291619], [75.467827996730719, 40.56207225194867], [76.526368035797432, 40.427946071935132], [76.90448449087711, 41.066485907549648], [78.187196893226044, 41.185315863604799], [78.543660923175253, 41.582242540038713], [80.119430373051401, 42.12394074153822], [80.259990268885318, 42.34999929459908], [80.180150180994374, 42.920067857426844], [80.866206496101213, 43.180362046881008], [79.966106398441426, 44.917516994804622], [81.947070753918084, 45.317027492853143], [82.458925815769035, 45.539649563166499], [83.180483839860543, 47.330031236350735], [85.164290399113213, 47.000955715516099], [85.720483839870667, 47.452969468773077], [85.76823286330837, 48.455750637396896], [86.59877648310335, 48.549181626980605], [87.359970330762692, 49.214980780629148], [87.751264276076668, 49.297197984405464], [88.013832228551678, 48.599462795600594], [88.854297723346747, 48.069081732773007], [90.280825636763893, 47.693549099307901], [90.970809360724957, 46.88814606382293], [90.585768263718307, 45.719716091487491], [90.945539585334316, 45.286073309910243], [92.133890822318222, 45.115075995456429], [93.480733677141316, 44.97547211362], [94.688928664125356, 44.352331854828456], [95.306875441471504, 44.241330878265458], [95.762454868556688, 43.319449164394619], [96.349395786527808, 42.725635280928643], [97.451757440177971, 42.74888967546007], [99.515817498779995, 42.524691473961688], [100.845865513108279, 42.663804429691417], [101.833040399179936, 42.51487295182627], [103.312278273534787, 41.907468166667613], [104.522281935649005, 41.90834666601662], [104.964993931093431, 41.597409572916334], [106.129315627061658, 42.134327704428891], [107.744772576937976, 42.481515814781908], [109.243595819131428, 42.519446316084149], [110.412103306115299, 42.871233628911014], [111.129682244920218, 43.406834011400171], [111.82958784388137, 43.743118394539486], [111.667737257943202, 44.073175767587706], [111.348376906379428, 44.457441718110047], [111.87330610560025, 45.102079372735112], [112.436062453258842, 45.01164561622425], [113.463906691544196, 44.808893134127111], [114.46033165899604, 45.339816799493875], [115.985096470200133, 45.727235012386004], [116.717868280098855, 46.38820241961524], [117.421701287914246, 46.67273285581421], [118.874325799638711, 46.805412095723646], [119.663269891438745, 46.692679958678944], [119.772823927897562, 47.048058783550132], [118.866574334794947, 47.747060044946195], [118.064142694166719, 48.06673045510373], [117.295507440257438, 47.697709052107385], [116.308952671373234, 47.853410142602812], [115.742837355615734, 47.726544501326273], [115.485282017073018, 48.135382595403442], [116.191802199367601, 49.134598090199056], [116.67880089728618, 49.888531399121398], [117.879244419426371, 49.510983384796944], [119.288460728025839, 50.142882798862033], [119.279365675942358, 50.582907619827282], [120.182049595216924, 51.64356639261802], [120.738191359541972, 51.964115302124547], [120.725789015791975, 52.516226304730814], [120.177088657716865, 52.753886216841195], [121.003084751470226, 53.251401068731226], [122.245747918792858, 53.431725979213681], [123.571506789240843, 53.458804429734627], [125.068211297710434, 53.161044826868832], [125.946348911646169, 52.792798570356936], [126.564399041856959, 51.784255479532689], [126.939156528837657, 51.353894151405896], [127.287455682484904, 50.739797268265434], [127.657407261262378, 49.760270494172929]]]] } },
-            { "type": "Feature", "properties": { "admin": "Ivory Coast", "name": "C�te d'Ivoire", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-2.856125047202397, 4.994475816259508], [-3.311084357100071, 4.984295559098014], [-4.008819545904941, 5.179813340674314], [-4.64991736491791, 5.168263658057084], [-5.834496222344525, 4.993700669775135], [-6.528769090185845, 4.705087795425015], [-7.518941209330434, 4.338288479017307], [-7.712159389669749, 4.364565944837721], [-7.63536821128403, 5.188159084489455], [-7.53971513511176, 5.313345241716517], [-7.570152553731686, 5.707352199725903], [-7.993692592795879, 6.126189683451541], [-8.311347622094017, 6.193033148621081], [-8.602880214868618, 6.467564195171659], [-8.385451626000572, 6.911800645368742], [-8.485445522485348, 7.395207831243068], [-8.439298468448696, 7.686042792181736], [-8.280703497744936, 7.687179673692156], [-8.221792364932197, 8.123328762235571], [-8.299048631208562, 8.316443589710302], [-8.203498907900878, 8.455453192575446], [-7.832100389019186, 8.575704250518625], [-8.079113735374348, 9.376223863152033], [-8.309616461612249, 9.789531968622439], [-8.22933712404682, 10.129020290563897], [-8.029943610048617, 10.206534939001711], [-7.89958980959237, 10.297382106970824], [-7.622759161804808, 10.147236232946792], [-6.850506557635057, 10.138993841996237], [-6.666460944027547, 10.430810655148447], [-6.493965013037267, 10.411302801958268], [-6.205222947606429, 10.524060777219132], [-6.050452032892266, 10.096360785355442], [-5.816926235365286, 10.222554633012191], [-5.404341599946973, 10.370736802609144], [-4.954653286143098, 10.152713934769732], [-4.779883592131966, 9.821984768101741], [-4.330246954760383, 9.610834865757139], [-3.980449184576684, 9.862344061721698], [-3.511898972986272, 9.900326239456216], [-2.827496303712706, 9.642460842319775], [-2.56218950032624, 8.219627793811481], [-2.983584967450326, 7.379704901555511], [-3.244370083011261, 6.2504715031135], [-2.810701463217839, 5.389051215024109], [-2.856125047202397, 4.994475816259508]]] } },
-            { "type": "Feature", "properties": { "admin": "Cameroon", "name": "Cameroon", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[13.07582238124675, 2.267097072759014], [12.951333855855605, 2.321615708826939], [12.359380323952218, 2.19281220133945], [11.751665480199787, 2.326757513839993], [11.276449008843711, 2.261050930180871], [9.649158155972627, 2.283866075037735], [9.795195753629455, 3.073404445809117], [9.404366896205998, 3.734526882335202], [8.948115675501068, 3.904128933117135], [8.744923943729416, 4.352215277519959], [8.488815545290889, 4.495617377129917], [8.500287713259693, 4.771982937026847], [8.757532993208626, 5.47966583904791], [9.233162876023043, 6.444490668153334], [9.522705926154398, 6.453482367372116], [10.118276808318255, 7.038769639509879], [10.497375115611417, 7.055357774275562], [11.058787876030349, 6.644426784690593], [11.745774366918509, 6.981382961449753], [11.839308709366801, 7.397042344589434], [12.063946160539556, 7.799808457872301], [12.218872104550597, 8.305824082874322], [12.753671502339214, 8.717762762888993], [12.955467970438971, 9.417771714714702], [13.1675997249971, 9.64062632897341], [13.308676385153914, 10.160362046748926], [13.572949659894558, 10.798565985553564], [14.415378859116682, 11.572368882692071], [14.468192172918974, 11.90475169519341], [14.57717776862253, 12.085360826053501], [14.181336297266792, 12.483656927943112], [14.213530714584634, 12.802035427293344], [14.495787387762842, 12.859396267137326], [14.893385857816522, 12.219047756392582], [14.960151808337598, 11.555574042197222], [14.923564894274955, 10.891325181517471], [15.467872755605269, 9.982336737503429], [14.909353875394713, 9.99212942142273], [14.627200555081057, 9.920919297724536], [14.171466098699025, 10.021378282099928], [13.954218377344002, 9.549494940626685], [14.544466586981766, 8.965861314322266], [14.979995558337688, 8.796104234243471], [15.120865512765331, 8.382150173369423], [15.436091749745765, 7.692812404811971], [15.279460483469107, 7.421924546737968], [14.776545444404572, 6.408498033062044], [14.536560092841111, 6.22695872642069], [14.459407179429345, 5.451760565610299], [14.558935988023501, 5.03059764243153], [14.478372430080466, 4.732605495620446], [14.950953403389658, 4.21038930909492], [15.036219516671249, 3.851367295747123], [15.405395948964379, 3.335300604664339], [15.862732374747479, 3.013537298998982], [15.907380812247649, 2.557389431158612], [16.01285241055535, 2.267639675298084], [15.940918816805061, 1.727672634280295], [15.14634199388524, 1.964014797367184], [14.337812534246577, 2.22787466064949], [13.07582238124675, 2.267097072759014]]] } },
-            { "type": "Feature", "properties": { "admin": "Democratic Republic of the Congo", "name": "Dem. Rep. Congo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[30.833859897593801, 3.50916596111034], [30.773346795380036, 2.339883327642127], [31.174149204235807, 2.204465236821263], [30.852670118948048, 1.849396470543809], [30.468507521290292, 1.58380544677972], [30.086153598762703, 1.062312730306288], [29.875778842902488, 0.597379868976304], [29.819503208136634, -0.205310153813372], [29.587837762172164, -0.58740569417948], [29.579466180140876, -1.341313164885626], [29.29188683443661, -1.620055840667987], [29.254834832483336, -2.215109958508911], [29.117478875451546, -2.292211195488384], [29.02492638521678, -2.839257907730157], [29.276383904749046, -3.293907159034063], [29.339997592900342, -4.499983412294092], [29.519986606572925, -5.419978936386313], [29.41999271008816, -5.939998874539432], [29.620032179490003, -6.520015150583424], [30.199996779101692, -7.079980970898161], [30.740015496551781, -8.340007419470913], [30.34608605319081, -8.238256524288216], [29.002912225060467, -8.40703175215347], [28.734866570762495, -8.526559340044576], [28.449871046672818, -9.164918308146083], [28.673681674928922, -9.605924981324931], [28.496069777141763, -10.789883721564044], [28.372253045370421, -11.793646742401389], [28.642417433392346, -11.971568698782312], [29.341547885869087, -12.36074391037241], [29.616001417771223, -12.178894545137307], [29.699613885219485, -13.257226657771827], [28.934285922976834, -13.248958428605132], [28.52356163912102, -12.698604424696679], [28.15510867687998, -12.272480564017894], [27.38879886242378, -12.132747491100663], [27.164419793412456, -11.608748467661071], [26.55308759939961, -11.924439792532125], [25.752309604604726, -11.784965101776356], [25.418118116973197, -11.330935967659958], [24.783169793402948, -11.238693536018962], [24.314516228947948, -11.262826429899269], [24.257155389103982, -10.951992689663655], [23.912215203555714, -10.926826267137512], [23.456790805767433, -10.867863457892481], [22.837345411884733, -11.017621758674329], [22.402798292742371, -10.99307545333569], [22.155268182064304, -11.084801120653768], [22.208753289486388, -9.894796237836507], [21.87518191904234, -9.523707777548564], [21.801801385187897, -8.908706556842978], [21.949130893652036, -8.305900974158275], [21.746455926203303, -7.920084730667147], [21.728110792739695, -7.2908724910813], [20.514748162526498, -7.299605808138629], [20.601822950938292, -6.93931772219968], [20.091621534920645, -6.943090101756993], [20.037723016040214, -7.116361179231644], [19.417502475673157, -7.155428562044297], [19.166613396896107, -7.738183688999753], [19.016751743249664, -7.988245944860132], [18.464175652752683, -7.847014255406442], [18.134221632569048, -7.98767750410492], [17.472970004962232, -8.068551120641699], [17.089995965247166, -7.545688978712525], [16.860190870845198, -7.222297865429984], [16.573179965896141, -6.622644545115087], [16.326528354567042, -5.877470391466267], [13.375597364971892, -5.864241224799548], [13.02486941900696, -5.984388929878157], [12.735171339578695, -5.965682061388497], [12.322431674863507, -6.100092461779658], [12.182336866920249, -5.789930515163837], [12.436688266660866, -5.684303887559245], [12.468004184629734, -5.248361504745003], [12.631611769265788, -4.991271254092935], [12.995517205465173, -4.781103203961883], [13.258240187237044, -4.882957452009165], [13.600234816144676, -4.500138441590969], [14.144956088933295, -4.510008640158715], [14.209034864975219, -4.793092136253597], [14.582603794013179, -4.970238946150139], [15.170991652088441, -4.3435071753143], [15.753540073314749, -3.855164890156096], [16.006289503654298, -3.535132744972528], [15.972803175529149, -2.712392266453612], [16.407091912510051, -1.740927015798682], [16.86530683764212, -1.225816338713287], [17.523716261472853, -0.743830254726987], [17.638644646889983, -0.424831638189246], [17.663552687254676, -0.058083998213817], [17.826540154703245, 0.288923244626105], [17.774191928791563, 0.855658677571085], [17.89883548347958, 1.741831976728278], [18.09427575040743, 2.365721543788055], [18.39379235197114, 2.90044342692822], [18.453065219809925, 3.504385891123348], [18.542982211997778, 4.201785183118317], [18.932312452884755, 4.709506130385973], [19.467783644293146, 5.031527818212779], [20.290679152108932, 4.691677761245287], [20.927591180106273, 4.322785549329736], [21.659122755630019, 4.224341945813719], [22.405123732195531, 4.02916006104732], [22.704123569436284, 4.633050848810156], [22.841479526468103, 4.710126247573483], [23.297213982850135, 4.609693101414221], [24.41053104014625, 5.108784084489129], [24.805028924262409, 4.897246608902349], [25.128833449003274, 4.927244777847789], [25.278798455514302, 5.170408229997191], [25.650455356557465, 5.256087754737123], [26.402760857862535, 5.150874538590869], [27.044065382604703, 5.127852688004835], [27.374226108517483, 5.233944403500059], [27.979977247842807, 4.408413397637373], [28.428993768026906, 4.287154649264493], [28.696677687298795, 4.455077215996936], [29.159078403446497, 4.38926727947323], [29.715995314256013, 4.600804755060024], [29.953500197069467, 4.173699042167683], [30.833859897593801, 3.50916596111034]]] } },
-            { "type": "Feature", "properties": { "admin": "Republic of Congo", "name": "Congo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[12.995517205465173, -4.781103203961883], [12.620759718484491, -4.438023369976135], [12.318607618873923, -4.606230157086187], [11.914963006242086, -5.037986748884789], [11.093772820691923, -3.978826592630546], [11.855121697648114, -3.42687061932105], [11.478038771214299, -2.765618991714241], [11.820963575903189, -2.514161472181982], [12.495702752338159, -2.391688327650242], [12.575284458067639, -1.948511244315134], [13.109618767965626, -2.428740329603513], [13.992407260807706, -2.470804945489099], [14.299210239324564, -1.998275648612213], [14.425455763413593, -1.333406670744971], [14.316418491277741, -0.552627455247048], [13.843320753645653, 0.038757635901149], [14.276265903386953, 1.196929836426619], [14.026668735417214, 1.395677395021153], [13.282631463278816, 1.31418366129688], [13.003113641012074, 1.830896307783319], [13.07582238124675, 2.267097072759014], [14.337812534246577, 2.22787466064949], [15.14634199388524, 1.964014797367184], [15.940918816805061, 1.727672634280295], [16.01285241055535, 2.267639675298084], [16.537058139724135, 3.198254706226278], [17.133042433346297, 3.728196519379451], [17.809900343505259, 3.560196437998569], [18.453065219809925, 3.504385891123348], [18.39379235197114, 2.90044342692822], [18.09427575040743, 2.365721543788055], [17.89883548347958, 1.741831976728278], [17.774191928791563, 0.855658677571085], [17.826540154703245, 0.288923244626105], [17.663552687254676, -0.058083998213817], [17.638644646889983, -0.424831638189246], [17.523716261472853, -0.743830254726987], [16.86530683764212, -1.225816338713287], [16.407091912510051, -1.740927015798682], [15.972803175529149, -2.712392266453612], [16.006289503654298, -3.535132744972528], [15.753540073314749, -3.855164890156096], [15.170991652088441, -4.3435071753143], [14.582603794013179, -4.970238946150139], [14.209034864975219, -4.793092136253597], [14.144956088933295, -4.510008640158715], [13.600234816144676, -4.500138441590969], [13.258240187237044, -4.882957452009165], [12.995517205465173, -4.781103203961883]]] } },
-            { "type": "Feature", "properties": { "admin": "Colombia", "name": "Colombia", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-75.373223232713841, -0.15203175212045], [-75.801465827116587, 0.084801337073202], [-76.292314419240938, 0.416047268064119], [-76.576379767549383, 0.256935533037435], [-77.424984300430367, 0.395686753741117], [-77.668612840470416, 0.825893052570961], [-77.855061408179509, 0.809925034992773], [-78.855258755188686, 1.380923773601822], [-78.990935228171026, 1.691369940595251], [-78.617831387023699, 1.766404120283056], [-78.662118089497838, 2.267355454920476], [-78.427610439757302, 2.629555568854215], [-77.931542527971473, 2.696605739752925], [-77.510431281224996, 3.325016994638246], [-77.127689785455246, 3.849636135265356], [-77.496271938776999, 4.087606105969427], [-77.307601284479375, 4.667984117039452], [-77.533220587865713, 5.582811997902496], [-77.318815070286718, 5.845354112161359], [-77.476660732722266, 6.691116441266301], [-77.881571417945239, 7.223771267114783], [-77.75341386586139, 7.709839789252141], [-77.431107957656977, 7.638061224798733], [-77.242566494440069, 7.935278225125442], [-77.474722866511314, 8.524286200388216], [-77.353360765273848, 8.670504665558068], [-76.836673957003541, 8.638749497914715], [-76.086383836557843, 9.336820583529486], [-75.674600185840035, 9.443248195834597], [-75.664704149056149, 9.774003200718736], [-75.480425991503338, 10.618990383339305], [-74.906895107711975, 11.08304474532032], [-74.276752692344871, 11.102035834187586], [-74.197222663047683, 11.310472723836865], [-73.414763963500278, 11.227015285685479], [-72.62783525255962, 11.731971543825519], [-72.238194953078903, 11.955549628136325], [-71.754090135368628, 12.437303168177305], [-71.399822353791691, 12.376040757695289], [-71.137461107045866, 12.112981879113503], [-71.331583624950284, 11.776284084515805], [-71.973921678338272, 11.608671576377116], [-72.227575446242923, 11.108702093953237], [-72.614657762325194, 10.821975409381777], [-72.905286017534692, 10.45034434655477], [-73.027604132769554, 9.736770331252441], [-73.304951544880026, 9.151999823437604], [-72.788729824500379, 9.085027167187331], [-72.660494757768092, 8.62528778730268], [-72.439862230097944, 8.405275376820027], [-72.360900641555958, 8.002638454617893], [-72.479678921178831, 7.632506008327352], [-72.444487270788059, 7.42378489830048], [-72.19835242378187, 7.340430813013682], [-71.960175747348629, 6.991614895043538], [-70.674233567981503, 7.087784735538717], [-70.093312954372408, 6.960376491723109], [-69.389479946557103, 6.099860541198835], [-68.985318569602327, 6.206804917826856], [-68.265052456318216, 6.153268133972473], [-67.695087246355001, 6.267318020040645], [-67.34143958196556, 6.095468044454021], [-67.521531948502741, 5.556870428891968], [-67.744696621355203, 5.221128648291667], [-67.823012254493534, 4.503937282728898], [-67.621835903581271, 3.839481716319994], [-67.33756384954367, 3.542342230641721], [-67.303173183853417, 3.31845408773718], [-67.809938117123693, 2.820655015469569], [-67.447092047786299, 2.600280869960869], [-67.181294318293041, 2.250638129074062], [-66.876325853122566, 1.253360500489336], [-67.065048183852483, 1.130112209473225], [-67.25999752467358, 1.719998684084956], [-67.537810024674684, 2.037162787276329], [-67.868565029558823, 1.692455145673392], [-69.816973232691609, 1.714805202639624], [-69.804596727157701, 1.089081122233466], [-69.218637661400166, 0.985676581217433], [-69.252434048119042, 0.602650865070075], [-69.452396002872447, 0.706158758950693], [-70.015565761989293, 0.541414292804205], [-70.02065589057004, -0.185156345219539], [-69.577065395776586, -0.549991957200163], [-69.420485805932216, -1.122618503426409], [-69.444101935489599, -1.556287123219817], [-69.893635219996611, -4.298186944194326], [-70.394043952094975, -3.766591485207825], [-70.692682054309699, -3.742872002785858], [-70.047708502874841, -2.725156345229699], [-70.813475714791949, -2.256864515800742], [-71.413645799429773, -2.342802422702128], [-71.774760708285385, -2.169789727388937], [-72.325786505813639, -2.434218031426453], [-73.070392218707212, -2.308954359550952], [-73.659503546834586, -1.260491224781134], [-74.122395189089048, -1.002832533373848], [-74.441600511355958, -0.530820000819887], [-75.106624518520064, -0.05720549886486], [-75.373223232713841, -0.15203175212045]]] } },
-            { "type": "Feature", "properties": { "admin": "Costa Rica", "name": "Costa Rica", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-82.965783047197348, 8.225027980985983], [-83.508437262694287, 8.446926581247281], [-83.711473965169063, 8.656836249216864], [-83.596313035806631, 8.830443223501417], [-83.632641567707822, 9.051385809765319], [-83.909885626953724, 9.290802720573579], [-84.303401658856345, 9.487354030795712], [-84.64764421256865, 9.615537421095707], [-84.713350796227743, 9.908051866083849], [-84.975660366541319, 10.086723130733004], [-84.911374884770211, 9.795991522658921], [-85.110923428065291, 9.557039699741308], [-85.339488288092255, 9.834542141148658], [-85.660786505866966, 9.93334747969072], [-85.797444831062819, 10.134885565629032], [-85.791708747078417, 10.439337266476612], [-85.65931372754666, 10.754330959511718], [-85.941725430021748, 10.895278428587799], [-85.712540452807289, 11.088444932494822], [-85.561851976244171, 11.217119248901593], [-84.903003302738924, 10.952303371621895], [-84.673069017256239, 11.082657172078139], [-84.355930752281026, 10.999225572142901], [-84.190178595704822, 10.793450018756671], [-83.895054490885926, 10.726839097532444], [-83.655611741861563, 10.938764146361418], [-83.402319708982944, 10.39543813724465], [-83.015676642575158, 9.992982082555553], [-82.546196255203469, 9.566134751824674], [-82.932890998043561, 9.476812038608172], [-82.927154914059145, 9.074330145702914], [-82.719183112300513, 8.925708726431493], [-82.868657192704759, 8.807266343618521], [-82.829770677405151, 8.626295477732368], [-82.9131764391242, 8.423517157419068], [-82.965783047197348, 8.225027980985983]]] } },
-            { "type": "Feature", "properties": { "admin": "Cuba", "name": "Cuba", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-82.268151211257035, 23.188610744717703], [-81.404457160146819, 23.117271429938775], [-80.61876868358118, 23.105980129482994], [-79.679523688460222, 22.765303249598823], [-79.281485968732071, 22.399201565027049], [-78.347434455056472, 22.512166246017085], [-77.993295864560253, 22.277193508385928], [-77.146422492161037, 21.657851467367831], [-76.523824835908528, 21.20681956632437], [-76.194620123993175, 21.220565497314006], [-75.598222418912655, 21.01662445727413], [-75.671060350228032, 20.735091254147999], [-74.933896043584483, 20.693905137611381], [-74.178024868451246, 20.284627793859737], [-74.296648118777242, 20.050378526280678], [-74.961594611292924, 19.923435370355687], [-75.634680141894577, 19.873774318923193], [-76.323656175425981, 19.952890936762056], [-77.755480923153044, 19.855480861891873], [-77.085108405246729, 20.413353786698789], [-77.492654588516601, 20.673105373613886], [-78.137292243141573, 20.739948838783427], [-78.482826707661161, 21.028613389565848], [-78.719866502583997, 21.598113511638431], [-79.284999966127913, 21.559175319906497], [-80.217475348618635, 21.827324327069032], [-80.517534552721401, 22.037078965741756], [-81.820943366203167, 22.192056586185068], [-82.169991828118611, 22.387109279870746], [-81.79500179719264, 22.636964830001951], [-82.775897996740838, 22.688150336187057], [-83.494458787759328, 22.168517971276124], [-83.908800421875611, 22.154565334557329], [-84.052150845053248, 21.910575059491251], [-84.547030198896351, 21.801227728761639], [-84.974911058273079, 21.896028143801082], [-84.44706214062775, 22.204949856041903], [-84.23035702181177, 22.56575470630376], [-83.778239915690165, 22.78811839445569], [-83.267547573565736, 22.983041897060641], [-82.510436164057495, 23.078746649665181], [-82.268151211257035, 23.188610744717703]]] } },
-            { "type": "Feature", "properties": { "admin": "Northern Cyprus", "name": "N. Cyprus", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[32.731780226377445, 35.14002594658843], [32.802473585752743, 35.145503648411363], [32.946960890440799, 35.38670339613369], [33.667227003724939, 35.373215847305509], [34.576473829900458, 35.671595567358786], [33.900804477684197, 35.245755927057608], [33.973616570783456, 35.058506374647997], [33.866439650210104, 35.093594672174177], [33.675391880027057, 35.017862860650446], [33.525685255677494, 35.038688462864066], [33.475817498515845, 35.000344550103499], [33.45592207208346, 35.101423651666401], [33.383833449036295, 35.162711900364563], [33.190977003723042, 35.173124701471373], [32.919572381326127, 35.087832749973636], [32.731780226377445, 35.14002594658843]]] } },
-            { "type": "Feature", "properties": { "admin": "Cyprus", "name": "Cyprus", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[33.973616570783456, 35.058506374647997], [34.004880812320032, 34.978097846001852], [32.97982710137844, 34.571869411755436], [32.490296258277532, 34.701654771456468], [32.256667107885953, 35.103232326796622], [32.731780226377445, 35.14002594658843], [32.919572381326127, 35.087832749973636], [33.190977003723042, 35.173124701471373], [33.383833449036295, 35.162711900364563], [33.45592207208346, 35.101423651666401], [33.475817498515845, 35.000344550103499], [33.525685255677494, 35.038688462864066], [33.675391880027057, 35.017862860650446], [33.866439650210104, 35.093594672174177], [33.973616570783456, 35.058506374647997]]] } },
-            { "type": "Feature", "properties": { "admin": "Czech Republic", "name": "Czech Rep.", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.960288120194573, 48.596982326850593], [16.49928266771877, 48.785808010445095], [16.029647251050218, 48.733899034207916], [15.253415561593979, 49.039074205107575], [14.901447381254055, 48.964401760445817], [14.33889773932472, 48.555305284207193], [13.595945672264433, 48.877171942737135], [13.031328973043427, 49.307068182973232], [12.52102420416119, 49.54741526956272], [12.415190870827441, 49.96912079528056], [12.240111118222556, 50.266337795607271], [12.96683678554319, 50.484076443069071], [13.338131951560282, 50.733234361364346], [14.05622765468817, 50.926917629594286], [14.307013380600633, 51.117267767941399], [14.570718214586062, 51.002339382524262], [15.016995883858666, 51.106674099321566], [15.490972120839725, 50.7847299261432], [16.238626743238566, 50.697732652379827], [16.176253289462263, 50.4226073268579], [16.719475945714429, 50.215746568393527], [16.868769158605655, 50.473973700556016], [17.554567091551117, 50.36214590107641], [17.649445021238986, 50.049038397819942], [18.392913852622168, 49.988628648470737], [18.85314415861361, 49.496229763377634], [18.554971144289478, 49.495015367218777], [18.399993523846174, 49.315000515330034], [18.170498488037961, 49.271514797556421], [18.104972771891848, 49.043983466175298], [17.913511590250462, 48.996492824899072], [17.886484816161808, 48.903475246773695], [17.545006951577101, 48.800019029325362], [17.101984897538895, 48.8169688991171], [16.960288120194573, 48.596982326850593]]] } },
-            { "type": "Feature", "properties": { "admin": "Germany", "name": "Germany", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[9.92190636560923, 54.983104153048025], [9.939579705452898, 54.596641954153242], [10.950112338920517, 54.363607082733147], [10.939466993868447, 54.008693345752583], [11.95625247564328, 54.196485500701144], [12.518440382546711, 54.470370591847988], [13.647467075259495, 54.075510972705885], [14.119686313542555, 53.757029120491026], [14.353315463934164, 53.248171291713092], [14.074521111719431, 52.981262518925334], [14.437599725002197, 52.62485016540829], [14.685026482815713, 52.089947414755208], [14.607098422919645, 51.745188096719964], [15.016995883858781, 51.106674099321701], [14.570718214586119, 51.002339382524369], [14.307013380600662, 51.117267767941364], [14.05622765468831, 50.92691762959435], [13.338131951560397, 50.733234361364268], [12.966836785543249, 50.484076443069164], [12.240111118222668, 50.266337795607214], [12.41519087082747, 49.969120795280602], [12.521024204161332, 49.547415269562741], [13.031328973043513, 49.307068182973232], [13.595945672264575, 48.877171942737156], [13.243357374737112, 48.416114813829026], [12.884102817443873, 48.289145819687846], [13.025851271220514, 47.637583523135945], [12.93262698736606, 47.467645575543983], [12.620759718484519, 47.672387600284409], [12.141357456112869, 47.703083401065768], [11.426414015354847, 47.523766181013045], [10.544504021861597, 47.566399237653783], [10.402083774465321, 47.302487697939164], [9.896068149463188, 47.58019684507569], [9.594226108446376, 47.525058091820185], [8.522611932009793, 47.830827541691342], [8.317301466514092, 47.613579820336263], [7.466759067422286, 47.620581976911907], [7.59367638513106, 48.333019110703724], [8.099278598674855, 49.017783515003423], [6.658229607783709, 49.201958319691627], [6.186320428094176, 49.4638028021145], [6.242751092156992, 49.90222565367872], [6.043073357781109, 50.128051662794221], [6.156658155958779, 50.803721015010574], [5.988658074577812, 51.85161570902504], [6.589396599970825, 51.85202912048338], [6.842869500362381, 52.228440253297542], [7.092053256873895, 53.14404328064488], [6.905139601274128, 53.482162177130633], [7.100424838905268, 53.693932196662658], [7.936239454793961, 53.748295803433777], [8.121706170289483, 53.527792466844275], [8.800734490604667, 54.02078563090889], [8.572117954145368, 54.395646470754045], [8.526229282270206, 54.962743638725144], [9.282048780971136, 54.830865383516297], [9.92190636560923, 54.983104153048025]]] } },
-            { "type": "Feature", "properties": { "admin": "Djibouti", "name": "Djibouti", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[43.081226027200152, 12.699638576707112], [43.317852410664663, 12.390148423711022], [43.286381463398911, 11.974928290245883], [42.715873650896519, 11.735640570518338], [43.145304803242126, 11.462039699748853], [42.776851841000948, 10.926878566934416], [42.55493000000012, 11.105110000000193], [42.314140000000116, 11.0342], [41.755570000000191, 11.05091], [41.739590000000177, 11.355110000000137], [41.661760000000122, 11.6312], [42.000000000000107, 12.100000000000133], [42.351560000000106, 12.54223000000013], [42.779642368344739, 12.455415757695672], [43.081226027200152, 12.699638576707112]]] } },
-            { "type": "Feature", "properties": { "admin": "Denmark", "name": "Denmark", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[12.690006137755629, 55.60999095318077], [12.089991082414738, 54.800014553437919], [11.043543328504226, 55.36486379660424], [10.90391360845163, 55.779954738988735], [12.370904168353288, 56.111407375708822], [12.690006137755629, 55.60999095318077]]], [[[10.912181837618359, 56.4586213242779], [10.667803989309986, 56.081383368547208], [10.369992710011983, 56.190007229224719], [9.649984978889306, 55.469999498102041], [9.921906365609173, 54.983104153048046], [9.282048780971136, 54.830865383516155], [8.526229282270235, 54.962743638724973], [8.120310906617588, 55.517722683323612], [8.089976840862247, 56.540011705137587], [8.256581658571262, 56.809969387430286], [8.543437534223385, 57.110002753316891], [9.424469028367609, 57.172066148499468], [9.775558709358561, 57.447940782289649], [10.580005730846151, 57.730016587954843], [10.54610599126269, 57.21573273378614], [10.250000034230222, 56.890016181050456], [10.369992710011983, 56.60998159446082], [10.912181837618359, 56.4586213242779]]]] } },
-            { "type": "Feature", "properties": { "admin": "Dominican Republic", "name": "Dominican Rep.", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-71.71236141629295, 19.714455878167353], [-71.587304450146604, 19.884910590082093], [-70.806706102161726, 19.880285549391981], [-70.214364997016119, 19.622885240146157], [-69.950815192327568, 19.647999986240002], [-69.769250047470067, 19.293267116772437], [-69.222125820579862, 19.313214219637096], [-69.254346076113819, 19.015196234609871], [-68.809411994080818, 18.979074408437846], [-68.317943284768958, 18.612197577381689], [-68.689315965434503, 18.205142320218609], [-69.164945848248905, 18.422648423735108], [-69.623987596297624, 18.380712998930246], [-69.952933926051529, 18.428306993071057], [-70.133232998317879, 18.245915025296892], [-70.517137213814195, 18.184290879788829], [-70.669298468697619, 18.42688589118303], [-70.999950120717173, 18.283328762276206], [-71.400209927033885, 17.598564357976596], [-71.657661912712001, 17.757572740138695], [-71.708304816358037, 18.044997056546091], [-71.687737596305865, 18.316660061104468], [-71.945112067335543, 18.616900132720257], [-71.701302659782485, 18.785416978424049], [-71.624873216422813, 19.169837958243303], [-71.71236141629295, 19.714455878167353]]] } },
-            { "type": "Feature", "properties": { "admin": "Algeria", "name": "Algeria", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[11.99950564947161, 23.471668402596443], [8.572893100629782, 21.565660712159136], [5.677565952180684, 19.601206976799713], [4.267419467800038, 19.155265204336995], [3.158133172222704, 19.057364203360034], [3.146661004253899, 19.693578599521441], [2.683588494486428, 19.856230170160114], [2.060990838233919, 20.142233384679482], [1.823227573259032, 20.61080943448604], [-1.550054897457613, 22.792665920497377], [-4.92333736817423, 24.974574082940993], [-8.684399786809051, 27.395744126895998], [-8.66512447756419, 27.58947907155822], [-8.665589565454805, 27.656425889592349], [-8.674116176782972, 28.841288967396572], [-7.059227667661928, 29.579228420524522], [-6.060632290053772, 29.731699734001687], [-5.242129278982786, 30.000443020135581], [-4.859646165374469, 30.501187649043839], [-3.690441046554695, 30.896951605751152], [-3.647497931320145, 31.637294012980668], [-3.068980271812647, 31.724497992473207], [-2.616604783529567, 32.094346218386143], [-1.30789913573787, 32.262888902306095], [-1.124551153966308, 32.651521511357124], [-1.388049282222567, 32.864015000941301], [-1.733454555661467, 33.91971283623198], [-1.792985805661686, 34.527918606091198], [-2.169913702798624, 35.168396307916673], [-1.208602871089056, 35.71484874118709], [-0.127454392894606, 35.888662421200799], [0.503876580415209, 36.301272894835272], [1.466918572606545, 36.605647081034398], [3.161698846050824, 36.783904934225205], [4.815758090849129, 36.865036932923452], [5.320120070017792, 36.716518866516616], [6.261819695672611, 37.110655015606731], [7.330384962603969, 37.118380642234364], [7.737078484741003, 36.885707505840209], [8.420964389691674, 36.946427313783154], [8.217824334352313, 36.433176988260271], [8.376367628623766, 35.479876003555937], [8.140981479534302, 34.655145982393783], [7.524481642292242, 34.097376410451453], [7.612641635782181, 33.344114895148955], [8.430472853233367, 32.748337307255944], [8.439102817426116, 32.506284898400814], [9.055602654668148, 32.102691962201284], [9.482139926805273, 30.307556057246181], [9.805634392952411, 29.424638373323383], [9.859997999723443, 28.959989732371007], [9.683884718472765, 28.144173895779193], [9.756128370816779, 27.688258571884141], [9.629056023811073, 27.140953477480913], [9.716285841519747, 26.512206325785691], [9.319410841518161, 26.094324856057447], [9.910692579801774, 25.365454616796733], [9.948261346077969, 24.93695364023251], [10.30384687667836, 24.37931325937091], [10.771363559622925, 24.562532050061744], [11.560669386449002, 24.097909247325511], [11.99950564947161, 23.471668402596443]]] } },
-            { "type": "Feature", "properties": { "admin": "Ecuador", "name": "Ecuador", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-80.302560594387188, -3.404856459164712], [-79.770293341780913, -2.65751189535964], [-79.986559210922394, -2.220794366061014], [-80.368783942369234, -2.685158786635788], [-80.967765469064332, -2.246942640800703], [-80.764806281238023, -1.965047702648532], [-80.933659023751702, -1.057454522306358], [-80.583370327461239, -0.906662692878683], [-80.39932471385373, -0.283703301600141], [-80.020898200180355, 0.360340074053468], [-80.090609707342097, 0.768428859862396], [-79.542762010399784, 0.982937730305963], [-78.855258755188686, 1.380923773601822], [-77.855061408179509, 0.809925034992773], [-77.668612840470416, 0.825893052570961], [-77.424984300430367, 0.395686753741117], [-76.576379767549383, 0.256935533037435], [-76.292314419240938, 0.416047268064119], [-75.801465827116587, 0.084801337073202], [-75.373223232713841, -0.15203175212045], [-75.233722703741932, -0.911416924649529], [-75.544995693652027, -1.56160979574588], [-76.635394253226707, -2.608677666843817], [-77.83790483265858, -3.003020521663103], [-78.450683966775628, -3.873096612161375], [-78.639897223612323, -4.547784112164072], [-79.205289069317715, -4.959128513207388], [-79.62497921417615, -4.454198093283494], [-80.028908047185581, -4.346090996928893], [-80.442241990872134, -4.425724379090673], [-80.46929460317692, -4.059286797708999], [-80.184014858709645, -3.821161797708043], [-80.302560594387188, -3.404856459164712]]] } },
-            { "type": "Feature", "properties": { "admin": "Egypt", "name": "Egypt", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.9226, 29.50133], [34.64174, 29.09942], [34.42655, 28.34399], [34.15451, 27.8233], [33.92136, 27.6487], [33.58811, 27.97136], [33.13676, 28.41765], [32.42323, 29.85108], [32.32046, 29.76043], [32.73482, 28.70523], [33.34876, 27.69989], [34.10455, 26.14227], [34.47387, 25.59856], [34.79507, 25.03375], [35.69241, 23.92671], [35.49372, 23.75237], [35.52598, 23.10244], [36.69069, 22.20485], [36.86623, 22.0], [32.9, 22.0], [29.02, 22.0], [25.0, 22.0], [25.0, 25.682499996360992], [25.0, 29.238654529533452], [24.70007, 30.04419], [24.95762, 30.6616], [24.80287, 31.08929], [25.16482, 31.56915], [26.49533, 31.58568], [27.45762, 31.32126], [28.45048, 31.02577], [28.91353, 30.87005], [29.68342, 31.18686], [30.09503, 31.4734], [30.97693, 31.55586], [31.68796, 31.4296], [31.96041, 30.9336], [32.19247, 31.26034], [32.99392, 31.02407], [33.7734, 30.96746], [34.26544, 31.21936], [34.9226, 29.50133]]] } },
-            { "type": "Feature", "properties": { "admin": "Eritrea", "name": "Eritrea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[42.351560000000106, 12.54223000000013], [42.00975, 12.86582], [41.59856, 13.452090000000108], [41.15519371924983, 13.773319810435224], [40.8966, 14.118640000000138], [40.026218702969167, 14.519579169162281], [39.34061, 14.53155], [39.0994, 14.74064], [38.51295, 14.50547], [37.90607, 14.959430000000165], [37.59377, 14.2131], [36.42951, 14.42211], [36.323188917798113, 14.822480577041057], [36.753860304518575, 16.291874091044289], [36.852530000000108, 16.95655], [37.16747, 17.263140000000128], [37.904000000000103, 17.42754], [38.410089959473218, 17.998307399970312], [38.990622999839999, 16.84062612555169], [39.266110060388016, 15.922723496967246], [39.814293654140208, 15.435647284400314], [41.179274936697645, 14.491079616753209], [41.734951613132345, 13.921036892141554], [42.276830682144848, 13.34399201095442], [42.589576450375255, 13.000421250861901], [43.081226027200152, 12.699638576707112], [42.779642368344739, 12.455415757695672], [42.351560000000106, 12.54223000000013]]] } },
-            { "type": "Feature", "properties": { "admin": "Spain", "name": "Spain", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-9.034817674180244, 41.880570583659669], [-8.98443315269567, 42.592775173506261], [-9.392883673530644, 43.026624660812686], [-7.978189663108308, 43.748337714200979], [-6.754491746436754, 43.567909450853918], [-5.411886359061596, 43.574239813809669], [-4.347842779955783, 43.403449205085025], [-3.51753170410609, 43.455900783861296], [-1.901351284177764, 43.422802028978332], [-1.502770961910528, 43.034014390630425], [0.338046909190581, 42.579546006839543], [0.701590610363894, 42.795734361332599], [1.826793247087153, 42.343384711265678], [2.985998976258457, 42.473015041669854], [3.039484083680548, 41.892120266276891], [2.091841668312184, 41.226088568683082], [0.810524529635188, 41.014731960609332], [0.721331007499401, 40.678318386389229], [0.106691521819869, 40.123933620762003], [-0.278711310212941, 39.309978135732713], [0.111290724293838, 38.738514309233032], [-0.467123582349103, 38.292365831041138], [-0.683389451490598, 37.642353827457811], [-1.438382127274849, 37.443063666324214], [-2.146452602538119, 36.674144192037282], [-3.415780808923386, 36.658899644511173], [-4.368900926114718, 36.677839056946141], [-4.995219285492211, 36.32470815687963], [-5.377159796561457, 35.946850083961458], [-5.866432257500902, 36.02981659600605], [-6.236693894872174, 36.367677110330327], [-6.520190802425402, 36.942913316387312], [-7.45372555177809, 37.097787583966053], [-7.537105475281022, 37.428904323876232], [-7.166507941099863, 37.803894354802217], [-7.029281175148794, 38.075764065089757], [-7.374092169616317, 38.373058580064914], [-7.098036668313126, 39.03007274022378], [-7.498632371439724, 39.629571031241802], [-7.066591559263527, 39.711891587882768], [-7.026413133156593, 40.184524237624238], [-6.864019944679383, 40.330871893874821], [-6.851126674822551, 41.111082668617513], [-6.389087693700914, 41.381815497394641], [-6.668605515967655, 41.883386949219577], [-7.251308966490822, 41.91834605566504], [-7.422512986673794, 41.792074693359822], [-8.01317460776991, 41.790886135417118], [-8.26385698081779, 42.280468654950326], [-8.671945766626719, 42.134689439454952], [-9.034817674180244, 41.880570583659669]]] } },
-            { "type": "Feature", "properties": { "admin": "Estonia", "name": "Estonia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[24.312862583114615, 57.793423570376966], [24.428927850042154, 58.383413397853275], [24.061198357853179, 58.257374579493394], [23.426560092876681, 58.612753404364618], [23.339795363058641, 59.187240302153363], [24.604214308376182, 59.465853786855007], [25.864189080516631, 59.611090399811324], [26.949135776484518, 59.445803331125767], [27.981114129353237, 59.47538808861286], [28.131699253051742, 59.300825100330904], [27.420166456824941, 58.724581203844224], [27.716685825315714, 57.791899115624354], [27.288184848751509, 57.474528306703817], [26.46353234223778, 57.476388658266316], [25.602809685984365, 57.847528794986559], [25.164593540149262, 57.970156968815175], [24.312862583114615, 57.793423570376966]]] } },
-            { "type": "Feature", "properties": { "admin": "Ethiopia", "name": "Ethiopia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[37.90607, 14.959430000000165], [38.51295, 14.50547], [39.0994, 14.74064], [39.34061, 14.53155], [40.026250000000111, 14.51959], [40.8966, 14.118640000000138], [41.1552, 13.77333], [41.59856, 13.452090000000108], [42.00975, 12.86582], [42.351560000000106, 12.54223000000013], [42.000000000000107, 12.100000000000133], [41.661760000000122, 11.6312], [41.739590000000177, 11.355110000000137], [41.755570000000191, 11.05091], [42.314140000000116, 11.0342], [42.55493000000012, 11.105110000000193], [42.776851841000948, 10.926878566934416], [42.55876, 10.572580000000126], [42.92812, 10.021940000000139], [43.29699, 9.540480000000169], [43.67875, 9.183580000000116], [46.94834, 7.99688], [47.78942, 8.003], [44.9636, 5.001620000000115], [43.66087, 4.95755], [42.769670000000119, 4.252590000000223], [42.12861, 4.234130000000163], [41.855083092644108, 3.918911920483764], [41.171800000000125, 3.91909], [40.768480000000118, 4.257020000000124], [39.854940000000106, 3.83879000000013], [39.559384258765917, 3.422060000000215], [38.89251, 3.50074], [38.67114, 3.61607], [38.436970000000137, 3.58851], [38.120915000000132, 3.598605], [36.85509323800823, 4.447864127672857], [36.159078632855646, 4.447864127672857], [35.817447662353622, 4.776965663462021], [35.817447662353622, 5.338232082790852], [35.298007118233095, 5.506], [34.70702, 6.59422000000012], [34.25032, 6.82607], [34.075100000000184, 7.22595], [33.56829, 7.71334], [32.954180000000228, 7.7849700000001], [33.294800000000116, 8.35458], [33.82550000000014, 8.37916], [33.97498, 8.684560000000145], [33.96162, 9.58358], [34.25745, 10.63009], [34.73115000000012, 10.910170000000106], [34.831630000000125, 11.318960000000116], [35.26049, 12.08286], [35.863630000000164, 12.57828], [36.27022, 13.563330000000118], [36.42951, 14.42211], [37.59377, 14.2131], [37.90607, 14.959430000000165]]] } },
-            { "type": "Feature", "properties": { "admin": "Finland", "name": "Finland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[28.591929559043187, 69.064776923286644], [28.445943637818651, 68.36461294216403], [29.9774263852206, 67.698297024192641], [29.054588657352319, 66.944286200621917], [30.21765, 65.80598], [29.544429559046982, 64.948671576590471], [30.444684686003704, 64.204453436939076], [30.035872430142714, 63.552813625738544], [31.516092156711117, 62.867687486412869], [31.139991082490891, 62.357692776124395], [30.211107212044443, 61.780027777749673], [28.06999759289527, 60.503516547275829], [26.25517296723697, 60.423960679762487], [24.496623976344516, 60.057316392651636], [22.869694858499454, 59.846373196036211], [22.290763787533589, 60.391921291741525], [21.322244093519313, 60.720169989659503], [21.544866163832687, 61.705329494871783], [21.059211053153682, 62.607393296958726], [21.536029493910799, 63.189735012455863], [22.442744174903986, 63.817810370531276], [24.730511508897528, 64.902343655040823], [25.398067661243939, 65.111426500093728], [25.2940430030404, 65.53434642197044], [23.903378533633795, 66.006927395279604], [23.565879754335576, 66.396050930437411], [23.539473097434435, 67.936008612735236], [21.978534783626113, 68.616845608180682], [20.645592889089521, 69.106247260200846], [21.244936150810666, 69.370443020293067], [22.356237827247405, 68.841741441514898], [23.662049594830751, 68.891247463650529], [24.735679152126721, 68.649556789821446], [25.689212680776361, 69.092113755969024], [26.179622023226241, 69.825298977326113], [27.732292107867856, 70.164193020296239], [29.015572950971968, 69.766491197377974], [28.591929559043187, 69.064776923286644]]] } },
-            { "type": "Feature", "properties": { "admin": "Fiji", "name": "Fiji", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[178.3736, -17.33992], [178.71806, -17.62846], [178.55271, -18.15059], [177.93266, -18.28799], [177.38146, -18.16432], [177.28504, -17.72465], [177.67087, -17.38114], [178.12557, -17.50481], [178.3736, -17.33992]]], [[[179.364142661964223, -16.801354076946847], [178.725059362997058, -17.012041674368017], [178.596838595117021, -16.63915], [179.096609362997128, -16.43398427754742], [179.413509362997075, -16.379054277547393], [180.000000000000114, -16.067132663642436], [180.000000000000114, -16.555216566639157], [179.364142661964223, -16.801354076946847]]], [[[-179.917369384765237, -16.501783135649358], [-180.0, -16.555216566639157], [-180.0, -16.067132663642436], [-179.793320109048551, -16.020882256741228], [-179.917369384765237, -16.501783135649358]]]] } },
-            { "type": "Feature", "properties": { "admin": "Falkland Islands", "name": "Falkland Is.", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-61.2, -51.85], [-60.0, -51.25], [-59.15, -51.5], [-58.55, -51.1], [-57.75, -51.55], [-58.05, -51.9], [-59.4, -52.2], [-59.85, -51.85], [-60.7, -52.3], [-61.2, -51.85]]] } },
-            { "type": "Feature", "properties": { "admin": "France", "name": "France", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-52.556424730018378, 2.504705308437053], [-52.939657151894963, 2.124857692875622], [-53.41846513529525, 2.053389187016037], [-53.554839240113481, 2.334896551925964], [-53.778520677288881, 2.376702785650053], [-54.088062506717264, 2.105556545414629], [-54.524754197799737, 2.311848863123785], [-54.271229620975781, 2.738747870286942], [-54.184284023644743, 3.194172268075234], [-54.011503872276812, 3.622569891774857], [-54.3995422023565, 4.212611395683481], [-54.478632981979203, 4.896755682795642], [-53.958044603070917, 5.756548163267808], [-53.618452928264837, 5.646529038918401], [-52.882141282754063, 5.409850979021598], [-51.823342861525916, 4.565768133966144], [-51.657797410678874, 4.156232408053028], [-52.249337531123977, 3.241094468596287], [-52.556424730018378, 2.504705308437053]]], [[[9.560016310269132, 42.152491970379558], [9.229752231491771, 41.380006822264441], [8.77572309737536, 41.583611965494427], [8.544212680707828, 42.256516628583078], [8.746009148807586, 42.628121853193946], [9.390000848028901, 43.009984849614725], [9.560016310269132, 42.152491970379558]]], [[[3.588184441755714, 50.378992418003563], [4.28602298342514, 49.90749664977254], [4.799221632515752, 49.985373033236314], [5.674051954784885, 49.529483547557433], [5.897759230176375, 49.442667141307155], [6.186320428094204, 49.463802802114444], [6.658229607783538, 49.201958319691549], [8.09927859867477, 49.017783515003366], [7.59367638513106, 48.333019110703724], [7.466759067422228, 47.620581976911851], [7.192202182655533, 47.449765529970982], [6.736571079138086, 47.541801255882874], [6.768713820023634, 47.287708238303672], [6.037388950228971, 46.725778713561894], [6.022609490593566, 46.272989813820502], [6.500099724970453, 46.429672756529428], [6.84359297041456, 45.991146552100659], [6.80235517744566, 45.708579820328673], [7.096652459347835, 45.333098863295859], [6.749955275101711, 45.028517971367584], [7.007562290076661, 44.254766750661382], [7.549596388386161, 44.127901109384808], [7.435184767291841, 43.693844916349164], [6.529245232783068, 43.12889232031835], [4.556962517931395, 43.399650987311581], [3.100410597352719, 43.075200507167118], [2.985998976258486, 42.473015041669882], [1.826793247087181, 42.343384711265649], [0.701590610363922, 42.795734361332642], [0.338046909190581, 42.57954600683955], [-1.502770961910471, 43.034014390630482], [-1.901351284177735, 43.422802028978332], [-1.384225226232956, 44.022610378590166], [-1.193797573237361, 46.014917710954862], [-2.225724249673788, 47.064362697938201], [-2.963276129559573, 47.570326646507958], [-4.491554938159481, 47.95495433205641], [-4.592349819344746, 48.68416046812694], [-3.295813971357745, 48.901692409859628], [-1.616510789384932, 48.644421291694577], [-1.933494025063254, 49.776341864615759], [-0.98946895995536, 49.347375800160869], [1.338761020522753, 50.127173163445256], [1.6390010921385, 50.9466063502975], [2.51357303224617, 51.14850617126185], [2.65842207196033, 50.796848049515646], [3.123251580425716, 50.780363267614504], [3.588184441755714, 50.378992418003563]]]] } },
-            { "type": "Feature", "properties": { "admin": "Gabon", "name": "Gabon", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[11.093772820691923, -3.978826592630546], [10.066135288135738, -2.969482517105681], [9.405245395554969, -2.144313246269042], [8.797995639693168, -1.111301364754496], [8.830086704146423, -0.779073581550037], [9.048419630579586, -0.459351494960217], [9.291350538783687, 0.268666083167687], [9.492888624721981, 1.010119533691494], [9.83028405115564, 1.067893784993799], [11.285078973036461, 1.057661851400013], [11.276449008843711, 2.261050930180871], [11.751665480199787, 2.326757513839993], [12.359380323952218, 2.19281220133945], [12.951333855855605, 2.321615708826939], [13.07582238124675, 2.267097072759014], [13.003113641012074, 1.830896307783319], [13.282631463278816, 1.31418366129688], [14.026668735417214, 1.395677395021153], [14.276265903386953, 1.196929836426619], [13.843320753645653, 0.038757635901149], [14.316418491277741, -0.552627455247048], [14.425455763413593, -1.333406670744971], [14.299210239324564, -1.998275648612213], [13.992407260807706, -2.470804945489099], [13.109618767965626, -2.428740329603513], [12.575284458067639, -1.948511244315134], [12.495702752338159, -2.391688327650242], [11.820963575903189, -2.514161472181982], [11.478038771214299, -2.765618991714241], [11.855121697648114, -3.42687061932105], [11.093772820691923, -3.978826592630546]]] } },
-            { "type": "Feature", "properties": { "admin": "United Kingdom", "name": "United Kingdom", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-5.661948614921896, 54.554603176483838], [-6.197884894220976, 53.867565009163329], [-6.953730231137994, 54.073702297575622], [-7.572167934591078, 54.059956366585979], [-7.366030646178785, 54.595840969452688], [-7.572167934591078, 55.131622219454883], [-6.733847011736144, 55.172860012423783], [-5.661948614921896, 54.554603176483838]]], [[[-3.00500484863528, 58.635000108466322], [-4.073828497728015, 57.55302480735525], [-3.055001796877661, 57.690019029360933], [-1.959280564776918, 57.684799709699512], [-2.219988165689301, 56.870017401753515], [-3.119003058271118, 55.97379303651546], [-2.085009324543023, 55.909998480851264], [-2.005675679673856, 55.804902850350217], [-1.11499101399221, 54.624986477265388], [-0.4304849918542, 54.464376125702145], [0.184981316742039, 53.325014146531018], [0.469976840831777, 52.929999498091959], [1.681530795914739, 52.739520168663987], [1.559987827164377, 52.099998480836], [1.050561557630914, 51.806760565795678], [1.4498653499503, 51.289427802121949], [0.550333693045502, 50.765738837275862], [-0.787517462558639, 50.774988918656206], [-2.489997524414377, 50.500018622431227], [-2.956273972984035, 50.696879991247002], [-3.617448085942327, 50.228355617872708], [-4.542507900399243, 50.341837063185658], [-5.245023159191134, 49.959999904981082], [-5.776566941745299, 50.159677639356815], [-4.309989793301837, 51.210001125689146], [-3.414850633142122, 51.426008612669236], [-3.422719467108322, 51.426848167406078], [-4.984367234710873, 51.593466091510962], [-5.267295701508885, 51.991400458374571], [-4.222346564134852, 52.30135569926135], [-4.770013393564112, 52.840004991255611], [-4.579999152026914, 53.495003770555165], [-3.093830673788658, 53.404547400669671], [-3.092079637047106, 53.404440822963544], [-2.945008510744343, 53.98499970154667], [-3.614700825433033, 54.60093677329256], [-3.63000545898933, 54.615012925833], [-4.844169073903003, 54.790971177786837], [-5.082526617849224, 55.061600653699358], [-4.719112107756643, 55.508472601943467], [-5.047980922862108, 55.783985500707516], [-5.586397670911139, 55.311146145236805], [-5.64499874513018, 56.275014960344791], [-6.149980841486352, 56.785009670633528], [-5.78682471355529, 57.818848375064633], [-5.009998745127574, 58.630013332750039], [-4.211494513353555, 58.550845038479153], [-3.00500484863528, 58.635000108466322]]]] } },
-            { "type": "Feature", "properties": { "admin": "Georgia", "name": "Georgia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[41.55408410011065, 41.535656236327561], [41.703170607272703, 41.962942816732912], [41.453470086438379, 42.645123399417926], [40.875469191253785, 43.013628038091277], [40.321394484220313, 43.128633938156831], [39.955008579270917, 43.434997666999216], [40.07696495947976, 43.553104153002309], [40.922184686045618, 43.38215851498078], [42.394394565608806, 43.220307929042619], [43.756016880067378, 42.74082815202248], [43.931199985536828, 42.554973863284758], [44.537622918481979, 42.71199270280362], [45.470279168485703, 42.502780666669963], [45.776410353382758, 42.09244395605635], [46.404950799348818, 41.860675157227298], [46.145431756379004, 41.722802435872573], [46.637908156120574, 41.181672675128219], [46.501637404166921, 41.064444688474104], [45.962600538930381, 41.123872585609767], [45.217426385281577, 41.411451931314041], [44.972480096218071, 41.248128567055588], [43.582745802592726, 41.09214325618256], [42.619548781104484, 41.583172715819934], [41.55408410011065, 41.535656236327561]]] } },
-            { "type": "Feature", "properties": { "admin": "Ghana", "name": "Ghana", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[1.060121697604927, 5.928837388528875], [-0.507637905265938, 5.343472601742675], [-1.063624640294193, 5.000547797053811], [-1.964706590167594, 4.71046214438337], [-2.856125047202397, 4.994475816259508], [-2.810701463217839, 5.389051215024109], [-3.244370083011261, 6.2504715031135], [-2.983584967450326, 7.379704901555511], [-2.56218950032624, 8.219627793811481], [-2.827496303712706, 9.642460842319775], [-2.963896246747111, 10.395334784380081], [-2.94040930827046, 10.962690334512557], [-1.203357713211431, 11.009819240762736], [-0.761575893548183, 10.936929633015053], [-0.438701544588582, 11.09834096927872], [0.023802524423701, 11.018681748900802], [-0.049784715159944, 10.706917832883928], [0.367579990245389, 10.191212876827176], [0.365900506195885, 9.46500397382948], [0.461191847342121, 8.677222601756013], [0.712029249686878, 8.312464504423827], [0.490957472342245, 7.411744289576474], [0.570384148774849, 6.914358628767188], [0.836931186536333, 6.279978745952147], [1.060121697604927, 5.928837388528875]]] } },
-            { "type": "Feature", "properties": { "admin": "Guinea", "name": "Guinea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-8.439298468448696, 7.686042792181736], [-8.722123582382123, 7.711674302598509], [-8.926064622422002, 7.309037380396375], [-9.208786383490844, 7.313920803247952], [-9.403348151069748, 7.526905218938906], [-9.33727983238458, 7.928534450711351], [-9.755342169625832, 8.541055202666923], [-10.016566534861253, 8.42850393313523], [-10.230093553091276, 8.406205552601291], [-10.505477260774667, 8.348896389189603], [-10.494315151399629, 8.715540676300433], [-10.65477047366589, 8.977178452994194], [-10.622395188835037, 9.267910061068276], [-10.839151984083299, 9.688246161330367], [-11.117481248407328, 10.045872911006283], [-11.917277390988655, 10.046983954300556], [-12.150338100625003, 9.858571682164378], [-12.425928514037562, 9.835834051955953], [-12.596719122762206, 9.620188300001969], [-12.711957566773076, 9.342711696810765], [-13.246550258832512, 8.903048610871506], [-13.685153977909788, 9.494743760613458], [-14.074044969122278, 9.886166897008248], [-14.330075852912367, 10.015719712763966], [-14.579698859098254, 10.214467271358513], [-14.693231980843501, 10.65630076745404], [-14.83955379887794, 10.876571560098139], [-15.130311245168167, 11.040411688679525], [-14.685687221728896, 11.527823798056485], [-14.382191534878727, 11.509271958863691], [-14.121406419317776, 11.677117010947693], [-13.900799729863772, 11.678718980348744], [-13.743160773157411, 11.811269029177408], [-13.828271857142122, 12.142644151249041], [-13.718743658899511, 12.247185573775507], [-13.700476040084322, 12.586182969610192], [-13.217818162478235, 12.575873521367964], [-12.499050665730561, 12.332089952031053], [-12.278599005573438, 12.354440008997285], [-12.20356482588563, 12.465647691289401], [-11.658300950557928, 12.386582749882834], [-11.513942836950587, 12.442987575729415], [-11.456168585648269, 12.076834214725336], [-11.297573614944508, 12.077971096235768], [-11.036555955438256, 12.211244615116513], [-10.870829637078211, 12.177887478072106], [-10.593223842806278, 11.923975328005977], [-10.165213792348835, 11.844083563682743], [-9.890992804392011, 12.060478623904968], [-9.567911749703212, 12.194243068892472], [-9.327616339546008, 12.334286200403451], [-9.127473517279581, 12.308060411015331], [-8.905264858424529, 12.088358059126433], [-8.786099005559462, 11.812560939984705], [-8.376304897484911, 11.393645941610627], [-8.581305304386772, 11.136245632364801], [-8.620321010767126, 10.810890814655181], [-8.407310756860026, 10.90925690352276], [-8.282357143578279, 10.792597357623842], [-8.335377163109738, 10.494811916541932], [-8.029943610048617, 10.206534939001711], [-8.22933712404682, 10.129020290563897], [-8.309616461612249, 9.789531968622439], [-8.079113735374348, 9.376223863152033], [-7.832100389019186, 8.575704250518625], [-8.203498907900878, 8.455453192575446], [-8.299048631208562, 8.316443589710302], [-8.221792364932197, 8.123328762235571], [-8.280703497744936, 7.687179673692156], [-8.439298468448696, 7.686042792181736]]] } },
-            { "type": "Feature", "properties": { "admin": "Gambia", "name": "Gambia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-16.84152462408127, 13.151393947802557], [-16.713728807023468, 13.594958604379853], [-15.624596320039936, 13.623587347869556], [-15.398770310924457, 13.860368760630916], [-15.081735398813816, 13.876491807505982], [-14.687030808968483, 13.63035696049978], [-14.376713833055785, 13.625680243377371], [-14.046992356817478, 13.794067898000446], [-13.844963344772404, 13.505041612191999], [-14.277701788784553, 13.28058502853224], [-14.712197231494626, 13.298206691943774], [-15.141163295949463, 13.509511623585235], [-15.511812506562931, 13.278569647672864], [-15.691000535534991, 13.270353094938455], [-15.931295945692208, 13.130284125211331], [-16.84152462408127, 13.151393947802557]]] } },
-            { "type": "Feature", "properties": { "admin": "Guinea Bissau", "name": "Guinea-Bissau", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-15.130311245168167, 11.040411688679525], [-15.664180467175523, 11.458474025920792], [-16.085214199273562, 11.524594021038236], [-16.314786749730199, 11.806514797406548], [-16.308947312881227, 11.958701890506116], [-16.613838263403277, 12.170911159712698], [-16.67745195155457, 12.38485158940105], [-16.147716844130581, 12.547761542201185], [-15.816574266004251, 12.515567124883345], [-15.548476935274005, 12.628170070847343], [-13.700476040084322, 12.586182969610192], [-13.718743658899511, 12.247185573775507], [-13.828271857142122, 12.142644151249041], [-13.743160773157411, 11.811269029177408], [-13.900799729863772, 11.678718980348744], [-14.121406419317776, 11.677117010947693], [-14.382191534878727, 11.509271958863691], [-14.685687221728896, 11.527823798056485], [-15.130311245168167, 11.040411688679525]]] } },
-            { "type": "Feature", "properties": { "admin": "Equatorial Guinea", "name": "Eq. Guinea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[9.492888624721981, 1.010119533691494], [9.305613234096255, 1.160911363119183], [9.649158155972627, 2.283866075037735], [11.276449008843711, 2.261050930180871], [11.285078973036461, 1.057661851400013], [9.83028405115564, 1.067893784993799], [9.492888624721981, 1.010119533691494]]] } },
-            { "type": "Feature", "properties": { "admin": "Greece", "name": "Greece", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[23.699980096133, 35.705004380835526], [24.246665073348673, 35.368022365860149], [25.025015496528873, 35.424995632461979], [25.769207797964182, 35.354018052709073], [25.745023227651579, 35.179997666966209], [26.290002882601719, 35.299990342747911], [26.164997592887651, 35.004995429009789], [24.724982130642299, 34.919987697889603], [24.735007358506941, 35.084990546197581], [23.514978468528106, 35.27999156345097], [23.699980096133, 35.705004380835526]]], [[[26.604195590936282, 41.562114569661098], [26.294602085075777, 40.936261298174244], [26.056942172965499, 40.824123440100827], [25.44767703624418, 40.852545477861455], [24.925848422960932, 40.947061672523226], [23.714811232200809, 40.687129218095116], [24.407998894964063, 40.124992987624083], [23.89996788910258, 39.962005520175573], [23.342999301860797, 39.960997829745786], [22.813987664488959, 40.476005153966547], [22.626298862404777, 40.256561184239175], [22.849747755634805, 39.659310818025759], [23.350027296652595, 39.190011298167256], [22.97309939951554, 38.97090322524965], [23.53001631032495, 38.51000112563846], [24.025024855248937, 38.219992987616443], [24.040011020613601, 37.655014553369419], [23.115002882589145, 37.920011298162215], [23.409971958111065, 37.409990749657389], [22.77497195810863, 37.305010077456551], [23.154225294698612, 36.422505804992042], [22.4900281104511, 36.410000108377446], [21.670026482843692, 36.84498647719419], [21.295010613701574, 37.644989325504689], [21.120034213961329, 38.31032339126272], [20.730032179454579, 38.769985256498778], [20.217712029712853, 39.340234686839629], [20.150015903410516, 39.624997666984022], [20.615000441172779, 40.110006822259422], [20.67499677906363, 40.434999904943048], [20.999989861747274, 40.580003973953964], [21.020040317476422, 40.842726955725873], [21.674160597426969, 40.931274522457976], [22.055377638444266, 41.149865831052686], [22.597308383889008, 41.130487168943198], [22.76177, 41.3048], [22.952377150166562, 41.337993882811212], [23.692073601992455, 41.309080918943849], [24.492644891058031, 41.583896185872035], [25.19720136892553, 41.234485988930651], [26.106138136507177, 41.328898830727823], [26.11704186372091, 41.826904608724725], [26.604195590936282, 41.562114569661098]]]] } },
-            { "type": "Feature", "properties": { "admin": "Greenland", "name": "Greenland", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-46.76379, 82.62796], [-43.40644, 83.22516], [-39.89753, 83.18018], [-38.62214, 83.54905], [-35.08787, 83.64513], [-27.10046, 83.51966], [-20.84539, 82.72669], [-22.69182, 82.34165], [-26.51753, 82.29765], [-31.9, 82.2], [-31.39646, 82.02154], [-27.85666, 82.13178], [-24.84448, 81.78697], [-22.90328, 82.09317], [-22.07175, 81.73449], [-23.16961, 81.15271], [-20.62363, 81.52462], [-15.76818, 81.91245], [-12.77018, 81.71885], [-12.20855, 81.29154], [-16.28533, 80.58004], [-16.85, 80.35], [-20.04624, 80.17708], [-17.73035, 80.12912], [-18.9, 79.4], [-19.70499, 78.75128], [-19.67353, 77.63859], [-18.47285, 76.98565], [-20.03503, 76.94434], [-21.67944, 76.62795], [-19.83407, 76.09808], [-19.59896, 75.24838], [-20.66818, 75.15585], [-19.37281, 74.29561], [-21.59422, 74.22382], [-20.43454, 73.81713], [-20.76234, 73.46436], [-22.17221, 73.30955], [-23.56593, 73.30663], [-22.31311, 72.62928], [-22.29954, 72.18409], [-24.27834, 72.59788], [-24.79296, 72.3302], [-23.44296, 72.08016], [-22.13281, 71.46898], [-21.75356, 70.66369], [-23.53603, 70.471], [-24.30702, 70.85649], [-25.54341, 71.43094], [-25.20135, 70.75226], [-26.36276, 70.22646], [-23.72742, 70.18401], [-22.34902, 70.12946], [-25.02927, 69.2588], [-27.74737, 68.47046], [-30.67371, 68.12503], [-31.77665, 68.12078], [-32.81105, 67.73547], [-34.20196, 66.67974], [-36.35284, 65.9789], [-37.04378, 65.93768], [-38.37505, 65.69213], [-39.81222, 65.45848], [-40.66899, 64.83997], [-40.68281, 64.13902], [-41.1887, 63.48246], [-42.81938, 62.68233], [-42.41666, 61.90093], [-42.86619, 61.07404], [-43.3784, 60.09772], [-44.7875, 60.03676], [-46.26364, 60.85328], [-48.26294, 60.85843], [-49.23308, 61.40681], [-49.90039, 62.38336], [-51.63325, 63.62691], [-52.14014, 64.27842], [-52.27659, 65.1767], [-53.66166, 66.09957], [-53.30161, 66.8365], [-53.96911, 67.18899], [-52.9804, 68.35759], [-51.47536, 68.72958], [-51.08041, 69.14781], [-50.87122, 69.9291], [-52.013585, 69.574925], [-52.55792, 69.42616], [-53.45629, 69.283625], [-54.68336, 69.61003], [-54.75001, 70.28932], [-54.35884, 70.821315], [-53.431315, 70.835755], [-51.39014, 70.56978], [-53.10937, 71.20485], [-54.00422, 71.54719], [-55.0, 71.406536967272558], [-55.83468, 71.65444], [-54.71819, 72.58625], [-55.32634, 72.95861], [-56.12003, 73.64977], [-57.32363, 74.71026], [-58.59679, 75.09861], [-58.58516, 75.51727], [-61.26861, 76.10238], [-63.39165, 76.1752], [-66.06427, 76.13486], [-68.50438, 76.06141], [-69.66485, 76.37975], [-71.40257, 77.00857], [-68.77671, 77.32312], [-66.76397, 77.37595], [-71.04293, 77.63595], [-73.297, 78.04419], [-73.15938, 78.43271], [-69.37345, 78.91388], [-65.7107, 79.39436], [-65.3239, 79.75814], [-68.02298, 80.11721], [-67.15129, 80.51582], [-63.68925, 81.21396], [-62.23444, 81.3211], [-62.65116, 81.77042], [-60.28249, 82.03363], [-57.20744, 82.19074], [-54.13442, 82.19962], [-53.04328, 81.88833], [-50.39061, 82.43883], [-48.00386, 82.06481], [-46.59984, 81.985945], [-44.523, 81.6607], [-46.9007, 82.19979], [-46.76379, 82.62796]]] } },
-            { "type": "Feature", "properties": { "admin": "Guatemala", "name": "Guatemala", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-90.095554572290951, 13.73533763270073], [-90.608624030300817, 13.909771429901948], [-91.232410244496037, 13.927832342987953], [-91.689746670279106, 14.126218166556452], [-92.227750006869812, 14.538828640190925], [-92.203229539747298, 14.830102850804066], [-92.087215949252041, 15.064584662328436], [-92.229248623406249, 15.251446641495857], [-91.747960171255912, 16.066564846251719], [-90.464472622422647, 16.069562079324651], [-90.438866950222021, 16.410109768128091], [-90.600846727240906, 16.470777899638758], [-90.711821865587694, 16.687483018454724], [-91.081670091500641, 16.918476670799404], [-91.453921271515128, 17.252177232324168], [-91.002269253284197, 17.254657701074176], [-91.001519945015943, 17.817594916245707], [-90.067933519230948, 17.819326076727474], [-89.143080410503302, 17.808318996649316], [-89.15080603713092, 17.015576687075832], [-89.229121670269265, 15.886937567605166], [-88.930612759135244, 15.887273464415072], [-88.604586147805833, 15.706380113177358], [-88.518364020526846, 15.855389105690971], [-88.22502275262201, 15.727722479713901], [-88.680679694355618, 15.346247056535301], [-89.15481096063354, 15.066419175674806], [-89.225220099631244, 14.874286200413618], [-89.145535041037149, 14.67801911056908], [-89.353325975282772, 14.424132798719112], [-89.587342698916544, 14.362586167859485], [-89.5342193265205, 14.244815578666302], [-89.7219339668207, 14.134228013561694], [-90.064677903996568, 13.881969509328924], [-90.095554572290951, 13.73533763270073]]] } },
-            { "type": "Feature", "properties": { "admin": "Guyana", "name": "Guyana", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-59.758284878159181, 8.367034816924045], [-59.10168412945864, 7.99920197187049], [-58.482962205628041, 7.347691351750696], [-58.454876064677414, 6.832787380394463], [-58.078103196837361, 6.809093736188641], [-57.542218593970631, 6.321268215353355], [-57.147436489476874, 5.973149929219161], [-57.307245856339492, 5.073566595882225], [-57.914288906472123, 4.812626451024413], [-57.860209520078691, 4.576801052260449], [-58.044694383360664, 4.060863552258382], [-57.601568976457848, 3.334654649260684], [-57.281433478409703, 3.333491929534119], [-57.150097825739898, 2.768926906745406], [-56.53938574891454, 1.89952260986692], [-56.782704230360814, 1.863710842288653], [-57.33582292339689, 1.948537705895759], [-57.660971035377358, 1.682584947105638], [-58.113449876525003, 1.507195135907025], [-58.429477098205957, 1.46394196207872], [-58.540012986878288, 1.26808828369252], [-59.030861579002639, 1.317697658692722], [-59.646043667221242, 1.786893825686789], [-59.718545701726732, 2.249630438644359], [-59.974524909084543, 2.755232652188055], [-59.815413174057852, 3.606498521332085], [-59.538039923731219, 3.958802598481937], [-59.767405768458701, 4.423502915866606], [-60.111002366767373, 4.574966538914082], [-59.980958624904865, 5.014061184098138], [-60.213683437731319, 5.2444863956876], [-60.733574184803707, 5.2002772078619], [-61.410302903881941, 5.959068101419616], [-61.139415045807937, 6.234296779806142], [-61.159336310456467, 6.696077378766317], [-60.543999192940966, 6.856584377464881], [-60.295668097562377, 7.043911444522918], [-60.637972785063752, 7.414999904810853], [-60.550587938058186, 7.779602972846178], [-59.758284878159181, 8.367034816924045]]] } },
-            { "type": "Feature", "properties": { "admin": "Honduras", "name": "Honduras", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-87.316654425795463, 12.984685777229], [-87.48940873894712, 13.29753489832393], [-87.793111131526501, 13.384480495655165], [-87.723502977229288, 13.785050360565602], [-87.859515347021599, 13.893312486217097], [-88.065342576840109, 13.964625962779788], [-88.503997972349609, 13.845485948130939], [-88.541230841815931, 13.98015473068352], [-88.843072882832743, 14.140506700085208], [-89.058511929057644, 14.340029405164213], [-89.353325975282786, 14.424132798719084], [-89.145535041037164, 14.678019110569149], [-89.22522009963123, 14.874286200413675], [-89.154810960633526, 15.066419175674863], [-88.680679694355575, 15.346247056535386], [-88.225022752621925, 15.727722479714027], [-88.121153123715359, 15.688655096901355], [-87.901812506852394, 15.864458319558194], [-87.615680101252309, 15.878798529519198], [-87.522920905288444, 15.797278957578779], [-87.367762417332116, 15.846940009011286], [-86.903191291028165, 15.756712958229565], [-86.440945604177372, 15.782835394753189], [-86.119233974944322, 15.893448798073958], [-86.00195431185783, 16.005405788634388], [-85.68331743034625, 15.953651841693949], [-85.444003872402547, 15.885749009662444], [-85.182443610357183, 15.909158433490628], [-84.98372188997881, 15.995923163308698], [-84.526979743167118, 15.857223619037423], [-84.36825558138257, 15.835157782448729], [-84.063054572266807, 15.648244126849132], [-83.773976610026111, 15.42407176356687], [-83.410381232420363, 15.27090281825377], [-83.147219000974104, 14.995829169164207], [-83.489988776366005, 15.01626719813566], [-83.628584967772866, 14.880073960830368], [-83.975721401693576, 14.749435939996483], [-84.228341640952394, 14.748764146376626], [-84.449335903648588, 14.62161428472251], [-84.64958207877963, 14.666805324761865], [-84.820036790694289, 14.819586696832628], [-84.924500698572302, 14.790492865452332], [-85.052787441736868, 14.551541042534719], [-85.148750576502877, 14.560196844943615], [-85.165364549484806, 14.354369615125048], [-85.514413011400265, 14.079011745657905], [-85.698665330736944, 13.960078436737998], [-85.801294725268505, 13.8360549992376], [-86.096263800790595, 14.03818736414723], [-86.312142096689826, 13.771356106008223], [-86.520708177419891, 13.778487453664464], [-86.755086636079596, 13.754845485890936], [-86.733821784191463, 13.263092556201398], [-86.880557013684353, 13.254204209847213], [-87.005769009127434, 13.025794379117254], [-87.316654425795463, 12.984685777229]]] } },
-            { "type": "Feature", "properties": { "admin": "Croatia", "name": "Croatia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[18.829838087650039, 45.908877671891837], [19.072768995854172, 45.521511135432078], [19.390475701584588, 45.236515611342369], [19.005486281010118, 44.860233669609144], [18.553214145591646, 45.08158966733145], [17.861783481526398, 45.067740383477137], [17.00214603035101, 45.233776760430935], [16.534939406000202, 45.211607570977705], [16.318156772535868, 45.004126695325901], [15.959367303133373, 45.233776760430935], [15.750026075918978, 44.81871165626255], [16.239660271884528, 44.351143296885695], [16.456442905348862, 44.041239732431265], [16.916156447017325, 43.667722479825663], [17.297373488034449, 43.446340643887353], [17.674921502358981, 43.028562527023603], [18.56, 42.65], [18.450016310304814, 42.47999136002931], [17.509970330483323, 42.84999461523914], [16.930005730871638, 43.209998480800373], [16.015384555737679, 43.507215481127204], [15.174453973052094, 44.243191229827907], [15.376250441151793, 44.317915350922064], [14.920309279040504, 44.73848399512945], [14.901602410550874, 45.076060289076104], [14.258747592839992, 45.233776760430935], [13.952254672917032, 44.802123521496853], [13.65697553880119, 45.136935126315947], [13.679403110415816, 45.484149074884996], [13.715059848697248, 45.500323798192419], [14.411968214585496, 45.466165676447403], [14.595109490627916, 45.63494090431282], [14.935243767972961, 45.471695054702757], [15.327674594797424, 45.452316392593325], [15.323953891672428, 45.731782538427687], [15.671529575267638, 45.8341535507979], [15.768732944408608, 46.23810822202352], [16.564808383864939, 46.503750922219794], [16.882515089595412, 46.380631822284428], [17.630066359129554, 45.951769110694087], [18.456062452882858, 45.759481106136143], [18.829838087650039, 45.908877671891837]]] } },
-            { "type": "Feature", "properties": { "admin": "Haiti", "name": "Haiti", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-73.189790615517595, 19.915683905511909], [-72.579672817663607, 19.871500555902351], [-71.71236141629295, 19.714455878167353], [-71.624873216422813, 19.169837958243303], [-71.701302659782485, 18.785416978424049], [-71.945112067335543, 18.616900132720257], [-71.687737596305865, 18.316660061104468], [-71.708304816358037, 18.044997056546091], [-72.372476162389333, 18.214960842354053], [-72.844411180294856, 18.145611070218362], [-73.454554816365018, 18.217906398994696], [-73.922433234335642, 18.030992743395], [-74.458033616824764, 18.342549953682703], [-74.369925299767118, 18.664907538319408], [-73.449542202432696, 18.526052964751141], [-72.694937099890623, 18.445799465401858], [-72.334881557896992, 18.66842153571525], [-72.791649542924873, 19.101625067618027], [-72.784104783810264, 19.483591416903405], [-73.41502234566174, 19.639550889560276], [-73.189790615517595, 19.915683905511909]]] } },
-            { "type": "Feature", "properties": { "admin": "Hungary", "name": "Hungary", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.202298211337361, 46.852385972676949], [16.534267612380372, 47.496170966169103], [16.340584344150411, 47.712901923201215], [16.903754103267257, 47.714865627628321], [16.979666782304033, 48.123497015976298], [17.488472934649813, 47.867466132186209], [17.857132602620023, 47.758428860050365], [18.696512892336923, 47.88095368101439], [18.777024773847668, 48.081768296900627], [19.174364861739885, 48.111378892603859], [19.66136355965849, 48.266614895208647], [19.769470656013109, 48.2026911484636], [20.239054396249344, 48.327567247096916], [20.473562045989862, 48.562850043321809], [20.801293979584919, 48.62385407164237], [21.872236362401729, 48.319970811550007], [22.085608351334848, 48.422264309271782], [22.640819939878746, 48.150239569687351], [22.710531447040488, 47.882193915389394], [22.09976769378283, 47.672439276716695], [21.626514926853869, 46.994237779318148], [21.021952345471245, 46.316087958351886], [20.220192498462833, 46.127468980486547], [19.596044549241579, 46.171729844744533], [18.829838087649957, 45.908877671891915], [18.456062452882858, 45.759481106136121], [17.630066359129554, 45.95176911069418], [16.882515089595298, 46.380631822284428], [16.564808383864854, 46.503750922219822], [16.370504998447412, 46.841327216166498], [16.202298211337361, 46.852385972676949]]] } },
-            { "type": "Feature", "properties": { "admin": "Indonesia", "name": "Indonesia", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[120.715608758630438, -10.239581394087862], [120.295014276206871, -10.258649997603525], [118.967808465654684, -9.55796925215803], [119.900309686361609, -9.361340427287514], [120.425755649905398, -9.665921319215796], [120.775501743656719, -9.969675388227456], [120.715608758630438, -10.239581394087862]]], [[[124.435950148619384, -10.14000090906144], [123.579981724136701, -10.359987481327961], [123.459989048354998, -10.239994805546171], [123.55000939340745, -9.900015557497978], [123.980008986508096, -9.290026950724693], [124.96868248911619, -8.892790215697046], [125.070019972840612, -9.089987481322835], [125.088520135601073, -9.393173109579321], [124.435950148619384, -10.14000090906144]]], [[[117.900018345207741, -8.095681247594923], [118.260616489740471, -8.362383314653327], [118.87845991422212, -8.280682875199828], [119.126506789223086, -8.705824883665072], [117.97040164598927, -8.906639499551257], [117.277730747549015, -9.040894870645557], [116.74014082241662, -9.032936700072637], [117.083737420725313, -8.457157891476539], [117.632024367342126, -8.44930307376819], [117.900018345207741, -8.095681247594923]]], [[[122.903537225436082, -8.094234307490735], [122.756982863456287, -8.649807631060638], [121.2544905945701, -8.933666273639941], [119.924390903809567, -8.810417982623873], [119.920928582846102, -8.44485890059107], [120.715091994307542, -8.236964613480863], [121.341668735846554, -8.53673959720602], [122.007364536630405, -8.46062021244016], [122.903537225436082, -8.094234307490735]]], [[[108.623478631628927, -6.777673841990675], [110.539227329553285, -6.877357679881682], [110.759575636845909, -6.465186455921751], [112.614811232556349, -6.946035658397589], [112.978768345188087, -7.594213148634578], [114.478935174621142, -7.776527601760277], [115.705526971501058, -8.370806573116864], [114.564511346496488, -8.75181690840483], [113.464733514460875, -8.348947442257424], [112.559672479301028, -8.376180922075163], [111.522061395312448, -8.302128594600957], [110.586149530074294, -8.122604668819021], [109.427667270955183, -7.740664157749761], [108.693655226681301, -7.641600437046219], [108.277763299596302, -7.766657403192579], [106.454102004016136, -7.354899590690947], [106.280624220812285, -6.924899997590201], [105.365486281355516, -6.851416110871169], [106.051645949327053, -5.895918877794499], [107.265008579540165, -5.954985039904058], [108.072091099074683, -6.345762220895237], [108.486846144649235, -6.421984958525768], [108.623478631628927, -6.777673841990675]]], [[[134.724624465066654, -6.214400730009286], [134.210133905168902, -6.895237725454704], [134.112775506730998, -6.142467136259014], [134.290335728085779, -5.783057549669038], [134.499625278867882, -5.445042006047898], [134.727001580952106, -5.737582289252158], [134.724624465066654, -6.214400730009286]]], [[[127.249215122588893, -3.459065036638889], [126.874922723498855, -3.790982761249579], [126.183802118027302, -3.607376397316556], [125.989033644719257, -3.177273451351325], [127.00065148326496, -3.12931772218441], [127.249215122588893, -3.459065036638889]]], [[[130.471344028851775, -3.09376433676762], [130.834836053592767, -3.858472181822761], [129.990546502808115, -3.446300957862817], [129.155248651242403, -3.362636813982248], [128.590683628453633, -3.428679294451256], [127.898891229362334, -3.393435967628192], [128.135879347852779, -2.843650404474914], [129.370997756060888, -2.802154229344551], [130.471344028851775, -3.09376433676762]]], [[[134.143367954647772, -1.151867364103594], [134.422627394753022, -2.769184665542383], [135.457602980694674, -3.367752780779113], [136.293314243718754, -2.30704233155609], [137.4407377463275, -1.703513278819372], [138.329727411044757, -1.70268645590265], [139.18492068904294, -2.051295668143637], [139.926684198160387, -2.409051608900284], [141.000210402591847, -2.600151055515624], [141.017056919519007, -5.85902190513802], [141.033851760013874, -9.117892754760417], [140.143415155192542, -8.297167657100955], [139.127766554928087, -8.096042982620942], [138.881476678624949, -8.380935153846094], [137.614473911692812, -8.41168263105976], [138.039099155835174, -7.597882175327354], [138.668621454014783, -7.320224704623072], [138.407913853102343, -6.232849216337483], [137.927839797110835, -5.393365573755998], [135.989250116113453, -4.546543877789047], [135.164597609599667, -4.462931410340771], [133.662880487197867, -3.538853448097526], [133.367704705946778, -4.024818617370314], [132.983955519747326, -4.112978610860281], [132.75694095268895, -3.746282647317129], [132.753788690319197, -3.311787204607071], [131.989804315316178, -2.820551039240455], [133.066844517143466, -2.460417982598443], [133.780030959203486, -2.479848321140209], [133.69621178602614, -2.214541517753687], [132.232373488494204, -2.212526136894325], [131.836221958544684, -1.617161960459597], [130.942839797082797, -1.432522067880796], [130.519558140180038, -0.937720228686075], [131.867537876513609, -0.695461114101818], [132.380116408416768, -0.369537855636977], [133.985548130428384, -0.780210463060442], [134.143367954647772, -1.151867364103594]]], [[[125.240500522971573, 1.419836127117605], [124.43703535369734, 0.427881171058971], [123.685504998876695, 0.235593166500877], [122.723083123872854, 0.431136786293337], [121.056724888189081, 0.381217352699451], [120.18308312386273, 0.23724681233422], [120.040869582195455, -0.519657891444851], [120.935905389490699, -1.408905938323372], [121.475820754076167, -0.955962009285116], [123.34056481332847, -0.615672702643081], [123.258399285984481, -1.076213067228337], [122.822715285331597, -0.930950616055881], [122.388529901215364, -1.516858005381124], [121.508273553555455, -1.904482924002422], [122.454572381684272, -3.186058444840881], [122.271896193532541, -3.529500013852696], [123.170962762546537, -4.683693129091707], [123.162332798353759, -5.34060393638596], [122.628515252778683, -5.634591159694494], [122.236394484548057, -5.282933037948281], [122.71956912647704, -4.46417164471579], [121.738233677254357, -4.851331475446499], [121.48946333220124, -4.574552504091215], [121.619171177253861, -4.188477878438674], [120.898181593917684, -3.602105401222828], [120.972388950688767, -2.627642917494909], [120.305452915529884, -2.931603692235725], [120.39004723519173, -4.097579034037223], [120.430716587405371, -5.528241062037778], [119.796543410319487, -5.67340016034565], [119.36690555224493, -5.379878024927804], [119.653606398600104, -4.459417412944958], [119.498835483885969, -3.49441171632651], [119.078344354326987, -3.487021986508764], [118.767768996252869, -2.801999200047688], [119.180973748858662, -2.147103773612798], [119.323393996255049, -1.35314706788047], [119.825998976725828, 0.154254462073496], [120.035701938966341, 0.566477362465804], [120.885779250167687, 1.309222723796835], [121.666816847826965, 1.013943589681076], [122.927566766451818, 0.875192368977465], [124.077522414242836, 0.917101955566139], [125.065989211121803, 1.643259182131558], [125.240500522971573, 1.419836127117605]]], [[[128.688248732620707, 1.132385972494106], [128.635952183141342, 0.258485826006179], [128.120169712436166, 0.356412665199286], [127.968034295768845, -0.252077325037533], [128.379998813999691, -0.780003757331286], [128.100015903842291, -0.899996433112974], [127.69647464407501, -0.266598402511505], [127.399490187693743, 1.011721503092573], [127.600511509309044, 1.81069082275718], [127.932377557487484, 2.174596258956555], [128.004156121940809, 1.628531398928331], [128.594559360875451, 1.540810655112864], [128.688248732620707, 1.132385972494106]]], [[[117.875627069166001, 1.827640692548911], [118.996747267738158, 0.902219143066048], [117.811858351717788, 0.784241848143722], [117.478338657706047, 0.102474676917026], [117.521643507966587, -0.803723239753211], [116.560048455879496, -1.487660821136231], [116.533796828275158, -2.483517347832901], [116.148083937648607, -4.012726332214014], [116.000857782049067, -3.657037448749008], [114.864803094544513, -4.106984144714416], [114.468651564595064, -3.49570362713382], [113.755671828264099, -3.439169610206519], [113.256994256647545, -3.118775729996854], [112.068126255340644, -3.478392022316071], [111.703290643359992, -2.994442233902631], [111.04824018762821, -3.049425957861188], [110.223846063275971, -2.934032484553483], [110.070935500124335, -1.592874037282414], [109.571947869914041, -1.314906507984489], [109.091873813922518, -0.459506524257051], [108.952657505328162, 0.415375474444346], [109.069136183714036, 1.341933905437642], [109.663260125773718, 2.006466986494984], [109.830226678508836, 1.338135687664191], [110.514060907027101, 0.773131415200993], [111.159137811326559, 0.976478176269509], [111.797548455860408, 0.904441229654651], [112.380251906383648, 1.410120957846757], [112.859809198052176, 1.497790025229946], [113.805849644019531, 1.217548732911041], [114.621355422017473, 1.430688177898886], [115.134037306785231, 2.821481838386219], [115.51907840379198, 3.169238389494395], [115.86551720587677, 4.306559149590156], [117.01521447150634, 4.306094061699468], [117.882034946770162, 4.137551377779487], [117.313232456533513, 3.234428208830578], [118.048329705885351, 2.287690131027361], [117.875627069166001, 1.827640692548911]]], [[[105.817655063909356, -5.852355645372411], [104.710384149191498, -5.873284600450644], [103.868213332130736, -5.037314955264974], [102.584260695406897, -4.220258884298203], [102.156173130300999, -3.614146009946765], [101.399113397225051, -2.799777113459171], [100.902502882900137, -2.05026213949786], [100.141980828860596, -0.650347588710957], [99.26373986206022, 0.183141587724663], [98.970011020913319, 1.042882391764536], [98.601351352943084, 1.823506577965616], [97.699597609449881, 2.453183905442116], [97.17694217324987, 3.30879059489861], [96.424016554757316, 3.86885976807791], [95.380876092513475, 4.970782172053673], [95.293026157617305, 5.479820868344816], [95.936862827541745, 5.439513251157108], [97.484882033277088, 5.24632090903401], [98.369169142655679, 4.268370266126366], [99.142558628335792, 3.590349636240915], [99.693997837322399, 3.174328518075156], [100.641433546961665, 2.099381211755798], [101.658012323007313, 2.083697414555189], [102.498271112073212, 1.398700466310217], [103.076840448013002, 0.561361395668854], [103.838396030698348, 0.104541734208666], [103.437645298274973, -0.711945896002845], [104.010788608824001, -1.059211521004229], [104.369991489684878, -1.084843031421016], [104.539490187602155, -1.782371514496716], [104.887892694113987, -2.340425306816655], [105.622111444116982, -2.42884368246807], [106.10859337771268, -3.06177662517895], [105.857445916774111, -4.305524997579723], [105.817655063909356, -5.852355645372411]]]] } },
-            { "type": "Feature", "properties": { "admin": "India", "name": "India", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[77.837450799474553, 35.494009507787759], [78.912268914713209, 34.321936346975782], [78.811086460285722, 33.506198025032404], [79.208891636068572, 32.994394639613709], [79.176128777995501, 32.483779812137705], [78.458446486325997, 32.61816437431272], [78.738894484374001, 31.515906073527056], [79.721366815107089, 30.882714748654724], [81.11125613802929, 30.183480943313398], [80.476721225917373, 29.729865220655334], [80.088424513676259, 28.794470119740136], [81.057202589851997, 28.416095282499036], [81.999987420584958, 27.925479234319987], [83.304248895199535, 27.364505723575554], [84.675017938173767, 27.234901231387528], [85.25177859898335, 26.726198431906337], [86.024392938179147, 26.630984605408567], [87.22747195836628, 26.39789805755607], [88.060237664749806, 26.414615383402484], [88.174804315140904, 26.810405178325944], [88.043132765661198, 27.445818589786818], [88.120440708369841, 27.876541652939586], [88.730325962278528, 28.086864732367509], [88.814248488320544, 27.299315904239361], [88.835642531289366, 27.098966376243755], [89.744527622438838, 26.71940298105995], [90.37327477413406, 26.875724188742872], [91.217512648486405, 26.808648179628019], [92.033483514375078, 26.838310451763554], [92.10371178585973, 27.4526140406332], [91.69665652869665, 27.771741848251661], [92.503118931043616, 27.896876329046442], [93.413347609432662, 28.640629380807219], [94.565990431702929, 29.277438055939978], [95.404802280664612, 29.031716620392125], [96.117678664131006, 29.452802028922459], [96.586590610747479, 28.830979519154337], [96.248833449287758, 28.411030992134435], [97.327113885490007, 28.261582749946331], [97.402561476636123, 27.88253611908544], [97.051988559968066, 27.699058946233144], [97.133999058015277, 27.08377350514996], [96.419365675850941, 27.264589341739221], [95.124767694074933, 26.573572089132295], [95.155153436262566, 26.001307277932078], [94.603249139385355, 25.162495428970399], [94.552657912171611, 24.675238348890328], [94.106741977925054, 23.850740871673477], [93.325187615942767, 24.078556423432197], [93.286326938859247, 23.043658352138998], [93.060294224014598, 22.703110663335565], [93.166127557348361, 22.278459580977099], [92.672720981825549, 22.041238918541247], [92.146034783906799, 23.62749868417259], [91.869927606171302, 23.62434642180278], [91.706475050832083, 22.985263983649183], [91.158963250699713, 23.503526923104381], [91.467729933643668, 24.072639471934789], [91.915092807994398, 24.130413723237108], [92.376201613334786, 24.976692816664961], [91.799595981822065, 25.14743174895731], [90.872210727912105, 25.13260061288954], [89.920692580121838, 25.269749864192171], [89.832480910199592, 25.965082098895476], [89.355094028687276, 26.014407253518065], [88.56304935094974, 26.446525580342716], [88.209789259802477, 25.768065700782707], [88.931553989623069, 25.238692328384769], [88.30637251175601, 24.866079413344199], [88.084422235062405, 24.501657212821918], [88.699940220090895, 24.233714911388557], [88.529769728553759, 23.631141872649163], [88.876311883503064, 22.879146429937826], [89.031961297566198, 22.055708319582973], [88.888765903685396, 21.690588487224741], [88.208497348995209, 21.703171698487804], [86.975704380240259, 21.495561631755201], [87.033168572948853, 20.743307806882406], [86.499351027373777, 20.151638495356604], [85.060265740909671, 19.478578802971096], [83.941005893899998, 18.302009792549722], [83.189217156917834, 17.671221421778977], [82.192792189465905, 17.016636053937813], [82.191241896497175, 16.556664130107844], [81.692719354177456, 16.3102192245079], [80.791999139330116, 15.951972357644488], [80.324895867843864, 15.899184882058346], [80.025069207686428, 15.136414903214144], [80.23327355339039, 13.835770778859978], [80.286293572921849, 13.006260687710832], [79.862546828128487, 12.056215318240886], [79.85799930208681, 10.357275091997108], [79.340511509115984, 10.308854274939618], [78.885345493489169, 9.54613597252772], [79.189719679688281, 9.216543687370146], [78.27794070833049, 8.933046779816932], [77.94116539908434, 8.25295909263974], [77.539897902337927, 7.965534776232331], [76.592978957021657, 8.899276231314188], [76.130061476551063, 10.299630031775518], [75.746467319648488, 11.308250637248303], [75.396101108709573, 11.781245022015822], [74.864815708316812, 12.741935736537895], [74.616717156883524, 13.992582912649677], [74.443859490867197, 14.617221787977693], [73.534199253233368, 15.990652167214957], [73.119909295549419, 17.928570054592495], [72.820909458308634, 19.208233547436162], [72.824475132136783, 20.41950328214153], [72.630533481745388, 21.356009426351001], [71.175273471973938, 20.757441311114228], [70.470458611945091, 20.877330634031381], [69.164130080038817, 22.089298000572697], [69.644927606082391, 22.450774644454334], [69.349596795534325, 22.843179633062686], [68.176645135373377, 23.691965033456704], [68.842599318318761, 24.359133612560932], [71.0432401874682, 24.356523952730193], [70.844699334602822, 25.215102037043511], [70.282873162725579, 25.722228705339823], [70.168926629522005, 26.491871649678835], [69.514392938113119, 26.940965684511365], [70.61649620960192, 27.989196275335861], [71.777665643200308, 27.913180243434521], [72.823751662084689, 28.961591701772047], [73.450638462217412, 29.976413479119863], [74.421380242820263, 30.97981476493117], [74.405928989564998, 31.692639471965272], [75.258641798813187, 32.271105455040491], [74.451559279278698, 32.764899603805489], [74.104293654277328, 33.441473293586846], [73.749948358051952, 34.317698879527846], [74.240202671204955, 34.748887030571247], [75.757060988268321, 34.504922593721311], [76.871721632804011, 34.653544012992732], [77.837450799474553, 35.494009507787759]]] } },
-            { "type": "Feature", "properties": { "admin": "Ireland", "name": "Ireland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-6.197884894220989, 53.86756500916335], [-6.032985398777609, 53.153164170944336], [-6.788856573910847, 52.260117906292322], [-8.561616583683557, 51.669301255899349], [-9.977085740590267, 51.820454820353071], [-9.16628251793078, 52.864628811242667], [-9.688524542672452, 53.881362616585285], [-8.327987433292007, 54.664518947968624], [-7.572167934591064, 55.131622219454854], [-7.366030646178785, 54.595840969452709], [-7.572167934591064, 54.059956366585986], [-6.953730231138065, 54.073702297575622], [-6.197884894220989, 53.86756500916335]]] } },
-            { "type": "Feature", "properties": { "admin": "Iran", "name": "Iran", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[53.921597934795543, 37.198918361961255], [54.800303989486558, 37.392420762678178], [55.511578403551894, 37.964117133123153], [56.180374790273319, 37.935126654607423], [56.619366082592805, 38.121394354803478], [57.330433790928964, 38.029229437810933], [58.436154412678192, 37.522309475243794], [59.234761997316795, 37.412987982730336], [60.377637973883864, 36.52738312432836], [61.123070509694131, 36.491597194966239], [61.21081709172573, 35.650072333309218], [60.80319339380744, 34.404101874319856], [60.528429803311575, 33.676446031217999], [60.963700392505991, 33.528832302376252], [60.536077915290761, 32.981268825811561], [60.863654819588952, 32.182919623334421], [60.941944614511115, 31.548074652628745], [61.699314406180811, 31.379506130492661], [61.78122155136343, 30.735850328081231], [60.874248488208778, 29.829238999952604], [61.369308709564926, 29.303276272085917], [61.771868117118615, 28.699333807890792], [62.727830438085974, 28.259644883735383], [62.755425652929851, 27.378923448184985], [63.23389773952028, 27.217047024030702], [63.316631707619578, 26.756532497661659], [61.874187453056535, 26.239974880472097], [61.497362908784183, 25.078237006118492], [59.616134067630831, 25.380156561783775], [58.525761346272297, 25.609961656185725], [57.39725141788238, 25.739902045183634], [56.97076582217754, 26.966106268821356], [56.492138706290199, 27.14330475515019], [55.723710158110059, 26.964633490501036], [54.715089552637252, 26.480657863871507], [53.493096958231334, 26.812368882753042], [52.483597853409599, 27.580849107365488], [51.520762566947404, 27.865689602158291], [50.852948032439528, 28.814520575469377], [50.115008579311571, 30.14777252859971], [49.576850213423988, 29.9857152369324], [48.941333449098536, 30.31709035900403], [48.567971225789748, 29.926778265903515], [48.014568312376085, 30.452456773392594], [48.00469811380831, 30.985137437457237], [47.685286085812258, 30.984853217079621], [47.849203729042095, 31.709175930298663], [47.334661492711895, 32.469155381799105], [46.109361606639304, 33.017287299118998], [45.416690708199035, 33.967797756479577], [45.648459507028079, 34.748137722303007], [46.15178795755093, 35.093258775364284], [46.076340366404786, 35.67738332777548], [45.420618117053202, 35.977545884742817], [44.77267, 37.17045], [44.225755649600522, 37.971584377589345], [44.421402622257538, 38.281281236314534], [44.109225294782334, 39.428136298168091], [44.793989699081934, 39.713002631177041], [44.9526880226503, 39.335764675446363], [45.457721795438765, 38.874139105783051], [46.143623081248812, 38.74120148371221], [46.505719842317966, 38.770605373686287], [47.685079380083081, 39.508363959301207], [48.060095249225235, 39.582235419262453], [48.355529412637871, 39.2887649602769], [48.010744256386474, 38.794014797514514], [48.634375441284803, 38.27037750910096], [48.883249139202483, 38.32024526626261], [49.199612257693332, 37.582874253889877], [50.147771437384606, 37.37456655532133], [50.842354363819695, 36.872814235983384], [52.26402469260141, 36.700421657857696], [53.825789829326411, 36.965030829408228], [53.921597934795543, 37.198918361961255]]] } },
-            { "type": "Feature", "properties": { "admin": "Iraq", "name": "Iraq", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[45.420618117053202, 35.977545884742817], [46.076340366404786, 35.67738332777548], [46.15178795755093, 35.093258775364284], [45.648459507028079, 34.748137722303007], [45.416690708199035, 33.967797756479577], [46.109361606639304, 33.017287299118998], [47.334661492711895, 32.469155381799105], [47.849203729042095, 31.709175930298663], [47.685286085812258, 30.984853217079621], [48.00469811380831, 30.985137437457237], [48.014568312376085, 30.452456773392594], [48.567971225789748, 29.926778265903515], [47.974519077349889, 29.975819200148493], [47.302622104690947, 30.059069932570711], [46.568713413281742, 29.099025173452283], [44.709498732284736, 29.178891099559376], [41.889980910007829, 31.190008653278362], [40.399994337736238, 31.889991766887931], [39.195468377444961, 32.16100881604266], [38.792340529136077, 33.378686428352218], [41.00615888851992, 34.419372260062111], [41.383965285005807, 35.628316555314349], [41.289707472505448, 36.358814602192261], [41.837064243340954, 36.605853786763568], [42.349591098811764, 37.22987254490409], [42.779125604021822, 37.385263576805741], [43.942258742047287, 37.256227525372942], [44.293451775902852, 37.001514390606289], [44.772699008977689, 37.170444647768427], [45.420618117053202, 35.977545884742817]]] } },
-            { "type": "Feature", "properties": { "admin": "Iceland", "name": "Iceland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-14.508695441129232, 66.455892239031414], [-14.739637417041605, 65.808748277440287], [-13.609732224979807, 65.126671047619851], [-14.9098337467949, 64.36408193628867], [-17.794438035543418, 63.67874909123384], [-18.656245896874989, 63.496382961675806], [-19.972754685942757, 63.643634955491514], [-22.762971971110154, 63.960178941495371], [-21.778484259517676, 64.402115790455497], [-23.955043911219104, 64.891129869233481], [-22.184402635170354, 65.084968166760291], [-22.227423265053329, 65.378593655042721], [-24.326184047939332, 65.611189276788451], [-23.650514695723082, 66.262519029395207], [-22.134922451250883, 66.410468655046856], [-20.576283738679543, 65.732112128351417], [-19.056841600001587, 66.276600857194751], [-17.798623826559048, 65.993853257909763], [-16.167818976292121, 66.526792304135853], [-14.508695441129232, 66.455892239031414]]] } },
-            { "type": "Feature", "properties": { "admin": "Israel", "name": "Israel", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.719918247222743, 32.709192409794859], [35.545665317534535, 32.393992011030569], [35.183930291491428, 32.532510687788935], [34.974640740709319, 31.866582343059715], [35.225891554512422, 31.754341132121759], [34.970506626125989, 31.616778469360803], [34.927408481594554, 31.35343537040141], [35.397560662586038, 31.489086005167572], [35.420918409981958, 31.100065822874349], [34.922602573391423, 29.501326198844517], [34.26543338393568, 31.219360866820146], [34.556371697738903, 31.548823960896989], [34.48810713068135, 31.605538845337314], [34.752587111151165, 32.07292633720116], [34.955417107896771, 32.827376410446369], [35.098457472480668, 33.080539252244257], [35.126052687324538, 33.090900376918775], [35.460709262846699, 33.089040025356276], [35.552796665190805, 33.264274807258012], [35.821100701650231, 33.277426459276292], [35.836396925608618, 32.868123277308506], [35.700797967274745, 32.716013698857374], [35.719918247222743, 32.709192409794859]]] } },
-            { "type": "Feature", "properties": { "admin": "Italy", "name": "Italy", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[15.52037601081383, 38.231155096991465], [15.160242954171732, 37.444045518537813], [15.309897902089002, 37.134219468731793], [15.099988234119445, 36.61998729099539], [14.335228712632013, 36.996630967754747], [13.826732618879927, 37.104531358380186], [12.431003859108809, 37.612949937483812], [12.570943637755132, 38.126381130519682], [13.741156447004581, 38.03496552179535], [14.761249220446157, 38.143873602850498], [15.52037601081383, 38.231155096991465]]], [[[9.210011834356264, 41.209991360024212], [9.809975213264973, 40.500008856766094], [9.669518670295671, 39.177376410471787], [9.214817742559486, 39.240473334300127], [8.806935662479729, 38.906617743478471], [8.428302443077113, 39.171847032216611], [8.388253208050939, 40.378310858718798], [8.159998406617659, 40.950007229163774], [8.709990675500107, 40.899984442705225], [9.210011834356264, 41.209991360024212]]], [[[12.376485223040842, 46.767559109069872], [13.806475457421552, 46.50930613869118], [13.698109978905475, 46.016778062517368], [13.937630242578335, 45.59101593686465], [13.141606479554294, 45.736691799495411], [12.328581170306304, 45.38177806251484], [12.383874952858601, 44.885374253919075], [12.261453484759157, 44.600482082694008], [12.589237094786482, 44.091365871754462], [13.526905958722491, 43.587727362637899], [14.029820997787024, 42.761007798832473], [15.142569614327952, 41.955139675456891], [15.926191033601892, 41.961315009115729], [16.169897088290409, 41.740294908203417], [15.889345737377793, 41.541082261718195], [16.785001661860573, 41.179605617836579], [17.519168735431204, 40.877143459632229], [18.376687452882575, 40.355624904942651], [18.4802470231954, 40.168866278639818], [18.293385044028096, 39.810774441073235], [17.738380161213279, 40.277671006830289], [16.869595981522334, 40.442234605463838], [16.448743116937319, 39.795400702466473], [17.171489698971495, 39.424699815420716], [17.052840610429339, 38.902871202137291], [16.635088331781841, 38.843572496082395], [16.100960727613053, 37.985898749334176], [15.684086948314498, 37.908849188787023], [15.687962680736318, 38.214592800441849], [15.891981235424705, 38.750942491199218], [16.109332309644312, 38.964547024077682], [15.718813510814638, 39.544072374014938], [15.413612501698818, 40.048356838535163], [14.998495721098234, 40.172948716790913], [14.703268263414767, 40.604550279292617], [14.06067182786526, 40.786347968095434], [13.627985060285393, 41.188287258461649], [12.888081902730418, 41.253089504555604], [12.106682570044907, 41.7045348170574], [11.191906365614184, 42.355425319989671], [10.511947869517794, 42.93146251074721], [10.200028924204046, 43.920006822274608], [9.702488234097812, 44.036278794931313], [8.888946160526869, 44.366336167979533], [8.428560825238575, 44.23122813575241], [7.8507666357832, 43.767147935555236], [7.435184767291841, 43.693844916349164], [7.549596388386161, 44.127901109384808], [7.007562290076661, 44.254766750661382], [6.749955275101711, 45.028517971367584], [7.096652459347835, 45.333098863295859], [6.80235517744566, 45.708579820328673], [6.84359297041456, 45.991146552100659], [7.273850945676683, 45.776947740250748], [7.755992058959832, 45.824490057959267], [8.316629672894377, 46.16364248309084], [8.489952426801294, 46.005150865251736], [8.966305779667833, 46.03693187111115], [9.18288170740311, 46.440214748716976], [9.92283654139035, 46.314899400409182], [10.363378126678665, 46.48357127540983], [10.4427014502466, 46.893546250997431], [11.048555942436504, 46.751358547546396], [11.164827915093325, 46.941579494812729], [12.153088006243079, 47.115393174826423], [12.376485223040842, 46.767559109069872]]]] } },
-            { "type": "Feature", "properties": { "admin": "Jamaica", "name": "Jamaica", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-77.569600796199197, 18.490525417550483], [-76.896618618462114, 18.400866807524078], [-76.365359056285527, 18.16070058844759], [-76.19965857614163, 17.886867173732963], [-76.902561408175671, 17.868237819891743], [-77.206341315403449, 17.701116237859818], [-77.766022915340599, 17.861597398342237], [-78.337719285785596, 18.225967922432226], [-78.217726610003865, 18.454532782459193], [-77.797364671525614, 18.524218451404774], [-77.569600796199197, 18.490525417550483]]] } },
-            { "type": "Feature", "properties": { "admin": "Jordan", "name": "Jordan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.545665317534535, 32.393992011030569], [35.719918247222743, 32.709192409794859], [36.834062127435537, 32.312937526980768], [38.792340529136077, 33.378686428352218], [39.195468377444961, 32.16100881604266], [39.004885695152545, 32.010216986614971], [37.002165561681004, 31.508412990844736], [37.998848911294367, 30.508499864213128], [37.668119744626374, 30.338665269485894], [37.503581984209028, 30.003776150018396], [36.740527784987243, 29.865283311476183], [36.501214227043583, 29.505253607698702], [36.068940870922049, 29.19749461518445], [34.956037225084252, 29.356554673778835], [34.922602573391423, 29.501326198844517], [35.420918409981958, 31.100065822874349], [35.397560662586038, 31.489086005167572], [35.545251906076196, 31.782504787720832], [35.545665317534535, 32.393992011030569]]] } },
-            { "type": "Feature", "properties": { "admin": "Japan", "name": "Japan", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[134.638428176003856, 34.149233710256418], [134.766379022358478, 33.806334743783673], [134.20341596897083, 33.201177883429622], [133.792950067276479, 33.521985175097583], [133.280268182508848, 33.289570420864941], [133.014858026257855, 32.704567369104772], [132.363114862192674, 32.989382025681373], [132.371176385630179, 33.463642483040068], [132.924372593314786, 34.060298570282036], [133.492968377822194, 33.944620876596694], [133.904106073136347, 34.364931138642611], [134.638428176003856, 34.149233710256418]]], [[[140.976387567305267, 37.142074286440156], [140.599769728762084, 36.343983466124534], [140.774074334882641, 35.842877102190229], [140.253279250245072, 35.138113918593653], [138.975527785396196, 34.667600002576101], [137.217598911691198, 34.606285915661843], [135.792983026268871, 33.46480520276662], [135.120982700745401, 33.849071153289053], [135.07943484918269, 34.596544908174813], [133.340316196831964, 34.375938218720755], [132.156770868051296, 33.904933376596503], [130.986144647343451, 33.885761420216276], [132.000036248910021, 33.149992377244608], [131.33279015515734, 31.450354519164836], [130.68631798718593, 31.029579169228235], [130.202419875204953, 31.418237616495411], [130.447676222862128, 32.319474595665717], [129.81469160371887, 32.610309556604385], [129.408463169472554, 33.296055813117583], [130.353935174684636, 33.604150702441693], [130.878450962447118, 34.232742824840031], [131.884229364143891, 34.749713853487911], [132.617672967662486, 35.433393052709413], [134.608300815977771, 35.731617743465812], [135.677537876528902, 35.527134100886819], [136.723830601142424, 37.304984239240376], [137.390611607004473, 36.827390651998819], [138.857602166906247, 37.827484646143454], [139.426404657142882, 38.215962225897634], [140.054790073812057, 39.438807481436378], [139.883379347899847, 40.563312486323682], [140.305782505453664, 41.195005194659551], [141.368973423426667, 41.378559882160282], [141.914263136970476, 39.991616115878678], [141.884600864834965, 39.18086456965149], [140.959489373945729, 38.174000962876583], [140.976387567305267, 37.142074286440156]]], [[[143.910161981379474, 44.174099839853724], [144.613426548439634, 43.960882880217511], [145.320825230083074, 44.384732977875437], [145.543137241802754, 43.262088324550596], [144.059661899999867, 42.988358262700551], [143.183849725517291, 41.995214748699183], [141.611490920172457, 42.678790595056071], [141.067286411706618, 41.58459381770799], [139.95510623592105, 41.56955597591103], [139.817543573159924, 42.563758856774392], [140.312087030193169, 43.333272610032644], [141.380548944259999, 43.388824774746489], [141.671952345953912, 44.772125352551477], [141.967644891527982, 45.551483466161343], [143.142870314709796, 44.510358384776957], [143.910161981379474, 44.174099839853724]]]] } },
-            { "type": "Feature", "properties": { "admin": "Kazakhstan", "name": "Kazakhstan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[70.962314894499272, 42.26615428320553], [70.388964878220776, 42.081307684897517], [69.070027296835221, 41.384244289712335], [68.632482944620037, 40.668680731766855], [68.259895867795635, 40.662324530594894], [67.985855747351806, 41.135990708982199], [66.714047072216587, 41.168443508461557], [66.510648634715707, 41.987644151368549], [66.023391554635609, 41.994646307944031], [66.098012322865188, 42.997660020513074], [64.90082441595932, 43.728080552742647], [63.18578698105658, 43.650074978197999], [62.013300408786264, 43.504476630215649], [61.05831994003249, 44.405816962250576], [60.239971958258472, 44.784036770194739], [58.689989048095796, 45.500013739598721], [58.503127068928428, 45.58680430763296], [55.928917270741167, 44.995858466159163], [55.968191359283011, 41.30864166926937], [55.455251092353805, 41.259859117185826], [54.755345493392653, 42.04397146256661], [54.079417759014959, 42.324109402020831], [52.944293247291725, 42.116034247397572], [52.502459751196277, 41.783315538086462], [52.446339145727208, 42.027150783855561], [52.692112257707251, 42.443895372073364], [52.501426222550315, 42.792297878585188], [51.342427199108201, 43.132974758469338], [50.891291945200223, 44.031033637053774], [50.339129266161358, 44.284015611338468], [50.305642938036257, 44.609835516938908], [51.278503452363211, 44.514854234386448], [51.316899041556034, 45.245998236667894], [52.167389764215713, 45.408391425145098], [53.040876499245194, 45.259046535821753], [53.220865512917712, 46.23464590105992], [53.042736850807771, 46.853006089864486], [52.042022739475598, 46.804636949239232], [51.191945428274252, 47.048704738953909], [50.034083286342465, 46.608989976582208], [49.10116, 46.39933000000012], [48.593241001180495, 46.561034247415471], [48.694733514201729, 47.075628160177921], [48.057253045449258, 47.743752753279516], [47.315231154170242, 47.715847479841948], [46.466445753776256, 48.394152330104923], [47.043671502476506, 49.1520388860976], [46.751596307162728, 49.35600576435376], [47.549480421749301, 50.454698391311119], [48.577841424357523, 49.874759629915658], [48.702381626181008, 50.605128485712825], [50.766648390512145, 51.692762356159889], [52.328723585830957, 51.71865224873811], [54.53287845237621, 51.026239732459302], [55.716940545479801, 50.62171662047853], [56.777961053296551, 51.043551337277037], [58.363290643146733, 51.063653469438563], [59.642282342370599, 50.545442206415707], [59.932807244715484, 50.842194118851857], [61.337424350840919, 50.799070136104248], [61.588003371024158, 51.2726587998432], [59.967533807215531, 51.960420437215696], [60.927268507740258, 52.447548326215028], [60.739993117114572, 52.719986477257734], [61.699986199800584, 52.979996446334255], [60.978066440683151, 53.664993394579128], [61.436591424409052, 54.006264553434775], [65.178533563095911, 54.354227810272093], [65.66687584825398, 54.601266994843449], [68.169100376258811, 54.970391750704309], [69.068166945272864, 55.385250149143516], [70.865266554655122, 55.169733588270091], [71.180131056609397, 54.133285224008247], [72.224150018202167, 54.376655381886728], [73.508516066384388, 54.035616766976588], [73.425678745420427, 53.489810289109741], [74.384845005190044, 53.546861070360066], [76.891100294913414, 54.490524400441913], [76.525179477854735, 54.177003485727127], [77.800915561844221, 53.404414984747561], [80.035559523441663, 50.864750881547238], [80.568446893235475, 51.388336493528456], [81.945985548839914, 50.812195949906354], [83.383003778012366, 51.069182847693909], [83.935114780618832, 50.889245510453563], [84.416377394553052, 50.311399644565817], [85.115559523462011, 50.117302964877631], [85.541269972682457, 49.69285858824815], [86.829356723989619, 49.826674709668154], [87.359970330762664, 49.214980780629148], [86.598776483103379, 48.549181626980605], [85.768232863308285, 48.455750637396974], [85.72048383987071, 47.452969468773112], [85.164290399113355, 47.000955715516099], [83.180483839860443, 47.330031236350848], [82.458925815769106, 45.539649563166499], [81.947070753918112, 45.317027492853235], [79.966106398441397, 44.917516994804643], [80.866206496101356, 43.180362046881037], [80.180150180994289, 42.920067857426936], [80.259990268885332, 42.349999294599101], [79.643645460940135, 42.496682847659649], [79.142177361979776, 42.856092434249589], [77.658391961583206, 42.960685533208327], [76.000353631498555, 42.988022365890622], [75.636964959622091, 42.877899888676765], [74.212865838522575, 43.298339341803505], [73.645303582660901, 43.091271877609863], [73.489757521462337, 42.500894476891276], [71.844638299450637, 42.845395412765178], [71.186280552052253, 42.704292914392219], [70.962314894499272, 42.26615428320553]]] } },
-            { "type": "Feature", "properties": { "admin": "Kenya", "name": "Kenya", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[40.993, -0.85829], [41.58513, -1.68325], [40.88477, -2.08255], [40.63785, -2.49979], [40.26304, -2.57309], [40.12119, -3.27768], [39.80006, -3.68116], [39.60489, -4.34653], [39.20222, -4.67677], [37.7669, -3.67712], [37.69869, -3.09699], [34.07262, -1.05982], [33.903711197104521, -0.95], [33.893568969666937, 0.109813537861896], [34.18, 0.515], [34.6721, 1.17694], [35.03599, 1.90584], [34.59607, 3.05374], [34.47913, 3.5556], [34.005, 4.249884947362047], [34.620196267853871, 4.847122742081987], [35.298007118232974, 5.506], [35.817447662353501, 5.338232082790795], [35.817447662353501, 4.776965663461889], [36.159078632855639, 4.447864127672768], [36.855093238008116, 4.447864127672768], [38.120915, 3.598605], [38.43697, 3.58851], [38.67114, 3.61607], [38.89251, 3.50074], [39.559384258765846, 3.42206], [39.85494, 3.83879], [40.76848, 4.25702], [41.1718, 3.91909], [41.855083092643966, 3.918911920483726], [40.98105, 2.78452], [40.993, -0.85829]]] } },
-            { "type": "Feature", "properties": { "admin": "Kyrgyzstan", "name": "Kyrgyzstan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[70.96231489449913, 42.266154283205481], [71.186280552052111, 42.704292914392127], [71.84463829945058, 42.845395412765093], [73.489757521462337, 42.500894476891311], [73.645303582660901, 43.09127187760982], [74.212865838522546, 43.298339341803363], [75.636964959622006, 42.877899888676673], [76.000353631498442, 42.988022365890664], [77.658391961583206, 42.960685533208256], [79.142177361979762, 42.856092434249511], [79.643645460940107, 42.496682847659514], [80.259990268885289, 42.349999294599044], [80.119430373051358, 42.123940741538235], [78.543660923175295, 41.582242540038685], [78.187196893225959, 41.185315863604792], [76.904484490877067, 41.066485907549634], [76.526368035797432, 40.427946071935111], [75.467827996730691, 40.562072251948663], [74.776862420556043, 40.366425279291619], [73.822243686828287, 39.893973497063179], [73.960013055318413, 39.660008449861721], [73.67537926625478, 39.431236884105594], [71.784693637991992, 39.279463202464363], [70.549161818325601, 39.604197902986492], [69.464886915977516, 39.526683254548693], [69.559609816368507, 40.103211371412968], [70.648018833299957, 39.935753892571157], [71.014198032520156, 40.244365546218226], [71.774875115856545, 40.145844428053763], [73.055417108049156, 40.86603302668945], [71.870114780570447, 41.392900092121259], [71.157858514291576, 41.143587144529107], [70.420022414028196, 41.519998277343134], [71.259247674448218, 42.167710679689456], [70.96231489449913, 42.266154283205481]]] } },
-            { "type": "Feature", "properties": { "admin": "Cambodia", "name": "Cambodia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[103.497279901139677, 10.632555446815926], [103.090689731867229, 11.153660590047162], [102.58493248902667, 12.186594956913279], [102.348099399833004, 13.39424734135822], [102.988422072361601, 14.225721136934464], [104.281418084736586, 14.416743068901363], [105.218776890078871, 14.27321177821069], [106.04394616091551, 13.881091009979952], [106.496373325630856, 14.57058380783428], [107.382727492301058, 14.202440904186968], [107.614547967562402, 13.535530707244202], [107.491403029410861, 12.337205918827944], [105.810523716253101, 11.567614650921225], [106.249670037869436, 10.961811835163585], [105.199914992292321, 10.889309800658094], [104.334334751403446, 10.486543687375228], [103.497279901139677, 10.632555446815926]]] } },
-            { "type": "Feature", "properties": { "admin": "South Korea", "name": "Korea", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[128.349716424676586, 38.612242946927843], [129.212919549680038, 37.432392483055942], [129.460449660358137, 36.784189154602821], [129.468304478066472, 35.632140611303939], [129.091376580929563, 35.08248423923142], [128.18585045787907, 34.890377102186385], [127.386519403188373, 34.475673733044111], [126.485747511908713, 34.390045884736473], [126.3739197124291, 34.934560451795939], [126.559231398627773, 35.684540513647896], [126.117397902532261, 36.725484727519252], [126.860143263863364, 36.893924058574612], [126.174758742376213, 37.749685777328033], [126.237338901881742, 37.840377916000271], [126.683719924018888, 37.804772854151174], [127.073308547067342, 38.256114813788393], [127.780035435090966, 38.304535630845884], [128.205745884311426, 38.370397243801882], [128.349716424676586, 38.612242946927843]]] } },
-            { "type": "Feature", "properties": { "admin": "Kosovo", "name": "Kosovo", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.76216, 42.05186], [20.717310000000108, 41.84711], [20.59023, 41.85541], [20.52295, 42.21787], [20.28374, 42.32025], [20.0707, 42.58863], [20.25758, 42.81275], [20.49679, 42.88469], [20.63508, 43.21671], [20.81448, 43.27205], [20.95651, 43.13094], [21.143395, 43.068685000000123], [21.27421, 42.90959], [21.43866, 42.86255], [21.63302, 42.67717], [21.77505, 42.6827], [21.66292, 42.43922], [21.54332, 42.32025], [21.576635989402117, 42.245224397061847], [21.352700000000134, 42.2068], [20.76216, 42.05186]]] } },
-            { "type": "Feature", "properties": { "admin": "Kuwait", "name": "Kuwait", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[47.974519077349889, 29.975819200148493], [48.183188510944483, 29.534476630159759], [48.09394331237641, 29.306299343374999], [48.416094191283939, 28.552004299426663], [47.708850538937376, 28.526062730416136], [47.459821811722819, 29.002519436147217], [46.568713413281742, 29.099025173452283], [47.302622104690947, 30.059069932570711], [47.974519077349889, 29.975819200148493]]] } },
-            { "type": "Feature", "properties": { "admin": "Laos", "name": "Lao PDR", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[105.218776890078871, 14.27321177821069], [105.544338413517664, 14.723933620660414], [105.589038527450128, 15.570316066952856], [104.779320509868768, 16.441864935771445], [104.716947056092465, 17.428858954330078], [103.956476678485288, 18.240954087796872], [103.200192091893726, 18.309632066312769], [102.998705682387694, 17.961694647691598], [102.413004998791592, 17.932781683824281], [102.113591750092453, 18.109101670804161], [101.059547560635139, 17.512497259994486], [101.035931431077742, 18.408928330961611], [101.282014601651667, 19.462584947176762], [100.606293573003128, 19.508344427971217], [100.548881056726856, 20.109237982661124], [100.115987583417819, 20.41784963630818], [100.329101190189519, 20.786121731036229], [101.180005324307515, 21.436572984294024], [101.270025669359939, 21.201651923095177], [101.803119744882906, 21.174366766845065], [101.652017856861491, 22.318198757409544], [102.170435825613552, 22.464753119389297], [102.754896274834636, 21.675137233969462], [103.203861118586431, 20.766562201413745], [104.435000441508024, 20.758733221921528], [104.822573683697073, 19.886641750563879], [104.183387892678908, 19.624668077060214], [103.896532017026701, 19.265180975821799], [105.094598423281496, 18.666974595611073], [105.925762160264, 17.485315456608955], [106.55600792849566, 16.604283962464802], [107.312705926545576, 15.908538316303177], [107.564525181103875, 15.202173163305554], [107.382727492301058, 14.202440904186968], [106.496373325630856, 14.57058380783428], [106.04394616091551, 13.881091009979952], [105.218776890078871, 14.27321177821069]]] } },
-            { "type": "Feature", "properties": { "admin": "Lebanon", "name": "Lebanon", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.821100701650231, 33.277426459276292], [35.552796665190805, 33.264274807258012], [35.460709262846699, 33.089040025356276], [35.126052687324538, 33.090900376918775], [35.48220665868012, 33.905450140919434], [35.979592319489392, 34.610058295219126], [35.998402540843628, 34.644914048799997], [36.448194207512095, 34.59393524834406], [36.611750115715886, 34.201788641897174], [36.066460402172048, 33.824912421192543], [35.821100701650231, 33.277426459276292]]] } },
-            { "type": "Feature", "properties": { "admin": "Liberia", "name": "Liberia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-7.712159389669749, 4.364565944837721], [-7.974107224957249, 4.355755113131961], [-9.004793667018673, 4.832418524592199], [-9.913420376006682, 5.593560695819205], [-10.765383876986643, 6.140710760925556], [-11.438779466182053, 6.785916856305746], [-11.199801805048278, 7.105845648624735], [-11.14670427086838, 7.396706447779534], [-10.695594855176477, 7.939464016141085], [-10.230093553091276, 8.406205552601291], [-10.016566534861253, 8.42850393313523], [-9.755342169625832, 8.541055202666923], [-9.33727983238458, 7.928534450711351], [-9.403348151069748, 7.526905218938906], [-9.208786383490844, 7.313920803247952], [-8.926064622422002, 7.309037380396375], [-8.722123582382123, 7.711674302598509], [-8.439298468448696, 7.686042792181736], [-8.485445522485348, 7.395207831243068], [-8.385451626000572, 6.911800645368742], [-8.602880214868618, 6.467564195171659], [-8.311347622094017, 6.193033148621081], [-7.993692592795879, 6.126189683451541], [-7.570152553731686, 5.707352199725903], [-7.53971513511176, 5.313345241716517], [-7.63536821128403, 5.188159084489455], [-7.712159389669749, 4.364565944837721]]] } },
-            { "type": "Feature", "properties": { "admin": "Libya", "name": "Libya", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[14.8513, 22.862950000000119], [14.143870883855239, 22.491288967371126], [13.581424594790459, 23.040506089769274], [11.999505649471697, 23.471668402596432], [11.560669386449032, 24.09790924732561], [10.771363559622952, 24.562532050061741], [10.303846876678445, 24.379313259370967], [9.948261346078024, 24.936953640232613], [9.910692579801774, 25.365454616796789], [9.319410841518218, 26.094324856057476], [9.716285841519662, 26.512206325785652], [9.629056023811073, 27.140953477481041], [9.756128370816779, 27.688258571884198], [9.68388471847288, 28.144173895779311], [9.859997999723472, 28.959989732371064], [9.805634392952353, 29.424638373323369], [9.482139926805415, 30.307556057246181], [9.970017124072966, 30.539324856075375], [10.056575148161697, 30.961831366493517], [9.950225050505194, 31.376069647745275], [10.636901482799484, 31.761420803345679], [10.944789666394511, 32.081814683555358], [11.43225345220378, 32.368903103152824], [11.488787469131008, 33.136995754523234], [12.66331, 32.79278], [13.08326, 32.87882], [13.91868, 32.71196], [15.24563, 32.26508], [15.71394, 31.37626], [16.61162, 31.18218], [18.02109, 30.76357], [19.08641, 30.26639], [19.57404, 30.52582], [20.05335, 30.98576], [19.82033, 31.751790000000135], [20.13397, 32.2382], [20.85452, 32.7068], [21.54298, 32.8432], [22.89576, 32.63858], [23.2368, 32.19149], [23.6091300000001, 32.18726], [23.9275, 32.01667], [24.92114, 31.89936], [25.16482, 31.56915], [24.80287, 31.08929], [24.95762, 30.6616], [24.70007, 30.04419], [25.00000000000011, 29.238654529533552], [25.00000000000011, 25.682499996360995], [25.00000000000011, 22.0], [25.00000000000011, 20.00304], [23.850000000000129, 20.0], [23.837660000000135, 19.580470000000101], [19.84926, 21.49509], [15.86085, 23.40972], [14.8513, 22.862950000000119]]] } },
-            { "type": "Feature", "properties": { "admin": "Sri Lanka", "name": "Sri Lanka", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[81.787959018891371, 7.523055324733162], [81.637322218760573, 6.481775214051921], [81.218019647144317, 6.197141424988287], [80.348356968104397, 5.968369859232154], [79.872468703128519, 6.763463446474928], [79.6951668639351, 8.200843410673384], [80.147800734379629, 9.824077663609554], [80.838817986986541, 9.268426825391186], [81.304319289071756, 8.564206244333688], [81.787959018891371, 7.523055324733162]]] } },
-            { "type": "Feature", "properties": { "admin": "Lesotho", "name": "Lesotho", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[28.978262566857236, -28.955596612261708], [29.325166456832587, -29.257386976846245], [29.018415154748016, -29.743765557577362], [28.848399692507734, -30.070050551068245], [28.291069370239903, -30.226216729454293], [28.107204624145421, -30.545732110314944], [27.749397006956478, -30.645105889612214], [26.999261915807629, -29.875953871379977], [27.532511020627471, -29.242710870075353], [28.07433841320778, -28.851468601193581], [28.541700066855491, -28.647501722937562], [28.978262566857236, -28.955596612261708]]] } },
-            { "type": "Feature", "properties": { "admin": "Lithuania", "name": "Lithuania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.731098667092649, 54.327536932993311], [22.651051873472536, 54.582740993866729], [22.757763706155256, 54.856574408581366], [22.31572350433057, 55.01529857036585], [21.26844892750346, 55.190481675835301], [21.05580040862241, 56.031076361711051], [22.201156853939491, 56.337801825579483], [23.878263787539957, 56.273671373105259], [24.860684441840753, 56.372528388079616], [25.000934279080887, 56.164530748104831], [25.533046502390327, 56.100296942766029], [26.494331495883749, 55.61510691997762], [26.588279249790386, 55.167175604871659], [25.768432651479792, 54.846962592175082], [25.536353794056989, 54.282423407602515], [24.45068362803703, 53.905702216194747], [23.484127638449841, 53.912497667041123], [23.243987257589506, 54.220566718149129], [22.731098667092649, 54.327536932993311]]] } },
-            { "type": "Feature", "properties": { "admin": "Luxembourg", "name": "Luxembourg", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[6.043073357781109, 50.128051662794221], [6.242751092156992, 49.90222565367872], [6.186320428094176, 49.4638028021145], [5.897759230176403, 49.442667141307012], [5.674051954784828, 49.52948354755749], [5.782417433300905, 50.090327867221205], [6.043073357781109, 50.128051662794221]]] } },
-            { "type": "Feature", "properties": { "admin": "Latvia", "name": "Latvia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[21.05580040862241, 56.031076361711051], [21.090423618257965, 56.783872789122924], [21.581866489353668, 57.411870632549913], [22.524341261492872, 57.753374335350756], [23.31845299652209, 57.006236477274854], [24.120729607853423, 57.025692654032753], [24.312862583114615, 57.793423570376966], [25.164593540149262, 57.970156968815175], [25.602809685984365, 57.847528794986559], [26.46353234223778, 57.476388658266316], [27.288184848751509, 57.474528306703817], [27.770015903440925, 57.244258124411218], [27.855282016722519, 56.759326483784278], [28.17670942557799, 56.169129950578807], [27.102459751094525, 55.783313707087672], [26.494331495883749, 55.61510691997762], [25.533046502390327, 56.100296942766029], [25.000934279080887, 56.164530748104831], [24.860684441840753, 56.372528388079616], [23.878263787539957, 56.273671373105259], [22.201156853939491, 56.337801825579483], [21.05580040862241, 56.031076361711051]]] } },
-            { "type": "Feature", "properties": { "admin": "Morocco", "name": "Morocco", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-5.193863491222031, 35.755182196590845], [-4.591006232105143, 35.330711981745644], [-3.640056525070007, 35.39985504815197], [-2.604305792644111, 35.17909332940112], [-2.169913702798624, 35.168396307916694], [-1.792985805661658, 34.527918606091298], [-1.73345455566141, 33.919712836232115], [-1.388049282222596, 32.864015000941372], [-1.124551153966195, 32.651521511357195], [-1.30789913573787, 32.262888902306024], [-2.616604783529567, 32.094346218386157], [-3.068980271812648, 31.724497992473285], [-3.647497931320145, 31.637294012980814], [-3.690441046554666, 30.896951605751152], [-4.859646165374442, 30.501187649043874], [-5.242129278982786, 30.00044302013557], [-6.060632290053745, 29.731699734001801], [-7.059227667661899, 29.57922842052465], [-8.67411617678283, 28.841288967396643], [-8.665589565454836, 27.656425889592462], [-8.817809007940523, 27.656425889592462], [-8.817828334986642, 27.656425889592462], [-8.794883999049032, 27.120696316022553], [-9.413037482124507, 27.088476060488539], [-9.735343390328749, 26.860944729107409], [-10.189424200877452, 26.860944729107409], [-10.551262579785258, 26.990807603456879], [-11.392554897496948, 26.883423977154386], [-11.718219773800339, 26.104091701760801], [-12.030758836301654, 26.030866197203121], [-12.500962693725368, 24.770116278578136], [-13.891110398809044, 23.691009019459383], [-14.22116777185715, 22.310163072188338], [-14.630832688850942, 21.860939846274867], [-14.750954555713404, 21.500600083903802], [-17.002961798561071, 21.42073415779668], [-17.020428432675768, 21.422310288981631], [-16.973247849993182, 21.88574453377495], [-16.589136928767626, 22.158234361250091], [-16.26192175949566, 22.679339504481273], [-16.326413946995896, 23.017768459560894], [-15.982610642958059, 23.723358466074096], [-15.426003790742183, 24.359133612561035], [-15.089331834360729, 24.520260728446964], [-14.824645148161689, 25.103532619725307], [-14.800925665739666, 25.636264960222285], [-14.439939947964827, 26.254418443297645], [-13.773804897506462, 26.618892320252279], [-13.13994177901429, 27.640147813420491], [-13.121613369914709, 27.654147671719805], [-12.61883663578311, 28.038185533148656], [-11.688919236690761, 28.148643907172577], [-10.9009569971044, 28.832142238880913], [-10.39959225100864, 29.09858592377778], [-9.564811163765624, 29.933573716749855], [-9.814718390329174, 31.177735500609053], [-9.434793260119362, 32.038096421836478], [-9.300692918321827, 32.564679266890629], [-8.657476365585039, 33.24024526624239], [-7.654178432638217, 33.697064927702506], [-6.912544114601358, 34.11047638603744], [-6.24434200685141, 35.145865383437517], [-5.929994269219832, 35.759988104793983], [-5.193863491222031, 35.755182196590845]]] } },
-            { "type": "Feature", "properties": { "admin": "Moldova", "name": "Moldova", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[26.619336785597788, 48.220726223333457], [26.857823520624798, 48.368210761094488], [27.52253746919515, 48.467119452501102], [28.259546746541837, 48.155562242213406], [28.670891147585163, 48.118148505234089], [29.122698195113024, 47.849095160506458], [29.050867954227321, 47.510226955752493], [29.415135125452732, 47.346645209332571], [29.559674106573105, 46.928582872091312], [29.908851759569295, 46.67436066343145], [29.838210076626289, 46.525325832701675], [30.024658644335364, 46.423936672545032], [29.759971958136383, 46.349987697935354], [29.170653924279879, 46.379262396828693], [29.072106967899288, 46.517677720722482], [28.862972446414055, 46.437889309263824], [28.933717482221621, 46.258830471372491], [28.659987420371575, 45.939986884131628], [28.48526940279276, 45.596907050145887], [28.233553501099035, 45.488283189468369], [28.054442986775392, 45.944586086605618], [28.160017937947707, 46.371562608417207], [28.128030226359037, 46.81047638608824], [27.551166212684841, 47.405117092470817], [27.233872918412736, 47.826770941756365], [26.924176059687561, 48.123264472030982], [26.619336785597788, 48.220726223333457]]] } },
-            { "type": "Feature", "properties": { "admin": "Madagascar", "name": "Madagascar", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[49.543518914595737, -12.469832858940553], [49.80898074727908, -12.895284925999551], [50.05651085795715, -13.555761407121981], [50.217431268114055, -14.758788750876795], [50.476536899625515, -15.226512139550541], [50.377111443895942, -15.706069431219122], [50.200274692593169, -16.000263360256763], [49.860605503138665, -15.414252618066913], [49.672606642460849, -15.710203545802477], [49.863344354050142, -16.451036879138773], [49.774564243372694, -16.875042006093597], [49.49861209493411, -17.10603565843827], [49.435618523970298, -17.953064060134363], [49.04179243347393, -19.118781019774442], [48.548540887247995, -20.496888116134119], [47.930749139198653, -22.391501153251077], [47.547723423051295, -23.781958916928513], [47.095761346226588, -24.941629733990446], [46.282477654817079, -25.178462823184102], [45.409507684110444, -25.601434421493082], [44.833573846217547, -25.346101169538933], [44.039720493349755, -24.9883452287823], [43.763768344911156, -24.460677178649988], [43.697777540874441, -23.574116306250595], [43.345654331237611, -22.77690398528387], [43.254187046080986, -22.057413018484116], [43.433297560404633, -21.336475111580185], [43.893682895692919, -21.163307386970121], [43.89637007017209, -20.830459486578167], [44.374325392439644, -20.072366224856385], [44.464397413924374, -19.435454196859045], [44.23242190936616, -18.961994724200899], [44.042976108584149, -18.331387220943167], [43.963084344260899, -17.409944756746778], [44.312468702986273, -16.850495700754951], [44.446517368351387, -16.216219170804504], [44.944936557806521, -16.179373874580396], [45.502731967964976, -15.974373467678538], [45.872993605336255, -15.793454278224681], [46.312243279817203, -15.780018405828795], [46.882182651564271, -15.210182386946309], [47.70512983581235, -14.594302666891762], [48.005214878131241, -14.091232598530372], [47.869047479042152, -13.663868503476582], [48.29382775248137, -13.784067884987483], [48.845060255738773, -13.08917489995866], [48.863508742066976, -12.487867933810417], [49.194651320193302, -12.040556735891967], [49.543518914595737, -12.469832858940553]]] } },
-            { "type": "Feature", "properties": { "admin": "Mexico", "name": "Mexico", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-97.140008307670684, 25.869997463478395], [-97.528072475966539, 24.992144069920297], [-97.702945522842214, 24.272343044526728], [-97.776041836319024, 22.932579860927653], [-97.872366706111094, 22.444211737553356], [-97.699043952204164, 21.898689480064256], [-97.388959520236739, 21.411018988525818], [-97.189333462293277, 20.635433254473124], [-96.525575527720306, 19.890930894444061], [-96.292127244841737, 19.32037140550954], [-95.90088497595994, 18.828024196848727], [-94.8390634834427, 18.562717393462204], [-94.425729539756205, 18.144370835843343], [-93.548651292682365, 18.423836981677933], [-92.786113857783477, 18.524838568592255], [-92.037348192090391, 18.704569200103432], [-91.407903408559235, 18.876083278880227], [-90.771869879910852, 19.284120388256778], [-90.533589850613026, 19.867418117751292], [-90.451475999701231, 20.707521877520428], [-90.278618333684889, 20.999855454995547], [-89.601321173851474, 21.261725775634485], [-88.543866339862845, 21.493675441976613], [-87.658416510757704, 21.458845526611977], [-87.051890224948053, 21.543543199138295], [-86.811982388032931, 21.331514797444747], [-86.845907965832595, 20.849864610268348], [-87.383291185235848, 20.255404771398727], [-87.621054450210721, 19.646553046135917], [-87.436750454441764, 19.472403469312265], [-87.586560431655911, 19.040130113190738], [-87.837191128271485, 18.259815985583426], [-88.090664028663156, 18.516647854074048], [-88.300031094093626, 18.499982204659997], [-88.490122850279278, 18.486830552641717], [-88.84834387892657, 17.883198147040329], [-89.029857347351737, 18.001511338772556], [-89.150909389995462, 17.955467637600403], [-89.143080410503316, 17.808318996649401], [-90.067933519230891, 17.819326076727517], [-91.001519945015943, 17.817594916245692], [-91.002269253284155, 17.254657701074272], [-91.453921271515114, 17.252177232324183], [-91.08167009150057, 16.918476670799517], [-90.711821865587623, 16.687483018454767], [-90.600846727240921, 16.470777899638787], [-90.438866950221993, 16.410109768128105], [-90.464472622422633, 16.069562079324722], [-91.747960171255926, 16.066564846251762], [-92.229248623406278, 15.251446641495871], [-92.087215949252013, 15.06458466232851], [-92.203229539747255, 14.830102850804108], [-92.227750006869812, 14.538828640190953], [-93.359463874061746, 15.61542959234367], [-93.875168830118511, 15.94016429286591], [-94.691656460330108, 16.20097524664288], [-95.250227016973014, 16.128318182840641], [-96.053382127653293, 15.752087917539592], [-96.557434048228274, 15.653515122942787], [-97.263592495496624, 15.917064927631312], [-98.013029954809596, 16.107311713113912], [-98.947675747456486, 16.566043402568763], [-99.697397427147024, 16.706164048728166], [-100.829498867581293, 17.171071071842047], [-101.666088629954444, 17.649026394109622], [-101.918528001700196, 17.916090196193974], [-102.478132086988907, 17.975750637275095], [-103.500989549558057, 18.292294623278845], [-103.917527432046811, 18.748571682200005], [-104.992009650475467, 19.316133938061679], [-105.493038499761411, 19.946767279535429], [-105.731396043707633, 20.434101874264108], [-105.397772996831321, 20.531718654863422], [-105.500660773524402, 20.816895046466122], [-105.27075232625792, 21.076284898355137], [-105.265817226974022, 21.422103583252348], [-105.603160976975374, 21.871145941652568], [-105.693413865973113, 22.269080308516148], [-106.028716396898943, 22.77375234627862], [-106.909980434988341, 23.767774359628895], [-107.91544877809136, 24.548915310152946], [-108.401904873470954, 25.172313951105931], [-109.260198737406625, 25.580609442644054], [-109.444089321717314, 25.824883938087673], [-109.291643846456267, 26.44293406829842], [-109.801457689231796, 26.676175645447923], [-110.391731737085692, 27.162114976504533], [-110.641018846461606, 27.859876003525521], [-111.178918830187826, 27.941240546169062], [-111.759606899851619, 28.467952582303944], [-112.228234626090369, 28.954408677683482], [-112.27182369672866, 29.266844387320074], [-112.80959448937395, 30.021113593052341], [-113.163810594518651, 30.786880804969424], [-113.148669399857141, 31.170965887978912], [-113.871881069781836, 31.56760834403519], [-114.205736660603506, 31.524045111613123], [-114.776451178835003, 31.79953217216114], [-114.936699795372121, 31.393484605427595], [-114.771231859173483, 30.91361725516526], [-114.673899298951739, 30.162681179315985], [-114.330974494262918, 29.750432440707407], [-113.588875088335413, 29.061611436473008], [-113.424053107540516, 28.826173610951223], [-113.271969367305502, 28.754782619739892], [-113.140039435664363, 28.411289374295954], [-112.962298346796473, 28.425190334582503], [-112.761587083774856, 27.78021678314752], [-112.457910529411635, 27.525813706974752], [-112.24495195193677, 27.171726792910754], [-111.616489020619184, 26.662817287700474], [-111.284674648872993, 25.732589830014426], [-110.987819383572386, 25.294606228124557], [-110.71000688357131, 24.826004340101854], [-110.655048997828871, 24.298594672131113], [-110.17285620811343, 24.265547593680417], [-109.771847093528521, 23.811182562754194], [-109.409104377055698, 23.364672349536242], [-109.433392300232896, 23.185587673428696], [-109.85421932660168, 22.818271592698061], [-110.031391974714424, 22.823077500901199], [-110.295070970483636, 23.430973212166684], [-110.949501309028022, 24.000964260345988], [-111.670568407012681, 24.484423122652508], [-112.182035895621468, 24.73841278736716], [-112.148988817170817, 25.470125230404044], [-112.300710822379671, 26.012004299416613], [-112.777296719191526, 26.321959540303162], [-113.464670783321907, 26.768185533143416], [-113.596729906043805, 26.639459540304465], [-113.848936733844241, 26.900063788352437], [-114.465746629680027, 27.142090358991361], [-115.055142178184965, 27.722726752222904], [-114.982252570437382, 27.798200181585109], [-114.570365566854917, 27.741485297144884], [-114.199328782999231, 28.115002549750553], [-114.162018398884612, 28.566111965442296], [-114.931842210736605, 29.279479275015483], [-115.518653937626965, 29.556361599235395], [-115.887365282029563, 30.180793768834171], [-116.2583503894529, 30.836464341753572], [-116.721526252084956, 31.635743720012037], [-117.127759999999839, 32.53534], [-115.99135, 32.612390000000111], [-114.72139, 32.72083], [-114.815, 32.52528], [-113.30498, 32.03914], [-111.02361, 31.33472], [-109.035, 31.341940000000129], [-108.24194, 31.34222], [-108.24, 31.754853718166366], [-106.507589999999851, 31.75452], [-106.1429, 31.39995], [-105.63159, 31.08383], [-105.03737, 30.64402], [-104.70575, 30.12173], [-104.456969999999885, 29.57196], [-103.94, 29.27], [-103.11, 28.97], [-102.48, 29.76], [-101.6624, 29.7793], [-100.9576, 29.380710000000125], [-100.45584, 28.696120000000118], [-100.11, 28.11000000000012], [-99.52, 27.54], [-99.3, 26.84], [-99.019999999999897, 26.37], [-98.24, 26.06], [-97.529999999999887, 25.84], [-97.140008307670684, 25.869997463478395]]] } },
-            { "type": "Feature", "properties": { "admin": "Macedonia", "name": "Macedonia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.59023, 41.85541], [20.717310000000108, 41.84711], [20.76216, 42.05186], [21.352700000000134, 42.2068], [21.576635989402117, 42.245224397061847], [21.917080000000105, 42.30364], [22.380525750424674, 42.320259507815074], [22.881373732197339, 41.999297186850349], [22.952377150166505, 41.337993882811176], [22.76177, 41.3048], [22.597308383889008, 41.130487168943198], [22.055377638444266, 41.149865831052686], [21.674160597426969, 40.93127452245794], [21.020040317476397, 40.842726955725873], [20.60518, 41.08622], [20.46315, 41.51509], [20.59023, 41.85541]]] } },
-            { "type": "Feature", "properties": { "admin": "Mali", "name": "Mali", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-12.170750291380299, 14.616834214735503], [-11.834207526079465, 14.799096991428936], [-11.666078253617853, 15.388208319556295], [-11.349095017939502, 15.411256008358475], [-10.650791388379414, 15.132745876521422], [-10.086846482778212, 15.330485744686269], [-9.700255092802703, 15.264107367407359], [-9.550238409859388, 15.486496893775435], [-5.537744309908446, 15.501689764869253], [-5.315277268891931, 16.201853745991837], [-5.488522508150438, 16.325102037007962], [-5.971128709324247, 20.640833441647626], [-6.453786586930334, 24.956590684503418], [-4.92333736817423, 24.974574082940993], [-1.550054897457613, 22.792665920497377], [1.823227573259032, 20.61080943448604], [2.060990838233919, 20.142233384679482], [2.683588494486428, 19.856230170160114], [3.146661004253899, 19.693578599521441], [3.158133172222704, 19.057364203360034], [4.267419467800038, 19.155265204336995], [4.270209995143801, 16.852227484601212], [3.723421665063482, 16.184283759012612], [3.638258904646476, 15.568119818580453], [2.749992709981483, 15.409524847876693], [1.385528191746857, 15.323561102759168], [1.01578331869851, 14.968182277887944], [0.374892205414682, 14.928908189346128], [-0.26625729003058, 14.924308986872147], [-0.515854458000348, 15.116157741755725], [-1.066363491205663, 14.973815009007764], [-2.001035122068771, 14.559008287000887], [-2.191824510090384, 14.246417548067352], [-2.967694464520576, 13.798150336151506], [-3.103706834312759, 13.54126679122859], [-3.52280270019986, 13.337661647998612], [-4.006390753587225, 13.472485459848112], [-4.280405035814879, 13.228443508349738], [-4.427166103523802, 12.542645575404292], [-5.220941941743119, 11.713858954307224], [-5.197842576508648, 11.375145778850136], [-5.470564947929004, 10.951269842976044], [-5.404341599946973, 10.370736802609144], [-5.816926235365286, 10.222554633012191], [-6.050452032892266, 10.096360785355442], [-6.205222947606429, 10.524060777219132], [-6.493965013037267, 10.411302801958268], [-6.666460944027547, 10.430810655148447], [-6.850506557635057, 10.138993841996237], [-7.622759161804808, 10.147236232946792], [-7.89958980959237, 10.297382106970824], [-8.029943610048617, 10.206534939001711], [-8.335377163109738, 10.494811916541932], [-8.282357143578279, 10.792597357623842], [-8.407310756860026, 10.90925690352276], [-8.620321010767126, 10.810890814655181], [-8.581305304386772, 11.136245632364801], [-8.376304897484911, 11.393645941610627], [-8.786099005559462, 11.812560939984705], [-8.905264858424529, 12.088358059126433], [-9.127473517279581, 12.308060411015331], [-9.327616339546008, 12.334286200403451], [-9.567911749703212, 12.194243068892472], [-9.890992804392011, 12.060478623904968], [-10.165213792348835, 11.844083563682743], [-10.593223842806278, 11.923975328005977], [-10.870829637078211, 12.177887478072106], [-11.036555955438256, 12.211244615116513], [-11.297573614944508, 12.077971096235768], [-11.456168585648269, 12.076834214725336], [-11.513942836950587, 12.442987575729415], [-11.467899135778522, 12.754518947800973], [-11.553397793005427, 13.141213690641063], [-11.927716030311613, 13.422075100147392], [-12.124887457721256, 13.994727484589784], [-12.170750291380299, 14.616834214735503]]] } },
-            { "type": "Feature", "properties": { "admin": "Myanmar", "name": "Myanmar", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[99.543309360759281, 20.186597601802056], [98.959675734454848, 19.752980658440944], [98.253723992915582, 19.708203029860041], [97.797782830804394, 18.627080389881751], [97.375896437573516, 18.445437730375811], [97.859122755934848, 17.567946071843657], [98.493761020911322, 16.837835598207928], [98.90334842325673, 16.177824204976115], [98.537375929765687, 15.308497422746081], [98.192074009191373, 15.123702500870349], [98.430819126379859, 14.622027696180831], [99.097755161538728, 13.827502549693275], [99.212011753336071, 13.269293728076462], [99.196353794351637, 12.804748439988666], [99.587286004639694, 11.892762762901695], [99.038120558673953, 10.960545762572435], [98.553550653073017, 9.932959906448543], [98.457174106848697, 10.675266018105146], [98.764545526120756, 11.441291612183745], [98.428338657629823, 12.032986761925681], [98.509574009192661, 13.122377631070675], [98.103603957107666, 13.64045970301285], [97.777732375075161, 14.837285874892638], [97.597071567782749, 16.100567938699765], [97.164539829499773, 16.928734442609336], [96.505768670642965, 16.427240505432845], [95.369352248112378, 15.714389960182599], [94.808404575584092, 15.803454291237637], [94.188804152404515, 16.037936102762014], [94.533485955791321, 17.277240301985724], [94.324816522196741, 18.213513902249893], [93.540988397193615, 19.366492621330021], [93.663254835996199, 19.726961574781992], [93.078277622452163, 19.855144965081973], [92.368553501355606, 20.670883287025344], [92.30323449093865, 21.475485337809815], [92.652257114637976, 21.324047552978481], [92.672720981825549, 22.041238918541247], [93.166127557348361, 22.278459580977099], [93.060294224014598, 22.703110663335565], [93.286326938859247, 23.043658352138998], [93.325187615942767, 24.078556423432197], [94.106741977925054, 23.850740871673477], [94.552657912171611, 24.675238348890328], [94.603249139385355, 25.162495428970399], [95.155153436262566, 26.001307277932078], [95.124767694074933, 26.573572089132295], [96.419365675850941, 27.264589341739221], [97.133999058015277, 27.08377350514996], [97.051988559968066, 27.699058946233144], [97.402561476636123, 27.88253611908544], [97.327113885490007, 28.261582749946331], [97.91198774616943, 28.335945136014338], [98.24623091023328, 27.747221381129172], [98.682690057370451, 27.508812160750612], [98.712093947344499, 26.74353587494026], [98.671838006589127, 25.918702500913518], [97.724609002679117, 25.083637193292994], [97.604719679761956, 23.897404690033039], [98.660262485755737, 24.063286037689959], [98.898749220782747, 23.142722072842524], [99.531992222087382, 22.949038804612574], [99.240898878987224, 22.118314317304577], [99.983489211021464, 21.742936713136398], [100.416537713627349, 21.558839423096607], [101.150032993578222, 21.849984442629015], [101.180005324307515, 21.436572984294024], [100.329101190189519, 20.786121731036229], [100.115987583417819, 20.41784963630818], [99.543309360759281, 20.186597601802056]]] } },
-            { "type": "Feature", "properties": { "admin": "Montenegro", "name": "Montenegro", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[19.801613396898681, 42.500093492190835], [19.738051385179627, 42.688247382165564], [19.30449, 42.19574], [19.371770000000136, 41.87755], [19.16246, 41.95502], [18.88214, 42.28151], [18.45, 42.48], [18.56, 42.65], [18.70648, 43.20011], [19.03165, 43.43253], [19.21852, 43.52384], [19.48389, 43.35229], [19.63, 43.213779970270522], [19.95857, 43.10604], [20.3398, 42.89852], [20.25758, 42.81275], [20.0707, 42.58863], [19.801613396898681, 42.500093492190835]]] } },
-            { "type": "Feature", "properties": { "admin": "Mongolia", "name": "Mongolia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[87.751264276076697, 49.297197984405479], [88.805566847695488, 49.470520738312409], [90.713667433640666, 50.331811835321076], [92.234711541719662, 50.802170722041716], [93.104219191462661, 50.495290228876414], [94.147566359435615, 50.480536607457083], [94.815949334698701, 50.013433335970838], [95.814027947983973, 49.977466539095708], [97.259727817781396, 49.726060695995727], [98.231761509191543, 50.422400621128737], [97.825739780674283, 51.010995184933165], [98.861490513100307, 52.047366034546684], [99.981732212323507, 51.634006252643978], [100.889480421962588, 51.516855780638316], [102.065222609467298, 51.25992055928311], [102.255908644624299, 50.510560614618669], [103.676545444760194, 50.089966132195109], [104.621552362081687, 50.275329494826067], [105.886591424586726, 50.406019192092209], [106.888804152455336, 50.274295966180219], [107.868175897250936, 49.793705145865808], [108.475167270951275, 49.282547715850725], [109.402449171996636, 49.292960516957535], [110.662010532678764, 49.130128078805861], [111.581230910286607, 49.377968248077678], [112.897739699354361, 49.543565375356984], [114.362456496235239, 50.248302720737399], [114.962109816550154, 50.140247300815112], [115.485695428531386, 49.805177313834591], [116.678800897286152, 49.888531399121376], [116.191802199367544, 49.134598090199091], [115.485282017073018, 48.135382595403428], [115.742837355615748, 47.726544501326273], [116.308952671373206, 47.853410142602826], [117.295507440257396, 47.69770905210742], [118.064142694166691, 48.066730455103674], [118.866574334794933, 47.747060044946153], [119.772823927897477, 47.048058783550125], [119.66326989143873, 46.692679958678909], [118.874325799638711, 46.805412095723646], [117.421701287914175, 46.672732855814253], [116.717868280098841, 46.388202419615205], [115.985096470200062, 45.727235012385989], [114.46033165899604, 45.339816799493811], [113.463906691544139, 44.808893134127111], [112.436062453258785, 45.011645616224278], [111.873306105600278, 45.102079372735055], [111.348376906379428, 44.457441718110083], [111.667737257943202, 44.073175767587706], [111.829587843881342, 43.743118394539515], [111.129682244920218, 43.406834011400136], [110.412103306115256, 42.871233628911014], [109.243595819131428, 42.519446316084093], [107.744772576937933, 42.481515814781865], [106.129315627061658, 42.134327704428898], [104.964993931093446, 41.597409572916334], [104.522281935648977, 41.908346666016541], [103.312278273534787, 41.907468166667591], [101.833040399179922, 42.51487295182627], [100.845865513108237, 42.663804429691439], [99.515817498780009, 42.524691473961717], [97.451757440177985, 42.748889675460013], [96.349395786527793, 42.725635280928678], [95.762454868556674, 43.319449164394598], [95.306875441471504, 44.241330878265458], [94.688928664125299, 44.352331854828414], [93.480733677141274, 44.975472113619951], [92.133890822318193, 45.115075995456444], [90.945539585334288, 45.286073309910265], [90.585768263718265, 45.719716091487513], [90.970809360724985, 46.888146063822923], [90.280825636763893, 47.693549099307923], [88.854297723346733, 48.06908173277295], [88.013832228551721, 48.599462795600601], [87.751264276076697, 49.297197984405479]]] } },
-            { "type": "Feature", "properties": { "admin": "Mozambique", "name": "Mozambique", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.559989047999345, -11.520020033415923], [35.312397902169032, -11.439146416879145], [36.514081658684248, -11.720938002166733], [36.775150994622791, -11.594537448780804], [37.471284214026596, -11.568750909067157], [37.827644891111383, -11.268769219612834], [38.427556593587745, -11.285202325081654], [39.521029900883768, -10.896853936408224], [40.316588576017182, -10.317096042525696], [40.478387485523022, -10.765440769089992], [40.437253045418672, -11.761710707245014], [40.560811395028558, -12.639176527561023], [40.599620395679743, -14.201975192931858], [40.775475294768988, -14.691764418194239], [40.477250604012596, -15.406294447493968], [40.089263950365208, -16.100774021064456], [39.452558628097044, -16.720891208566936], [38.53835086442151, -17.101023044505954], [37.411132846838875, -17.586368096591233], [36.281279331209348, -18.659687595293445], [35.896496616364054, -18.842260430580634], [35.198399692533137, -19.552811374593887], [34.786383497870041, -19.784011732667732], [34.701892531072836, -20.497043145431007], [35.176127150215358, -21.254361260668407], [35.373427768705731, -21.840837090748874], [35.385848253705397, -22.14], [35.562545536369079, -22.09], [35.533934767404297, -23.070787855727751], [35.371774122872374, -23.535358982031692], [35.607470330555621, -23.706563002214676], [35.458745558419615, -24.122609958596545], [35.040734897610655, -24.478350518493798], [34.215824008935463, -24.816314385682652], [33.013210076639005, -25.357573337507731], [32.574632195777859, -25.727318210556088], [32.660363396950082, -26.148584486599443], [32.915955031065685, -26.215867201443459], [32.830120477028878, -26.74219166433619], [32.071665480281062, -26.733820082304902], [31.985779249811962, -26.29177988048022], [31.837777947728057, -25.843331801051342], [31.752408481581874, -25.484283949487406], [31.930588820124242, -24.369416599222532], [31.670397983534645, -23.658969008073861], [31.191409132621278, -22.251509698172395], [32.244988234188007, -21.116488539313689], [32.508693068173436, -20.395292250248303], [32.659743279762573, -20.30429005298231], [32.772707960752619, -19.715592136313294], [32.611994256324884, -19.419382826416268], [32.654885695127142, -18.672089939043492], [32.849860874164385, -17.979057305577175], [32.847638787575839, -16.713398125884613], [32.328238966610222, -16.392074069893749], [31.852040643040592, -16.319417006091374], [31.636498243951188, -16.071990248277881], [31.173063999157673, -15.860943698797868], [30.338954705534537, -15.880839125230242], [30.274255812305103, -15.507786960515208], [30.179481235481827, -14.796099134991525], [33.214024692525207, -13.97186003993615], [33.789700148256678, -14.451830743063068], [34.064825473778619, -14.359950046448118], [34.459633416488536, -14.613009535381421], [34.517666049952304, -15.013708591372609], [34.307291294092089, -15.478641452702592], [34.381291945134045, -16.183559665596039], [35.033810255683527, -16.801299737213089], [35.339062941231639, -16.107440280830108], [35.771904738108347, -15.896858819240721], [35.686845330555926, -14.611045830954328], [35.267956170398001, -13.887834161029563], [34.907151320136158, -13.565424899960565], [34.559989047999345, -13.579997653866872], [34.280006137841973, -12.280025323132504], [34.559989047999345, -11.520020033415923]]] } },
-            { "type": "Feature", "properties": { "admin": "Mauritania", "name": "Mauritania", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-12.170750291380299, 14.616834214735503], [-12.830658331747513, 15.303691514542942], [-13.43573767745306, 16.039383042866188], [-14.099521450242175, 16.304302273010489], [-14.577347581428977, 16.598263658102805], [-15.135737270558813, 16.587282416240779], [-15.623666144258689, 16.369337063049809], [-16.120690070041928, 16.45566254319338], [-16.463098110407881, 16.135036119038457], [-16.549707810929061, 16.673892116761959], [-16.270551723688353, 17.166962795474866], [-16.146347418674846, 18.108481553616652], [-16.256883307347163, 19.096715806550304], [-16.377651129613266, 19.593817246981981], [-16.277838100641514, 20.092520656814695], [-16.536323614965465, 20.567866319251486], [-17.063423224342568, 20.99975210213082], [-16.845193650773989, 21.333323472574875], [-12.929101935263528, 21.327070624267559], [-13.118754441774708, 22.771220201096249], [-12.874221564169574, 23.284832261645171], [-11.93722449385332, 23.374594224536164], [-11.969418911171159, 25.933352769468261], [-8.687293667017398, 25.881056219988899], [-8.684399786809051, 27.395744126895998], [-4.92333736817423, 24.974574082940993], [-6.453786586930334, 24.956590684503418], [-5.971128709324247, 20.640833441647626], [-5.488522508150438, 16.325102037007962], [-5.315277268891931, 16.201853745991837], [-5.537744309908446, 15.501689764869253], [-9.550238409859388, 15.486496893775435], [-9.700255092802703, 15.264107367407359], [-10.086846482778212, 15.330485744686269], [-10.650791388379414, 15.132745876521422], [-11.349095017939502, 15.411256008358475], [-11.666078253617853, 15.388208319556295], [-11.834207526079465, 14.799096991428936], [-12.170750291380299, 14.616834214735503]]] } },
-            { "type": "Feature", "properties": { "admin": "Malawi", "name": "Malawi", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.559989047999345, -11.520020033415923], [34.280006137841973, -12.280025323132504], [34.559989047999345, -13.579997653866872], [34.907151320136158, -13.565424899960565], [35.267956170398001, -13.887834161029563], [35.686845330555926, -14.611045830954328], [35.771904738108347, -15.896858819240721], [35.339062941231639, -16.107440280830108], [35.033810255683527, -16.801299737213089], [34.381291945134045, -16.183559665596039], [34.307291294092089, -15.478641452702592], [34.517666049952304, -15.013708591372609], [34.459633416488536, -14.613009535381421], [34.064825473778619, -14.359950046448118], [33.789700148256678, -14.451830743063068], [33.214024692525207, -13.97186003993615], [32.688165317523122, -13.712857761289273], [32.991764357237876, -12.783870537978272], [33.306422153463068, -12.435778090060214], [33.114289178201908, -11.607198174692311], [33.315310499817279, -10.796549981329695], [33.485687697083584, -10.525558770391111], [33.231387973775291, -9.676721693564799], [32.759375441221316, -9.230599053589058], [33.739729038230443, -9.417150974162722], [33.940837724096532, -9.693673841980292], [34.280006137841973, -10.159999688358402], [34.559989047999345, -11.520020033415923]]] } },
-            { "type": "Feature", "properties": { "admin": "Malaysia", "name": "Malaysia", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[101.075515578213299, 6.204867051615891], [101.154218784593809, 5.691384182147713], [101.814281854258013, 5.810808417174228], [102.141186964936423, 6.221636053894655], [102.371147088635212, 6.12820506431096], [102.961705356866673, 5.524495144061077], [103.381214634212142, 4.855001125503746], [103.438575474056165, 4.181605536308381], [103.332122023534851, 3.72669790284297], [103.42942874554052, 3.382868760589019], [103.502447544368877, 2.791018581550204], [103.854674106870334, 2.515454006353763], [104.247931756611479, 1.631141058759055], [104.228811476663523, 1.293048000489534], [103.519707472754433, 1.226333726400682], [102.573615350354771, 1.967115383304744], [101.39063846232915, 2.760813706875623], [101.273539666755838, 3.27029165284118], [100.69543541870668, 3.939139715994869], [100.557407668055092, 4.767280381688279], [100.19670617065772, 5.312492580583678], [100.306260207116509, 6.040561835143875], [100.085756870527078, 6.46448944745029], [100.259596388756918, 6.64282481528957], [101.075515578213299, 6.204867051615891]]], [[[118.618320754064825, 4.47820241944754], [117.882034946770162, 4.137551377779487], [117.01521447150634, 4.306094061699468], [115.86551720587677, 4.306559149590156], [115.51907840379198, 3.169238389494395], [115.134037306785231, 2.821481838386219], [114.621355422017473, 1.430688177898886], [113.805849644019531, 1.217548732911041], [112.859809198052176, 1.497790025229946], [112.380251906383648, 1.410120957846757], [111.797548455860408, 0.904441229654651], [111.159137811326559, 0.976478176269509], [110.514060907027101, 0.773131415200993], [109.830226678508836, 1.338135687664191], [109.663260125773718, 2.006466986494984], [110.396135288537039, 1.663774725751395], [111.168852980597478, 1.850636704918784], [111.370081007942076, 2.697303371588872], [111.796928338672842, 2.885896511238073], [112.995614862115247, 3.102394924324869], [113.712935418758718, 3.893509426281127], [114.204016554828399, 4.525873928236819], [114.659595981913526, 4.00763682699781], [114.869557326315373, 4.348313706881952], [115.347460972150671, 4.316636053887009], [115.405700311343594, 4.955227565933824], [115.450710483869798, 5.447729803891561], [116.220741001450961, 6.143191229675621], [116.725102980619752, 6.924771429873998], [117.129626092600461, 6.928052883324566], [117.643393182446303, 6.422166449403305], [117.689075148592337, 5.98749013918018], [118.347691278152197, 5.708695786965462], [119.181903924639926, 5.407835598162249], [119.110693800941718, 5.016128241389864], [118.439727004064082, 4.966518866389619], [118.618320754064825, 4.47820241944754]]]] } },
-            { "type": "Feature", "properties": { "admin": "Namibia", "name": "Namibia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[16.344976840895239, -28.576705010697697], [15.601818068105812, -27.821247247022797], [15.210472446359457, -27.09095590587404], [14.989710727608548, -26.117371921495153], [14.74321414557633, -25.392920017195376], [14.40814415859583, -23.85301401132984], [14.385716586981145, -22.656652927340687], [14.257714064194172, -22.111208184499951], [13.868642205468657, -21.699036960539974], [13.352497999737437, -20.872834161057497], [12.82684533046449, -19.673165785401661], [12.608564080463617, -19.045348809487695], [11.794918654028063, -18.069129327061912], [11.734198846085118, -17.30188933682447], [12.215461460019352, -17.11166838955808], [12.814081251688405, -16.941342868724067], [13.462362094789963, -16.971211846588769], [14.058501417709007, -17.42338062914266], [14.209706658595021, -17.353100681225715], [18.26330936043416, -17.309950860262003], [18.956186964603599, -17.789094740472255], [21.377176141045563, -17.930636488519688], [23.215048455506057, -17.52311614346598], [24.033861525170771, -17.29584319424632], [24.6823490740015, -17.35341073981947], [25.076950310982255, -17.578823337476617], [25.084443393664564, -17.661815687737366], [24.520705193792534, -17.887124932529932], [24.217364536239209, -17.889347019118485], [23.579005568137713, -18.281261081620055], [23.196858351339298, -17.869038181227783], [21.655040317478971, -18.219146010005222], [20.910641310314531, -18.252218926672018], [20.881134067475866, -21.814327080983144], [19.895457797940672, -21.849156996347865], [19.895767856534427, -24.767790215760588], [19.89473432788861, -28.461104831660769], [19.002127312911082, -28.972443129188857], [18.464899122804745, -29.045461928017271], [17.836151971109526, -28.856377862261311], [17.387497185951499, -28.783514092729774], [17.218928663815401, -28.355943291946804], [16.824017368240899, -28.082161553664466], [16.344976840895239, -28.576705010697697]]] } },
-            { "type": "Feature", "properties": { "admin": "New Caledonia", "name": "New Caledonia", "continent": "Oceania" }, "geometry": { "type": "Polygon", "coordinates": [[[165.779989862326346, -21.080004978115621], [166.599991489933814, -21.700018812753523], [167.120011428086883, -22.159990736583488], [166.74003462144475, -22.399976088146943], [166.189732293968632, -22.129708347260447], [165.474375441752159, -21.679606621998229], [164.829815301775653, -21.149819838141948], [164.16799523341362, -20.444746595951624], [164.029605747735957, -20.105645847252347], [164.459967075862664, -20.120011895429492], [165.020036249041993, -20.459991143477726], [165.460009393575064, -20.800022067958253], [165.779989862326346, -21.080004978115621]]] } },
-            { "type": "Feature", "properties": { "admin": "Niger", "name": "Niger", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[2.154473504249949, 11.940150051313422], [2.177107781593917, 12.625017808477534], [1.024103224297619, 12.851825669806598], [0.993045688490156, 13.335749620003865], [0.429927605805517, 13.988733018443893], [0.295646396495215, 14.444234930880663], [0.374892205414767, 14.928908189346144], [1.015783318698481, 14.968182277887989], [1.385528191746971, 15.323561102759237], [2.74999270998154, 15.409524847876751], [3.63825890464659, 15.56811981858044], [3.723421665063596, 16.184283759012654], [4.270209995143886, 16.852227484601311], [4.267419467800095, 19.155265204337123], [5.677565952180712, 19.601206976799794], [8.572893100629868, 21.565660712159225], [11.999505649471697, 23.471668402596432], [13.581424594790459, 23.040506089769274], [14.143870883855239, 22.491288967371126], [14.8513, 22.862950000000119], [15.096887648181847, 21.308518785074902], [15.471076694407314, 21.048457139565979], [15.487148064850143, 20.730414537025634], [15.90324669766431, 20.387618923417499], [15.68574059414777, 19.957180080642384], [15.300441114979716, 17.927949937405], [15.247731154041842, 16.627305813050778], [13.972201775781681, 15.684365953021139], [13.540393507550785, 14.36713369390122], [13.956698846094124, 13.996691189016925], [13.954476759505607, 13.353448798063765], [14.595781284247604, 13.330426947477859], [14.495787387762899, 12.859396267137353], [14.213530714584746, 12.80203542729333], [14.181336297266906, 12.483656927943169], [13.995352817448289, 12.4615652531383], [13.318701613018558, 13.55635630945795], [13.083987257548809, 13.596147162322492], [12.302071160540546, 13.037189032437535], [11.527803175511504, 13.328980007373556], [10.989593133191532, 13.387322699431191], [10.701031935273816, 13.246917832894038], [10.114814487354748, 13.277251898649464], [9.524928012743088, 12.85110219975456], [9.014933302454436, 12.826659247280414], [7.804671258178869, 13.343526923063731], [7.330746697630046, 13.098038031461213], [6.82044192874781, 13.115091254117598], [6.445426059605721, 13.492768459522718], [5.443058302440135, 13.865923977102225], [4.368343540066006, 13.747481594289408], [4.107945997747378, 13.531215725147941], [3.967282749048933, 12.956108710171574], [3.680633579125924, 12.552903347214167], [3.611180454125587, 11.660167141155965], [2.848643019226585, 12.235635891158207], [2.490163608418015, 12.233052069543588], [2.154473504249949, 11.940150051313422]]] } },
-            { "type": "Feature", "properties": { "admin": "Nigeria", "name": "Nigeria", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[8.500287713259693, 4.771982937026847], [7.462108188515939, 4.41210826254624], [7.082596469764438, 4.464689032403228], [6.698072137080598, 4.240594183769516], [5.898172641634686, 4.262453314628984], [5.362804803090881, 4.887970689305957], [5.033574252959368, 5.611802476418233], [4.325607130560683, 6.270651149923466], [3.574180128604552, 6.258300482605717], [2.691701694356254, 6.258817246928628], [2.74906253420022, 7.870734361192886], [2.723792758809509, 8.506845404489708], [2.912308383810255, 9.13760793704432], [3.220351596702101, 9.4441525333997], [3.705438266625918, 10.063210354040207], [3.600070021182801, 10.332186184119406], [3.797112257511713, 10.734745591673104], [3.572216424177469, 11.327939357951516], [3.611180454125558, 11.660167141155966], [3.68063357912581, 12.552903347214222], [3.967282749048848, 12.956108710171572], [4.107945997747321, 13.531215725147829], [4.368343540066063, 13.747481594289324], [5.443058302440163, 13.865923977102295], [6.445426059605636, 13.492768459522676], [6.820441928747753, 13.115091254117514], [7.330746697630017, 13.098038031461199], [7.804671258178784, 13.343526923063745], [9.014933302454462, 12.826659247280427], [9.524928012742945, 12.851102199754477], [10.114814487354689, 13.277251898649409], [10.701031935273702, 13.246917832894081], [10.989593133191532, 13.387322699431108], [11.527803175511393, 13.328980007373584], [12.302071160540521, 13.037189032437521], [13.083987257548866, 13.596147162322563], [13.318701613018558, 13.556356309457824], [13.995352817448346, 12.461565253138343], [14.181336297266792, 12.483656927943112], [14.57717776862253, 12.085360826053501], [14.468192172918974, 11.90475169519341], [14.415378859116682, 11.572368882692071], [13.572949659894558, 10.798565985553564], [13.308676385153914, 10.160362046748926], [13.1675997249971, 9.64062632897341], [12.955467970438971, 9.417771714714702], [12.753671502339214, 8.717762762888993], [12.218872104550597, 8.305824082874322], [12.063946160539556, 7.799808457872301], [11.839308709366801, 7.397042344589434], [11.745774366918509, 6.981382961449753], [11.058787876030349, 6.644426784690593], [10.497375115611417, 7.055357774275562], [10.118276808318255, 7.038769639509879], [9.522705926154398, 6.453482367372116], [9.233162876023043, 6.444490668153334], [8.757532993208626, 5.47966583904791], [8.500287713259693, 4.771982937026847]]] } },
-            { "type": "Feature", "properties": { "admin": "Nicaragua", "name": "Nicaragua", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-85.712540452807289, 11.088444932494822], [-86.058488328785245, 11.40343862552994], [-86.525849982432931, 11.806876532432593], [-86.7459915839963, 12.143961900272483], [-87.167516242201131, 12.458257961471656], [-87.668493415054698, 12.909909979702629], [-87.557466600275603, 13.064551703336061], [-87.392386237319201, 12.914018256069836], [-87.316654425795463, 12.984685777228972], [-87.005769009127562, 13.025794379117157], [-86.880557013684339, 13.254204209847241], [-86.733821784191576, 13.263092556201441], [-86.755086636079696, 13.754845485890909], [-86.520708177419877, 13.778487453664436], [-86.312142096689911, 13.771356106008167], [-86.096263800790581, 14.038187364147245], [-85.801294725268576, 13.836054999237586], [-85.698665330736901, 13.960078436738083], [-85.514413011400222, 14.079011745657834], [-85.165364549484792, 14.354369615125076], [-85.148750576502948, 14.560196844943615], [-85.052787441736925, 14.551541042534719], [-84.924500698572388, 14.790492865452348], [-84.820036790694346, 14.819586696832669], [-84.649582078779602, 14.66680532476175], [-84.449335903648588, 14.621614284722494], [-84.228341640952394, 14.748764146376654], [-83.975721401693576, 14.749435939996458], [-83.628584967772895, 14.880073960830298], [-83.489988776366104, 15.016267198135534], [-83.147219000974104, 14.995829169164109], [-83.233234422523907, 14.8998660343981], [-83.28416154654758, 14.676623846897197], [-83.182126430987267, 14.310703029838447], [-83.412499966144424, 13.970077826386554], [-83.519831916014667, 13.56769928634588], [-83.55220720084553, 13.127054348193084], [-83.498515387694255, 12.869292303921226], [-83.473323126951968, 12.419087225794424], [-83.626104499022887, 12.320850328007563], [-83.719613003255034, 11.893124497927724], [-83.650857510090702, 11.629032090700116], [-83.855470343750369, 11.373311265503785], [-83.808935716471538, 11.103043524617274], [-83.655611741861563, 10.938764146361418], [-83.895054490885926, 10.726839097532444], [-84.190178595704822, 10.793450018756671], [-84.355930752281026, 10.999225572142901], [-84.673069017256239, 11.082657172078139], [-84.903003302738924, 10.952303371621895], [-85.561851976244171, 11.217119248901593], [-85.712540452807289, 11.088444932494822]]] } },
-            { "type": "Feature", "properties": { "admin": "Netherlands", "name": "Netherlands", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[6.074182570020922, 53.51040334737813], [6.905139601274128, 53.482162177130633], [7.092053256873895, 53.14404328064488], [6.842869500362381, 52.228440253297542], [6.589396599970825, 51.85202912048338], [5.988658074577812, 51.85161570902504], [6.156658155958779, 50.803721015010574], [5.60697594567, 51.037298488969768], [4.973991326526913, 51.475023708698124], [4.047071160507527, 51.267258612668556], [3.314971144228536, 51.345755113319903], [3.830288527043137, 51.620544542031936], [4.705997348661184, 53.091798407597757], [6.074182570020922, 53.51040334737813]]] } },
-            { "type": "Feature", "properties": { "admin": "Norway", "name": "Norway", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[28.165547316202911, 71.185474351680497], [31.293418409965472, 70.453787746859902], [30.005435011522785, 70.186258856884876], [31.101078728975118, 69.558080145944857], [29.399580519332879, 69.156916002063056], [28.591929559043187, 69.064776923286686], [29.015572950971968, 69.76649119737796], [27.732292107867885, 70.164193020296281], [26.179622023226298, 69.825298977326142], [25.689212680776389, 69.092113755968995], [24.735679152126714, 68.649556789821432], [23.662049594830759, 68.891247463650515], [22.356237827247405, 68.841741441514941], [21.244936150810723, 69.370443020293109], [20.645592889089581, 69.106247260200846], [20.02526899585791, 69.065138658312705], [19.878559604581248, 68.407194322372604], [17.993868442464386, 68.567391262477329], [17.729181756265344, 68.01055186631622], [16.768878614985535, 68.013936672631374], [16.108712192456832, 67.302455552836889], [15.108411492583055, 66.193866889095418], [13.555689731509087, 64.787027696381458], [13.919905226302202, 64.445420640716108], [13.571916131248766, 64.049114081469654], [12.57993533697393, 64.066218980558332], [11.930569288794228, 63.128317572676977], [11.992064243221531, 61.800362453856557], [12.63114668137524, 61.293571682370079], [12.300365838274896, 60.117932847730046], [11.468271925511173, 59.432393296945989], [11.027368605196925, 58.856149400459394], [10.356556837616095, 59.469807033925363], [8.382000359743641, 58.313288479233265], [7.048748406613297, 58.078884182357271], [5.665835402050418, 58.588155422593658], [5.308234490590733, 59.663231919993805], [4.992078077829005, 61.97099803328426], [5.912900424837885, 62.614472968182682], [8.553411085655766, 63.454008287196459], [10.527709181366784, 64.486038316497471], [12.358346795306371, 65.879725857193151], [14.7611458675816, 67.810641587995121], [16.435927361728968, 68.563205471461671], [19.184028354578512, 69.817444159617807], [21.378416375420606, 70.255169379346043], [23.02374230316158, 70.202071845166259], [24.546543409938515, 71.030496731237221], [26.370049676221807, 70.986261705195361], [28.165547316202911, 71.185474351680497]]], [[[24.72412, 77.85385], [22.49032, 77.44493], [20.72601, 77.67704], [21.41611, 77.93504], [20.8119, 78.25463], [22.88426, 78.45494], [23.28134, 78.07954], [24.72412, 77.85385]]], [[[18.25183, 79.70175], [21.54383, 78.95611], [19.02737, 78.5626], [18.47172, 77.82669], [17.59441, 77.63796], [17.1182, 76.80941], [15.91315, 76.77045], [13.76259, 77.38035], [14.66956, 77.73565], [13.1706, 78.02493], [11.22231, 78.8693], [10.44453, 79.65239], [13.17077, 80.01046], [13.71852, 79.66039], [15.14282, 79.67431], [15.52255, 80.01608], [16.99085, 80.05086], [18.25183, 79.70175]]], [[[25.447625359811887, 80.407340399894494], [27.407505730913492, 80.056405748200447], [25.924650506298171, 79.517833970854539], [23.024465773213613, 79.40001170522909], [20.075188429451877, 79.566823228667232], [19.897266473070907, 79.842361965647498], [18.46226362475792, 79.859880276194403], [17.368015170977454, 80.318896186027004], [20.455992059010693, 80.598155626132225], [21.907944777115397, 80.357679348462071], [22.919252557067431, 80.657144273593488], [25.447625359811887, 80.407340399894494]]]] } },
-            { "type": "Feature", "properties": { "admin": "Nepal", "name": "Nepal", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[88.120440708369841, 27.876541652939586], [88.043132765661198, 27.445818589786818], [88.174804315140904, 26.810405178325944], [88.060237664749806, 26.414615383402484], [87.22747195836628, 26.39789805755607], [86.024392938179147, 26.630984605408567], [85.25177859898335, 26.726198431906337], [84.675017938173767, 27.234901231387528], [83.304248895199535, 27.364505723575554], [81.999987420584958, 27.925479234319987], [81.057202589851997, 28.416095282499036], [80.088424513676259, 28.794470119740136], [80.476721225917373, 29.729865220655334], [81.11125613802929, 30.183480943313398], [81.525804477874729, 30.422716986608627], [82.327512648450863, 30.115268052688126], [83.337115106137176, 29.463731594352193], [83.898992954446712, 29.320226141877654], [84.234579705750136, 28.839893703724691], [85.011638218123025, 28.642773952747337], [85.823319940131498, 28.203575954698699], [86.954517043000592, 27.97426178640351], [88.120440708369841, 27.876541652939586]]] } },
-            { "type": "Feature", "properties": { "admin": "New Zealand", "name": "New Zealand", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[173.020374790740703, -40.919052422856417], [173.247234328502003, -41.331998793300777], [173.958405389702875, -40.926700534835604], [174.2475867048081, -41.349155368821663], [174.248516880589449, -41.770008233406749], [173.876446568087886, -42.233184096038819], [173.222739699595621, -42.970038344088557], [172.711246372770717, -43.372287693048492], [173.080112746470206, -43.853343601253577], [172.308583612352464, -43.865694268571332], [171.452925246463622, -44.24251881284372], [171.185137974327233, -44.897104180684885], [170.616697219116588, -45.908928724959701], [169.83142215400926, -46.355774834987585], [169.332331170934253, -46.641235446967848], [168.411353794628525, -46.619944756863582], [167.763744745146823, -46.290197442409195], [166.676886021184202, -46.219917494492236], [166.509144321964669, -45.852704766626204], [167.046424188503238, -45.110941257508664], [168.303763462596862, -44.12397307716612], [168.949408807651508, -43.93581918719142], [169.667814569373149, -43.555325616226334], [170.524919875366152, -43.031688327812823], [171.125089960004004, -42.512753594737781], [171.569713983443194, -41.767424411792128], [171.948708937871885, -41.514416599291145], [172.097227004278722, -40.956104424809674], [172.798579543343948, -40.493962090823466], [173.020374790740703, -40.919052422856417]]], [[[174.612008905330526, -36.156397393540537], [175.336615838927173, -37.209097995758263], [175.3575964704375, -36.52619394302112], [175.808886753642469, -36.798942152657681], [175.958490025127475, -37.555381768546063], [176.763195428776555, -37.881253350578696], [177.438813104560495, -37.961248467766488], [178.010354445708657, -37.579824721020124], [178.517093540762801, -37.695373223624792], [178.274731073313802, -38.582812595373092], [177.970460239979332, -39.166342868812968], [177.206992629299123, -39.145775648760839], [176.939980503647007, -39.449736423501562], [177.032946405340113, -39.879942722331471], [176.8858236026052, -40.06597787858216], [176.508017206119348, -40.60480803808958], [176.012440220440283, -41.289624118821493], [175.239567499082966, -41.688307793953236], [175.067898391009408, -41.425894870775075], [174.650972935278418, -41.281820977545443], [175.227630243223615, -40.459235528323397], [174.900156691789959, -39.908933200847216], [173.824046665743992, -39.508854262043506], [173.852261997775315, -39.146602471677461], [174.57480187408035, -38.797683200842748], [174.743473749081033, -38.027807712558378], [174.69701663645057, -37.381128838857954], [174.292028436579187, -36.71109221776144], [174.319003534235549, -36.534823907213884], [173.840996535535766, -36.121980889634109], [173.05417117745958, -35.237125339500331], [172.636005487353714, -34.529106540669382], [173.007042271209457, -34.450661716450334], [173.551298456107475, -35.006183363587958], [174.329390497126241, -35.265495700828616], [174.612008905330526, -36.156397393540537]]]] } },
-            { "type": "Feature", "properties": { "admin": "Oman", "name": "Oman", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[58.861141391846573, 21.114034532144299], [58.487985874266961, 20.428985907467101], [58.03431847517659, 20.481437486243347], [57.826372511634098, 20.24300242764863], [57.66576216007094, 19.736004950433109], [57.788700392493368, 19.067570298737646], [57.694390903560667, 18.944709580963799], [57.2342639504338, 18.947991034414255], [56.609650913321971, 18.574267076079476], [56.512189162019482, 18.087113348863934], [56.283520949128011, 17.876066799383945], [55.661491733630683, 17.884128322821535], [55.269939406155189, 17.632309068263194], [55.274900343655091, 17.228354397037659], [54.791002231674113, 16.950696926333357], [54.239252964093751, 17.04498057704998], [53.57050825380459, 16.707662665264674], [53.108572625547502, 16.651051133688977], [52.782184279192066, 17.349742336491229], [52.000009800022227, 19.000003363516068], [54.999981723862405, 19.999994004796118], [55.666659376859869, 22.000001125572307], [55.208341098863187, 22.708329982997007], [55.234489373602869, 23.110992743415348], [55.52584109886449, 23.524869289640911], [55.528631626208288, 23.933604030853498], [55.981213820220503, 24.130542914317854], [55.80411868675624, 24.269604193615287], [55.88623253766805, 24.920830593357486], [56.396847365143984, 24.924732163995508], [56.845140415276049, 24.241673081961487], [57.403452589757428, 23.878594468678834], [58.136947869708322, 23.747930609628835], [58.729211460205427, 23.565667832935414], [59.180501743410346, 22.992395331305456], [59.450097690677033, 22.660270900965592], [59.80806033716285, 22.533611965418199], [59.806148309168087, 22.31052480721419], [59.442191196536399, 21.71454051359208], [59.282407667889871, 21.433885809814875], [58.861141391846573, 21.114034532144299]]], [[[56.391421339753393, 25.895990708921254], [56.261041701080913, 25.714606431576748], [56.070820753814544, 26.055464178973946], [56.362017449779344, 26.395934353128947], [56.485679152253809, 26.309117946878665], [56.391421339753393, 25.895990708921254]]]] } },
-            { "type": "Feature", "properties": { "admin": "Pakistan", "name": "Pakistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[75.158027785140902, 37.13303091078911], [75.896897414050116, 36.666806138651829], [76.192848341785677, 35.898403428687821], [77.837450799474553, 35.494009507787759], [76.871721632804011, 34.653544012992732], [75.757060988268321, 34.504922593721311], [74.240202671204955, 34.748887030571247], [73.749948358051952, 34.317698879527846], [74.104293654277328, 33.441473293586846], [74.451559279278698, 32.764899603805489], [75.258641798813187, 32.271105455040491], [74.405928989564998, 31.692639471965272], [74.421380242820263, 30.97981476493117], [73.450638462217412, 29.976413479119863], [72.823751662084689, 28.961591701772047], [71.777665643200308, 27.913180243434521], [70.61649620960192, 27.989196275335861], [69.514392938113119, 26.940965684511365], [70.168926629522005, 26.491871649678835], [70.282873162725579, 25.722228705339823], [70.844699334602822, 25.215102037043511], [71.0432401874682, 24.356523952730193], [68.842599318318761, 24.359133612560932], [68.176645135373377, 23.691965033456704], [67.443666619745457, 23.944843654876983], [67.145441928989058, 24.663611151624639], [66.37282758979326, 25.425140896093847], [64.530407749291115, 25.237038682551425], [62.905700718034595, 25.218409328710202], [61.497362908784183, 25.078237006118492], [61.874187453056535, 26.239974880472097], [63.316631707619578, 26.756532497661659], [63.23389773952028, 27.217047024030702], [62.755425652929851, 27.378923448184985], [62.727830438085974, 28.259644883735383], [61.771868117118615, 28.699333807890792], [61.369308709564926, 29.303276272085917], [60.874248488208778, 29.829238999952604], [62.549856805272775, 29.318572496044304], [63.550260858011164, 29.468330796826162], [64.148002150331237, 29.340819200145965], [64.350418735618504, 29.560030625928089], [65.046862013616092, 29.472180691031902], [66.346472609324408, 29.88794342703617], [66.38145755398601, 30.738899237586448], [66.938891229118454, 31.304911200479346], [67.683393589147457, 31.303154201781414], [67.792689243444769, 31.582930406209623], [68.556932000609308, 31.713310044882011], [68.926676873657655, 31.620189113892064], [69.317764113242546, 31.901412258424436], [69.262522007122541, 32.501944078088293], [69.687147251264847, 33.105498969041228], [70.323594191371583, 33.358532619758385], [69.93054324735958, 34.020120144175102], [70.881803012988385, 33.988855902638512], [71.156773309213449, 34.348911444632144], [71.115018751921625, 34.733125718722228], [71.613076206350698, 35.153203436822857], [71.498767938121077, 35.650563259415996], [71.262348260385735, 36.074387518857797], [71.846291945283909, 36.509942328429851], [72.920024855444453, 36.720007025696312], [74.067551710917812, 36.836175645488446], [74.575892775372964, 37.02084137628345], [75.158027785140902, 37.13303091078911]]] } },
-            { "type": "Feature", "properties": { "admin": "Panama", "name": "Panama", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-77.881571417945239, 7.223771267114783], [-78.214936082660103, 7.512254950384159], [-78.429160732726061, 8.052041123888925], [-78.182095709938608, 8.319182440621772], [-78.43546525746568, 8.387705389840788], [-78.622120530903928, 8.718124497915026], [-79.120307176413732, 8.996092027213022], [-79.557877366845176, 8.932374986197145], [-79.760578172510037, 8.584515082224398], [-80.164481167303322, 8.333315944853593], [-80.382659064439608, 8.29840851484043], [-80.480689256497286, 8.090307522001067], [-80.003689948227148, 7.54752411542337], [-80.276670701808982, 7.419754136581713], [-80.421158006497066, 7.271571966984763], [-80.886400926420791, 7.220541490096535], [-81.059542812814698, 7.817921047390596], [-81.189715745757937, 7.647905585150339], [-81.519514736644666, 7.706610012233908], [-81.721311204744453, 8.108962714058434], [-82.131441209628889, 8.175392767769635], [-82.390934414382542, 8.292362372262287], [-82.820081346350406, 8.290863755725821], [-82.850958014644803, 8.073822740099954], [-82.965783047197348, 8.225027980985983], [-82.9131764391242, 8.423517157419068], [-82.829770677405151, 8.626295477732368], [-82.868657192704759, 8.807266343618521], [-82.719183112300513, 8.925708726431493], [-82.927154914059145, 9.074330145702914], [-82.932890998043561, 9.476812038608172], [-82.546196255203469, 9.566134751824674], [-82.187122565423394, 9.207448635286779], [-82.207586432610952, 8.995575262890098], [-81.808566860669259, 8.95061676679617], [-81.714154018872023, 9.031955471223581], [-81.43928707551153, 8.786234035675715], [-80.947301601876745, 8.858503526235905], [-80.521901211250054, 9.11107208906243], [-79.914599778955974, 9.312765204297618], [-79.573302781884294, 9.611610012241526], [-79.021191779277913, 9.552931423374103], [-79.058450486960353, 9.454565334506523], [-78.500887620747164, 9.420458889193879], [-78.055927700497989, 9.247730414258296], [-77.729513515926399, 8.946844387238867], [-77.353360765273848, 8.670504665558068], [-77.474722866511314, 8.524286200388216], [-77.242566494440069, 7.935278225125442], [-77.431107957656977, 7.638061224798733], [-77.75341386586139, 7.709839789252141], [-77.881571417945239, 7.223771267114783]]] } },
-            { "type": "Feature", "properties": { "admin": "Peru", "name": "Peru", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-69.590423753524036, -17.580011895419329], [-69.858443569605839, -18.092693780187009], [-70.3725723944777, -18.347975355708861], [-71.375250210236914, -17.77379851651385], [-71.462040778271117, -17.363487644116379], [-73.444529588500401, -16.359362888252992], [-75.23788265654143, -15.26568287522778], [-76.009205084929931, -14.649286390850317], [-76.423469204397733, -13.823186944232431], [-76.259241502574156, -13.535039157772939], [-77.10619238962181, -12.222716159720816], [-78.092152879534623, -10.377712497604062], [-79.036953091126918, -8.38656788496589], [-79.445920376284832, -7.930833428583859], [-79.760578172510037, -7.194340915560081], [-80.537481655586049, -6.541667575713715], [-81.249996304026411, -6.136834405139182], [-80.926346808582423, -5.690556735866563], [-81.410942552399433, -4.736764825055459], [-81.099669562489353, -4.036394138203696], [-80.302560594387188, -3.404856459164712], [-80.184014858709645, -3.821161797708043], [-80.46929460317692, -4.059286797708999], [-80.442241990872134, -4.425724379090673], [-80.028908047185581, -4.346090996928893], [-79.62497921417615, -4.454198093283494], [-79.205289069317715, -4.959128513207388], [-78.639897223612323, -4.547784112164072], [-78.450683966775628, -3.873096612161375], [-77.83790483265858, -3.003020521663103], [-76.635394253226707, -2.608677666843817], [-75.544995693652027, -1.56160979574588], [-75.233722703741932, -0.911416924649529], [-75.373223232713841, -0.15203175212045], [-75.106624518520064, -0.05720549886486], [-74.441600511355958, -0.530820000819887], [-74.122395189089048, -1.002832533373848], [-73.659503546834586, -1.260491224781134], [-73.070392218707212, -2.308954359550952], [-72.325786505813639, -2.434218031426453], [-71.774760708285385, -2.169789727388937], [-71.413645799429773, -2.342802422702128], [-70.813475714791949, -2.256864515800742], [-70.047708502874841, -2.725156345229699], [-70.692682054309699, -3.742872002785858], [-70.394043952094975, -3.766591485207825], [-69.893635219996611, -4.298186944194326], [-70.79476884630229, -4.251264743673302], [-70.928843349883564, -4.401591485210367], [-71.748405727816532, -4.59398284263301], [-72.891927659787243, -5.274561455916979], [-72.964507208941185, -5.741251315944892], [-73.219711269814596, -6.089188734566076], [-73.120027431923575, -6.629930922068238], [-73.724486660441627, -6.918595472850638], [-73.723401455363486, -7.340998630404412], [-73.987235480429646, -7.523829847853063], [-73.571059332967053, -8.424446709835832], [-73.015382656532537, -9.03283334720806], [-73.226713426390148, -9.462212823121233], [-72.563033006465631, -9.520193780152715], [-72.184890713169821, -10.05359791426943], [-71.302412278921523, -10.079436130415372], [-70.481893886991159, -9.490118096558842], [-70.548685675728393, -11.009146823778462], [-70.093752204046879, -11.123971856331011], [-69.52967810736493, -10.951734307502193], [-68.665079718689611, -12.561300144097171], [-68.880079515239956, -12.89972909917665], [-68.929223802349526, -13.602683607643007], [-68.94888668483658, -14.45363941819328], [-69.339534674747, -14.953195489158828], [-69.160346645774936, -15.323973890853015], [-69.389764166934697, -15.66012908291165], [-68.959635382753291, -16.500697930571267], [-69.590423753524036, -17.580011895419329]]] } },
-            { "type": "Feature", "properties": { "admin": "Philippines", "name": "Philippines", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[126.376813592637447, 8.414706325713352], [126.478512811387873, 7.750354112168976], [126.537423944200611, 7.189380601424572], [126.19677290253253, 6.274294338400038], [125.831420526229081, 7.293715318221855], [125.363852166852283, 6.78648529706099], [125.683160841983707, 6.049656887227257], [125.396511672060626, 5.581003322772288], [124.219787632342332, 6.16135549562618], [123.938719517106918, 6.88513560630612], [124.243662144061318, 7.360610459823659], [123.610212437027542, 7.833527329942753], [123.29607140512519, 7.418875637232786], [122.825505812675388, 7.457374579290216], [122.085499302255769, 6.899424139834847], [121.919928013192603, 7.192119452336072], [122.312358840017112, 8.034962063016506], [122.94239790251963, 8.316236883981174], [123.487687616063511, 8.693009751821192], [123.841154412939815, 8.240324204944384], [124.6014697612502, 8.514157619659015], [124.764612257995623, 8.960409450715458], [125.471390822451539, 8.986996975129641], [125.412117954612754, 9.760334784377545], [126.222714471543156, 9.28607432701885], [126.306636997585073, 8.782487494334573], [126.376813592637447, 8.414706325713352]]], [[[123.982437778825798, 10.278778591345811], [123.62318322153277, 9.950090643753297], [123.309920688979332, 9.318268744336676], [122.995883009941636, 9.022188625520398], [122.380054966319463, 9.713360907424201], [122.586088901867072, 9.981044826696104], [122.837081333508706, 10.261156927934234], [122.947410516451896, 10.881868394408029], [123.498849725438447, 10.940624497923945], [123.337774285984722, 10.267383938025445], [124.077935825701218, 11.232725531453706], [123.982437778825798, 10.278778591345811]]], [[[118.504580926590336, 9.316382554558087], [117.174274530100675, 8.367499904814663], [117.664477166821371, 9.066888739452933], [118.386913690261736, 9.684499619989223], [118.98734215706105, 10.376292019080507], [119.511496209797528, 11.36966807702721], [119.689676548339889, 10.554291490109872], [119.029458449378978, 10.003653265823869], [118.504580926590336, 9.316382554558087]]], [[[121.883547804859106, 11.891755072471977], [122.483821242361458, 11.582187404827506], [123.120216506035959, 11.583660183147867], [123.100837843926442, 11.165933742716486], [122.637713657726692, 10.741308498574226], [122.002610304859559, 10.441016750526087], [121.967366978036523, 10.905691229694622], [122.038370396005519, 11.415840969280039], [121.883547804859106, 11.891755072471977]]], [[[125.502551711123488, 12.162694606978347], [125.783464797062152, 11.046121934447767], [125.01188398651226, 11.311454576050377], [125.032761265158115, 10.975816148314703], [125.277449172060244, 10.358722032101308], [124.801819289245714, 10.134678859899889], [124.760168084818474, 10.8379951033923], [124.459101190286049, 10.889929917845633], [124.302521600441722, 11.495370998577227], [124.891012811381572, 11.415582587118589], [124.877990350443952, 11.794189968304988], [124.266761509295705, 12.557760931849682], [125.22711632700782, 12.53572093347719], [125.502551711123488, 12.162694606978347]]], [[[121.527393833503481, 13.069590155484516], [121.262190382981544, 12.2055602075644], [120.833896112146533, 12.704496161342416], [120.323436313967477, 13.466413479053866], [121.18012820850214, 13.429697373910439], [121.527393833503481, 13.069590155484516]]], [[[121.321308221523566, 18.504064642811013], [121.937601353036371, 18.21855235439838], [122.246006300954264, 18.478949896717094], [122.336956821787965, 18.224882717354173], [122.174279412933174, 17.810282701076371], [122.51565392465335, 17.09350474697197], [122.252310825693883, 16.262444362854122], [121.662786086108255, 15.931017564350125], [121.505069614753367, 15.124813544164621], [121.728828566577249, 14.328376369682244], [122.258925409027313, 14.218202216035973], [122.701275669445636, 14.336541245984417], [123.950295037940236, 13.782130642141066], [123.855107049658599, 13.237771104378464], [124.181288690284873, 12.997527370653469], [124.077419061378222, 12.536676947474573], [123.298035109552245, 13.027525539598981], [122.928651971529902, 13.552919826710404], [122.671355015148663, 13.185836289925131], [122.034649692880521, 13.784481919810343], [121.126384718918587, 13.636687323455559], [120.628637323083296, 13.857655747935649], [120.679383579593832, 14.271015529838319], [120.99181928923052, 14.525392767795079], [120.693336216312687, 14.756670640517282], [120.564145135582976, 14.396279201713821], [120.070428501466367, 14.970869452367094], [119.920928582846102, 15.406346747290735], [119.883773228028247, 16.363704331929963], [120.286487664878791, 16.034628811095327], [120.39004723519173, 17.599081122299506], [120.7158671407919, 18.505227362537536], [121.321308221523566, 18.504064642811013]]]] } },
-            { "type": "Feature", "properties": { "admin": "Papua New Guinea", "name": "Papua New Guinea", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[155.880025669578401, -6.819996840037758], [155.599991082988765, -6.919990736522491], [155.166994256815087, -6.535931491729299], [154.729191522438327, -5.900828138862208], [154.514114211239644, -5.139117526880012], [154.652503696917336, -5.042430922061839], [154.759990676084357, -5.339983819198493], [155.062917922179338, -5.566791680527486], [155.547746209941693, -6.200654799019658], [156.019965448224752, -6.540013929880386], [155.880025669578401, -6.819996840037758]]], [[[151.982795851854462, -5.478063246282344], [151.459106887008659, -5.560280450058739], [151.301390415653884, -5.840728448106701], [150.754447056276661, -6.083762709175387], [150.241196730753813, -6.317753594592984], [149.709963006793316, -6.316513360218051], [148.890064732050462, -6.026040134305432], [148.318936802360696, -5.74714242922613], [148.401825799756864, -5.437755629094722], [149.298411900020824, -5.583741550319216], [149.845561965127217, -5.505503431829339], [149.996250441690279, -5.026101169457674], [150.139755894164921, -5.001348158389788], [150.236907586873485, -5.53222014732428], [150.807467075808063, -5.455842380396886], [151.089672072553981, -5.113692722192368], [151.647880894170811, -4.757073662946168], [151.537861769821518, -4.167807305521889], [152.136791620084352, -4.148790378438519], [152.338743117480988, -4.31296640382976], [152.318692661751754, -4.867661228050748], [151.982795851854462, -5.478063246282344]]], [[[147.191873814074938, -7.388024183789978], [148.084635858349372, -8.044108168167609], [148.734105259393573, -9.104663588093755], [149.306835158484432, -9.071435642130067], [149.266630894161324, -9.514406019736027], [150.038728469034311, -9.684318129111698], [149.738798456012262, -9.872937106977002], [150.801627638959133, -10.29368661869742], [150.690574985963849, -10.582712904505865], [150.028393182575826, -10.652476088099929], [149.782310012001972, -10.393267103723941], [148.923137648717216, -10.28092253992136], [147.913018426707993, -10.130440769087469], [147.135443150012236, -9.492443536012017], [146.567880894150619, -8.942554619994153], [146.048481073184917, -8.067414239131308], [144.74416792213799, -7.630128269077473], [143.897087844009661, -7.915330498896279], [143.286375767184268, -8.245491224809056], [143.413913202080664, -8.983068942910945], [142.628431431244223, -9.326820570516501], [142.068258905200196, -9.159595635620034], [141.033851760013874, -9.117892754760417], [141.017056919519007, -5.85902190513802], [141.000210402591847, -2.600151055515624], [142.735246616791443, -3.289152927263216], [144.583970982033236, -3.861417738463401], [145.27317955950997, -4.373737888205027], [145.829786411725649, -4.876497897972683], [145.981921828392956, -5.465609226100012], [147.648073358347574, -6.083659356310803], [147.891107619416175, -6.614014580922315], [146.970905389594861, -6.721656589386255], [147.191873814074938, -7.388024183789978]]], [[[153.14003787659874, -4.499983412294113], [152.827292108368255, -4.766427097190998], [152.63867313050298, -4.176127211120927], [152.406025832324929, -3.789742526874561], [151.953236932583536, -3.462062269711821], [151.384279413050024, -3.035421644710111], [150.6620495953388, -2.741486097833956], [150.939965448204532, -2.500002129734028], [151.479984165654514, -2.779985039891386], [151.820015090135087, -2.999971612157907], [152.239989455371074, -3.24000864015366], [152.640016717742526, -3.659983005389647], [153.019993524384631, -3.980015150573293], [153.14003787659874, -4.499983412294113]]]] } },
-            { "type": "Feature", "properties": { "admin": "Poland", "name": "Poland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[15.016995883858666, 51.106674099321566], [14.607098422919531, 51.745188096719964], [14.685026482815685, 52.089947414755187], [14.437599725002197, 52.624850165408382], [14.074521111719488, 52.981262518925426], [14.353315463934136, 53.248171291712957], [14.119686313542584, 53.757029120491026], [14.802900424873455, 54.050706285205735], [16.363477003655728, 54.513158677785711], [17.622831658608671, 54.851535956432897], [18.620858595461637, 54.682605699270766], [18.696254510175461, 54.438718777069276], [19.6606400896064, 54.426083889373913], [20.89224450041862, 54.312524929412518], [22.731098667092649, 54.327536932993311], [23.243987257589506, 54.220566718149129], [23.484127638449841, 53.912497667041123], [23.527535841574995, 53.47012156840654], [23.804934930117774, 53.08973135030606], [23.799198846133375, 52.691099351606553], [23.19949384938618, 52.486977444053664], [23.508002150168689, 52.023646552124717], [23.52707075368437, 51.578454087930233], [24.029985792748899, 50.705406602575174], [23.922757195743259, 50.424881089878738], [23.426508416444388, 50.308505764357449], [22.518450148211596, 49.476773586619736], [22.776418898212619, 49.027395331409608], [22.558137648211751, 49.08573802346713], [21.607808058364206, 49.470107326854077], [20.887955356538406, 49.328772284535823], [20.415839471119849, 49.431453355499755], [19.825022820726865, 49.217125352569219], [19.320712517990469, 49.571574001659179], [18.909574822676316, 49.435845852244562], [18.85314415861361, 49.496229763377634], [18.392913852622168, 49.988628648470737], [17.649445021238986, 50.049038397819942], [17.554567091551117, 50.36214590107641], [16.868769158605655, 50.473973700556016], [16.719475945714429, 50.215746568393527], [16.176253289462263, 50.4226073268579], [16.238626743238566, 50.697732652379827], [15.490972120839725, 50.7847299261432], [15.016995883858666, 51.106674099321566]]] } },
-            { "type": "Feature", "properties": { "admin": "Puerto Rico", "name": "Puerto Rico", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-66.2824344550082, 18.51476166429536], [-65.771302863209286, 18.426679185453875], [-65.591003790942935, 18.228034979723912], [-65.847163865813755, 17.975905666571855], [-66.599934455009475, 17.98182261806927], [-67.184162360285256, 17.946553453030074], [-67.24242753769434, 18.374460150622934], [-67.100679083917726, 18.520601101144347], [-66.2824344550082, 18.51476166429536]]] } },
-            { "type": "Feature", "properties": { "admin": "North Korea", "name": "Dem. Rep. Korea", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[130.640015903852401, 42.39500946712527], [130.780007358931101, 42.220007229168843], [130.400030552288996, 42.280003567059701], [129.965948521037234, 41.941367906251052], [129.667362095254788, 41.601104437825221], [129.705189243692445, 40.882827867184318], [129.188114862179958, 40.661807766271984], [129.010399611528186, 40.485436102859801], [128.633368361526692, 40.189846910150301], [127.967414178581322, 40.025412502597547], [127.533435500194145, 39.756850083976694], [127.502119582225276, 39.323930772451526], [127.385434198110261, 39.213472398427648], [127.783342726757709, 39.050898342437414], [128.349716424676586, 38.612242946927843], [128.205745884311426, 38.370397243801882], [127.780035435090966, 38.304535630845884], [127.073308547067342, 38.256114813788393], [126.683719924018888, 37.804772854151174], [126.237338901881742, 37.840377916000271], [126.174758742376213, 37.749685777328033], [125.689103631697165, 37.940010077459014], [125.568439162295675, 37.752088731429616], [125.275330438336184, 37.66907054295271], [125.24008711151312, 37.857224432927424], [124.981033156433952, 37.948820909164773], [124.712160679219352, 38.108346055649783], [124.985994093933954, 38.548474229479673], [125.221948683778677, 38.665857245430665], [125.13285851450749, 38.848559271798578], [125.386589797060566, 39.387957872061158], [125.321115757346774, 39.551384589184202], [124.737482131042384, 39.660344346671614], [124.265624627785286, 39.928493353834149], [125.079941847840615, 40.569823716792442], [126.182045119329402, 41.107336127276362], [126.86908328664984, 41.816569322266176], [127.343782993682993, 41.50315176041596], [128.208433058790632, 41.466771552082477], [128.052215203972281, 41.994284572917934], [129.59666873587949, 42.424981797854542], [129.994267205933198, 42.985386867843779], [130.640015903852401, 42.39500946712527]]] } },
-            { "type": "Feature", "properties": { "admin": "Portugal", "name": "Portugal", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-9.034817674180244, 41.880570583659669], [-8.671945766626719, 42.134689439454952], [-8.26385698081779, 42.280468654950326], [-8.01317460776991, 41.790886135417118], [-7.422512986673794, 41.792074693359822], [-7.251308966490822, 41.91834605566504], [-6.668605515967655, 41.883386949219577], [-6.389087693700914, 41.381815497394641], [-6.851126674822551, 41.111082668617513], [-6.864019944679383, 40.330871893874821], [-7.026413133156593, 40.184524237624238], [-7.066591559263527, 39.711891587882768], [-7.498632371439724, 39.629571031241802], [-7.098036668313126, 39.03007274022378], [-7.374092169616317, 38.373058580064914], [-7.029281175148794, 38.075764065089757], [-7.166507941099863, 37.803894354802217], [-7.537105475281022, 37.428904323876232], [-7.45372555177809, 37.097787583966053], [-7.855613165711985, 36.838268540996253], [-8.382816127953687, 36.978880113262449], [-8.898856980820325, 36.868809312480771], [-8.746101446965552, 37.6513455266766], [-8.839997524439879, 38.266243394517609], [-9.287463751655221, 38.358485826158592], [-9.526570603869713, 38.737429104154906], [-9.44698889814023, 39.392066148428363], [-9.048305223008425, 39.755093085278766], [-8.977353481471679, 40.159306138665798], [-8.7686840478771, 40.76063894303018], [-8.790853237330309, 41.18433401139125], [-8.990789353867568, 41.543459377603625], [-9.034817674180244, 41.880570583659669]]] } },
-            { "type": "Feature", "properties": { "admin": "Paraguay", "name": "Paraguay", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-62.685057135657871, -22.24902922942238], [-62.291179368729203, -21.051634616787389], [-62.265961269770784, -20.513734633061272], [-61.786326463453761, -19.633736667562957], [-60.043564622626477, -19.342746677327419], [-59.11504248720609, -19.356906019775398], [-58.183471442280492, -19.868399346600359], [-58.166392381408038, -20.176700941653674], [-57.870673997617786, -20.732687676681948], [-57.937155727761287, -22.090175876557169], [-56.881509568902885, -22.282153822521476], [-56.473317430229379, -22.086300144135279], [-55.797958136606894, -22.356929620047815], [-55.61068274598113, -22.655619398694839], [-55.517639329639621, -23.57199757252663], [-55.400747239795407, -23.956935316668797], [-55.027901780809543, -24.001273695575225], [-54.652834235235119, -23.839578138933955], [-54.292959560754511, -24.021014092710722], [-54.293476325077435, -24.570799655863958], [-54.428946092330577, -25.162184747012162], [-54.625290696823562, -25.739255466415507], [-54.788794928595038, -26.621785577096126], [-55.695845506398143, -27.387837009390857], [-56.486701626192989, -27.548499037386286], [-57.609759690976134, -27.395898532828383], [-58.618173590719735, -27.123718763947089], [-57.633660040911117, -25.603656508081638], [-57.777217169817924, -25.162339776309032], [-58.807128465394968, -24.771459242453307], [-60.028966030504016, -24.032796319273267], [-60.846564704009907, -23.880712579038288], [-62.685057135657871, -22.24902922942238]]] } },
-            { "type": "Feature", "properties": { "admin": "Palestine", "name": "Palestine", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.545665317534535, 32.393992011030569], [35.545251906076196, 31.782504787720832], [35.397560662586038, 31.489086005167572], [34.927408481594554, 31.35343537040141], [34.970506626125989, 31.616778469360803], [35.225891554512422, 31.754341132121759], [34.974640740709319, 31.866582343059715], [35.183930291491428, 32.532510687788935], [35.545665317534535, 32.393992011030569]]] } },
-            { "type": "Feature", "properties": { "admin": "Qatar", "name": "Qatar", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[50.810108270069563, 24.754742539971371], [50.743910760303677, 25.482424221289389], [51.01335167827348, 26.006991685484191], [51.286461622936045, 26.114582017515865], [51.589078810437243, 25.801112779233375], [51.606700473848804, 25.215670477798735], [51.389607781790623, 24.627385972588051], [51.112415398977006, 24.556330878186721], [50.810108270069563, 24.754742539971371]]] } },
-            { "type": "Feature", "properties": { "admin": "Romania", "name": "Romania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.710531447040488, 47.882193915389394], [23.142236362406798, 48.096341050806942], [23.760958286237404, 47.985598456405448], [24.402056105250374, 47.981877753280422], [24.866317172960571, 47.737525743188307], [25.207743361112986, 47.891056423527459], [25.945941196402394, 47.987148749374207], [26.197450392366925, 48.220881252630342], [26.619336785597788, 48.220726223333457], [26.924176059687561, 48.123264472030982], [27.233872918412736, 47.826770941756365], [27.551166212684841, 47.405117092470817], [28.128030226359037, 46.81047638608824], [28.160017937947707, 46.371562608417207], [28.054442986775392, 45.944586086605618], [28.233553501099035, 45.488283189468369], [28.679779493939371, 45.30403087013169], [29.149724969201646, 45.464925442072442], [29.603289015427425, 45.293308010431119], [29.62654340995876, 45.035390936862392], [29.141611769331831, 44.820210272799038], [28.837857700320196, 44.913873806328041], [28.55808149589199, 43.707461656258118], [27.970107049275068, 43.812468166675202], [27.242399529740904, 44.175986029632398], [26.065158725699739, 43.943493760751259], [25.569271681426923, 43.688444729174712], [24.100679152124169, 43.741051337247846], [23.332302280376322, 43.897010809904707], [22.94483239105184, 43.823785305347123], [22.657149692482985, 44.234923000661276], [22.474008416440594, 44.409227606781762], [22.705725538837349, 44.578002834647016], [22.459022251075933, 44.702517198254291], [22.145087924902807, 44.478422349620573], [21.562022739353605, 44.768947251965486], [21.483526238702233, 45.181170152357772], [20.874312778413351, 45.416375433934228], [20.76217492033998, 45.734573065771428], [20.220192498462833, 46.127468980486547], [21.021952345471245, 46.316087958351886], [21.626514926853869, 46.994237779318148], [22.09976769378283, 47.672439276716695], [22.710531447040488, 47.882193915389394]]] } },
-            { "type": "Feature", "properties": { "admin": "Russia", "name": "Russia", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[143.648007440362846, 50.747600409541512], [144.65414757708561, 48.976390692737581], [143.173927850517174, 49.306551418650365], [142.558668247650076, 47.861575018904908], [143.533492466404027, 46.836728013692479], [143.505277134372591, 46.137907619809475], [142.747700636973889, 46.740764878926562], [142.092030064054484, 45.966755276058777], [141.906925083585008, 46.805928860046535], [142.018442824470867, 47.780132961612921], [141.904444614835029, 48.859188544299563], [142.135800002205656, 49.615163072297449], [142.179983351815281, 50.952342434281903], [141.594075962490024, 51.935434882202529], [141.682546014573632, 53.301966457728767], [142.606934035410745, 53.762145087287891], [142.209748976815376, 54.225475979216853], [142.654786411712934, 54.365880845753864], [142.914615513276544, 53.704577541714734], [143.260847609632037, 52.740760403039033], [143.235267775647628, 51.756660264688733], [143.648007440362846, 50.747600409541512]]], [[[22.731098667092649, 54.327536932993311], [20.892244500418652, 54.312524929412568], [19.6606400896064, 54.42608388937397], [19.88848147958134, 54.866160386771483], [21.268448927503492, 55.190481675835279], [22.315723504330599, 55.015298570365886], [22.757763706155281, 54.856574408581416], [22.651051873472564, 54.582740993866693], [22.731098667092649, 54.327536932993311]]], [[[180.000000000000114, 70.832199208546669], [178.903425, 70.78114], [178.7253, 71.0988], [180.000000000000114, 71.515714336428246], [180.000000000000114, 70.832199208546669]]], [[[143.60385, 73.21244], [142.08763, 73.20544], [140.038155, 73.31692], [139.86312, 73.36983], [140.81171, 73.76506], [142.06207, 73.85758], [143.48283, 73.47525], [143.60385, 73.21244]]], [[[150.73167, 75.08406], [149.575925, 74.68892], [147.977465, 74.778355], [146.11919, 75.17298], [146.358485, 75.49682], [148.22223, 75.345845], [150.73167, 75.08406]]], [[[145.086285, 75.562625], [144.3, 74.82], [140.61381, 74.84768], [138.95544, 74.61148], [136.97439, 75.26167], [137.51176, 75.94917], [138.831075, 76.13676], [141.471615, 76.09289], [145.086285, 75.562625]]], [[[57.535692579992386, 70.720463975702145], [56.944979282463933, 70.63274323188665], [53.677375115784187, 70.762657782668455], [53.412016635965372, 71.206661688920192], [51.601894565645708, 71.474759019650477], [51.455753615124209, 72.014881089965129], [52.478275180883564, 72.229441636840946], [52.444168735570841, 72.77473135038484], [54.427613559797649, 73.627547512497571], [53.508289829325136, 73.749813951300141], [55.902458937407644, 74.627486477345329], [55.631932814359701, 75.081412258597155], [57.868643833248839, 75.609390367323186], [61.170044386647497, 76.251883450008123], [64.498368361270209, 76.439055487769267], [66.210977003855092, 76.809782213031227], [68.157059767534818, 76.939696763812904], [68.852211134725124, 76.544811306454605], [68.180572544227644, 76.233641669409096], [64.637326287703004, 75.737754625136219], [61.583507521414752, 75.260884507946784], [58.477082147053366, 74.309056301562819], [56.986785516187993, 73.333043524866227], [55.41933597191094, 72.371267605265956], [55.622837762276291, 71.540594794390316], [57.535692579992386, 70.720463975702145]]], [[[106.970130000000111, 76.97419], [107.240000000000123, 76.48], [108.1538, 76.723350000000138], [111.077260000000138, 76.71], [113.33151, 76.22224], [114.13417, 75.84764], [113.88539, 75.327790000000121], [112.77918, 75.03186], [110.151250000000175, 74.47673], [109.4, 74.18], [110.64, 74.04], [112.11919, 73.787740000000113], [113.019540000000234, 73.976930000000138], [113.529580000000294, 73.33505], [113.96881, 73.59488], [115.56782, 73.75285], [118.776330000000215, 73.58772], [119.02, 73.12], [123.20066, 72.97122], [123.257770000000178, 73.73503], [125.380000000000166, 73.56], [126.97644, 73.56549], [128.59126, 73.03871], [129.05157, 72.39872], [128.46, 71.98], [129.715990000000204, 71.19304], [131.288580000000252, 70.786990000000102], [132.253500000000145, 71.8363], [133.857660000000294, 71.386420000000143], [135.56193, 71.655250000000123], [137.49755, 71.34763], [138.234090000000123, 71.62803], [139.86983, 71.487830000000116], [139.14791, 72.4161900000001], [140.46817, 72.849410000000134], [149.5, 72.2], [150.35118000000017, 71.60643], [152.96890000000019, 70.84222], [157.00688, 71.03141], [158.99779, 70.86672], [159.830310000000225, 70.45324], [159.70866, 69.72198], [160.94053000000028, 69.43728], [162.279070000000104, 69.64204], [164.05248, 69.66823], [165.940370000000172, 69.47199], [167.83567, 69.58269], [169.57763000000017, 68.6938], [170.816880000000253, 69.01363], [170.008200000000159, 69.65276], [170.453450000000259, 70.09703], [173.643910000000204, 69.81743], [175.72403000000017, 69.877250000000217], [178.6, 69.4], [180.000000000000114, 68.963636363636553], [180.000000000000114, 64.979708702198465], [179.99281, 64.97433], [178.707200000000199, 64.53493], [177.411280000000147, 64.60821], [178.313000000000187, 64.07593], [178.90825000000018, 63.251970000000128], [179.37034, 62.98262], [179.48636, 62.56894], [179.228250000000116, 62.304100000000133], [177.3643, 62.5219], [174.569290000000194, 61.76915], [173.68013, 61.65261], [172.15, 60.95], [170.6985, 60.33618], [170.330850000000282, 59.88177], [168.90046, 60.57355], [166.294980000000265, 59.7885500000002], [165.840000000000202, 60.16], [164.87674, 59.7316], [163.539290000000108, 59.86871], [163.217110000000218, 59.21101], [162.01733, 58.24328], [162.05297, 57.83912], [163.19191, 57.61503], [163.057940000000144, 56.159240000000111], [162.129580000000203, 56.12219], [161.70146, 55.285680000000148], [162.117490000000117, 54.85514], [160.368770000000325, 54.34433], [160.021730000000218, 53.20257], [158.530940000000157, 52.958680000000236], [158.23118, 51.94269], [156.789790000000266, 51.01105], [156.42000000000013, 51.7], [155.99182, 53.15895], [155.43366, 55.381030000000109], [155.914420000000291, 56.767920000000132], [156.75815, 57.3647], [156.81035, 57.83204], [158.364330000000166, 58.05575], [160.150640000000124, 59.314770000000109], [161.87204, 60.343000000000117], [163.66969, 61.1409], [164.473550000000103, 62.55061], [163.258420000000172, 62.46627], [162.65791, 61.6425], [160.12148, 60.54423], [159.30232, 61.77396], [156.72068, 61.43442], [154.218060000000293, 59.758180000000117], [155.04375, 59.14495], [152.81185, 58.88385], [151.265730000000246, 58.78089], [151.33815, 59.50396], [149.78371, 59.655730000000126], [148.54481, 59.16448], [145.48722, 59.33637], [142.197820000000121, 59.03998], [138.958480000000293, 57.08805], [135.12619, 54.72959], [136.70171, 54.603550000000112], [137.19342, 53.97732], [138.1647, 53.755010000000247], [138.80463, 54.25455], [139.90151, 54.189680000000166], [141.34531, 53.089570000000109], [141.37923, 52.23877], [140.59742000000017, 51.23967], [140.51308, 50.045530000000113], [140.061930000000189, 48.446710000000152], [138.554720000000202, 46.99965], [138.21971, 46.30795], [136.86232, 45.143500000000174], [135.515350000000183, 43.989], [134.869390000000237, 43.39821], [133.536870000000249, 42.81147], [132.90627, 42.79849], [132.278070000000241, 43.284560000000106], [130.935870000000136, 42.55274], [130.78, 42.220000000000191], [130.640000000000157, 42.395], [130.633866408409801, 42.903014634770543], [131.144687941614961, 42.929989732426932], [131.288555129115593, 44.111519680348252], [131.025190000000237, 44.96796], [131.883454217659562, 45.321161607436508], [133.097120000000189, 45.14409], [133.769643996313164, 46.116926988299149], [134.112350000000163, 47.212480000000127], [134.50081, 47.578450000000139], [135.026311476786759, 48.478229885443902], [133.373595819228001, 48.183441677434836], [132.506690000000106, 47.78896], [130.987260000000106, 47.79013], [130.582293328982644, 48.72968740497619], [129.397817824420486, 49.4406000840156], [127.657400000000351, 49.76027], [127.287455682484904, 50.739797268265434], [126.939156528837827, 51.353894151405896], [126.564399041856959, 51.784255479532689], [125.946348911646439, 52.792798570356936], [125.068211297710434, 53.161044826868924], [123.57147, 53.4588], [122.245747918793043, 53.431725979213681], [121.003084751470354, 53.251401068731226], [120.177088657716865, 52.753886216841195], [120.725789015791975, 52.516226304730893], [120.7382, 51.96411], [120.182080000000155, 51.64355], [119.27939, 50.58292], [119.288460728025839, 50.142882798861947], [117.87924441942647, 49.510983384797036], [116.67880089728618, 49.888531399121398], [115.485695428531415, 49.805177313834733], [114.962109816550353, 50.140247300815119], [114.362456496235325, 50.24830272073747], [112.897739699354361, 49.543565375356984], [111.581230910286649, 49.377968248077671], [110.662010532678835, 49.130128078805846], [109.402449171996707, 49.292960516957685], [108.475167270951275, 49.282547715850704], [107.868175897251092, 49.793705145865871], [106.888804152455293, 50.274295966180276], [105.886591424586868, 50.40601919209216], [104.62158, 50.275320000000157], [103.676545444760336, 50.08996613219513], [102.25589, 50.510560000000105], [102.06521, 51.25991], [100.889480421962631, 51.516855780638409], [99.981732212323564, 51.63400625264395], [98.861490513100492, 52.047366034546698], [97.82573978067451, 51.010995184933236], [98.231761509191699, 50.422400621128716], [97.259760000000199, 49.72605], [95.814020000000156, 49.977460000000114], [94.815949334698757, 50.01343333597088], [94.147566359435601, 50.480536607457161], [93.10421, 50.49529], [92.234711541719676, 50.802170722041737], [90.713667433640765, 50.331811835321098], [88.805566847695573, 49.470520738312459], [87.751264276076824, 49.297197984405543], [87.359970330762692, 49.214980780629148], [86.829356723989648, 49.826674709668133], [85.541269972682485, 49.69285858824815], [85.115559523462082, 50.117302964877631], [84.416377394553038, 50.311399644565817], [83.935114780618903, 50.889245510453563], [83.383003778012451, 51.069182847693881], [81.945985548839943, 50.812195949906325], [80.568446893235446, 51.388336493528435], [80.035559523441705, 50.864750881547209], [77.80091556184432, 53.404414984747532], [76.525179477854749, 54.177003485727127], [76.891100294913443, 54.490524400441913], [74.384820000000119, 53.546850000000113], [73.425678745420512, 53.489810289109741], [73.50851606638436, 54.035616766976588], [72.224150018202195, 54.376655381886778], [71.180131056609468, 54.133285224008247], [70.86526655465515, 55.169733588270091], [69.068166945272893, 55.385250149143488], [68.169100376258896, 54.970391750704366], [65.66687, 54.601250000000149], [65.178533563095939, 54.354227810272064], [61.436600000000126, 54.00625], [60.978066440683236, 53.664993394579128], [61.69998619980062, 52.979996446334255], [60.73999311711453, 52.719986477257734], [60.927268507740237, 52.447548326214999], [59.967533807215567, 51.96042043721566], [61.588003371024136, 51.272658799843171], [61.337424350840998, 50.799070136104248], [59.932807244715555, 50.842194118851822], [59.642282342370564, 50.545442206415707], [58.363320000000122, 51.06364], [56.77798, 51.04355], [55.71694, 50.621710000000142], [54.532878452376181, 51.026239732459359], [52.328723585831042, 51.718652248738088], [50.766648390512174, 51.692762356159861], [48.702381626181044, 50.605128485712825], [48.577841424357601, 49.87475962991563], [47.549480421749379, 50.454698391311119], [46.751596307162764, 49.356005764353725], [47.043671502476585, 49.152038886097571], [46.466445753776291, 48.394152330104923], [47.315240000000152, 47.71585], [48.05725, 47.74377], [48.694733514201872, 47.075628160177885], [48.59325000000014, 46.56104], [49.101160000000121, 46.39933], [48.645410000000105, 45.80629], [47.67591, 45.641490000000111], [46.68201, 44.6092], [47.59094, 43.660160000000118], [47.49252, 42.98658], [48.58437000000017, 41.80888], [47.987283156126033, 41.405819200194387], [47.815665724484653, 41.151416124021338], [47.373315464066387, 41.219732367511135], [46.686070591016708, 41.827137152669899], [46.404950799348924, 41.860675157227426], [45.7764, 42.092440000000224], [45.470279168485909, 42.502780666670041], [44.537622918482057, 42.711992702803677], [43.93121, 42.554960000000101], [43.755990000000182, 42.74083], [42.394400000000154, 43.2203], [40.922190000000128, 43.382150000000131], [40.076964959479838, 43.553104153002486], [39.95500857927108, 43.434997666999287], [38.68, 44.28], [37.539120000000104, 44.65721], [36.675460000000122, 45.24469], [37.40317, 45.40451], [38.23295, 46.24087], [37.67372, 46.63657], [39.14767, 47.044750000000128], [39.121200000000123, 47.26336], [38.22353803889947, 47.102189846375971], [38.2551123390298, 47.546400458356956], [38.77057, 47.825620000000228], [39.738277622238982, 47.898937079452068], [39.895620000000136, 48.23241], [39.67465, 48.783820000000127], [40.080789015469477, 49.307429917999364], [40.069040000000108, 49.60105], [38.594988234213552, 49.926461900423718], [38.010631137857068, 49.915661526074715], [37.393459506995228, 50.383953355503664], [36.626167840325387, 50.225590928745127], [35.35611616388811, 50.577197374059139], [35.37791, 50.77394], [35.02218305841793, 51.207572333371495], [34.224815708154402, 51.255993150428921], [34.141978387190612, 51.56641347920619], [34.391730584457228, 51.768881740925892], [33.75269982273587, 52.335074571331646], [32.715760532367163, 52.238465481162159], [32.412058139787767, 52.288694973349763], [32.15944000000021, 52.061250000000101], [31.78597, 52.10168], [31.540018344862254, 52.742052313846429], [31.305200636527978, 53.073995876673301], [31.49764, 53.167430000000124], [32.304519484188368, 53.132726141972839], [32.693643019346119, 53.351420803432141], [32.405598585751157, 53.618045355842], [31.731272820774585, 53.794029446012011], [31.791424187962399, 53.974638576872181], [31.384472283663818, 54.157056382862365], [30.757533807098774, 54.811770941784388], [30.971835971813245, 55.08154775656412], [30.873909132620064, 55.55097646750351], [29.896294386522435, 55.789463202530484], [29.371571893030783, 55.670090643936263], [29.229513380660389, 55.918344224666399], [28.176709425577933, 56.169129950578778], [27.855282016722519, 56.759326483784363], [27.770015903440985, 57.244258124411189], [27.288184848751648, 57.474528306703903], [27.716685825315771, 57.791899115624439], [27.420150000000202, 58.724570000000128], [28.131699253051856, 59.300825100330982], [27.98112, 59.47537], [29.1177, 60.028050000000107], [28.07, 60.503520000000137], [30.211107212044645, 61.780027777749673], [31.139991082491029, 62.357692776124431], [31.516092156711263, 62.867687486412898], [30.035872430142796, 63.552813625738551], [30.444684686003736, 64.204453436939062], [29.544429559047014, 64.948671576590542], [30.21765, 65.80598], [29.054588657352376, 66.944286200622017], [29.977426385220689, 67.69829702419274], [28.445943637818765, 68.364612942163987], [28.591929559043358, 69.064776923286686], [29.39955, 69.15692000000017], [31.101080000000103, 69.55811], [32.132720000000255, 69.905950000000232], [33.77547, 69.301420000000107], [36.51396, 69.06342], [40.292340000000159, 67.9324], [41.059870000000124, 67.457130000000106], [41.125950000000174, 66.79158000000011], [40.01583, 66.266180000000119], [38.38295, 65.99953], [33.918710000000168, 66.75961], [33.18444, 66.63253], [34.81477, 65.900150000000124], [34.87857425307876, 65.436212877048192], [34.943910000000152, 64.414370000000147], [36.23129, 64.10945], [37.012730000000111, 63.84983], [37.141970000000143, 64.33471], [36.539579035089801, 64.76446], [37.176040000000135, 65.143220000000113], [39.59345, 64.520790000000162], [40.4356, 64.76446], [39.762600000000148, 65.49682], [42.09309, 66.47623], [43.01604000000011, 66.41858], [43.94975000000013, 66.06908], [44.53226, 66.756340000000122], [43.69839, 67.35245], [44.187950000000136, 67.95051], [43.45282, 68.57079], [46.250000000000135, 68.25], [46.821340000000156, 67.68997], [45.55517, 67.56652], [45.56202, 67.010050000000192], [46.349150000000137, 66.66767], [47.894160000000248, 66.884550000000146], [48.13876, 67.52238], [50.227660000000142, 67.998670000000132], [53.717430000000164, 68.85738], [54.47171, 68.80815], [53.485820000000118, 68.20131], [54.72628, 68.09702], [55.442680000000124, 68.43866], [57.317020000000149, 68.46628], [58.802000000000206, 68.88082], [59.941420000000178, 68.27844], [61.077840000000165, 68.94069], [60.03, 69.52], [60.55, 69.85], [63.504000000000147, 69.54739], [64.888115, 69.234835000000132], [68.512160000000108, 68.09233000000016], [69.18068, 68.61563000000011], [68.16444, 69.14436], [68.13522, 69.35649], [66.930080000000103, 69.454610000000102], [67.25976, 69.92873], [66.724920000000125, 70.708890000000125], [66.69466, 71.028970000000228], [68.540060000000111, 71.934500000000227], [69.19636, 72.843360000000146], [69.94, 73.04000000000012], [72.58754, 72.77629], [72.79603, 72.22006], [71.84811, 71.40898], [72.47011, 71.09019], [72.79188, 70.39114], [72.564700000000201, 69.02085], [73.66787, 68.4079], [73.2387, 67.7404], [71.280000000000101, 66.320000000000149], [72.423010000000147, 66.172670000000167], [72.82077, 66.53267], [73.920990000000131, 66.789460000000119], [74.186510000000183, 67.28429], [75.052, 67.760470000000154], [74.469260000000148, 68.32899], [74.93584, 68.98918], [73.84236, 69.07146], [73.601870000000204, 69.62763], [74.3998, 70.63175], [73.1011, 71.447170000000241], [74.890820000000204, 72.12119], [74.65926, 72.83227], [75.158010000000175, 72.854970000000108], [75.68351, 72.300560000000118], [75.288980000000109, 71.33556], [76.35911, 71.152870000000135], [75.903130000000161, 71.87401], [77.5766500000001, 72.26717], [79.652020000000107, 72.32011], [81.5, 71.75], [80.61071, 72.582850000000107], [80.51109, 73.6482], [82.25, 73.85], [84.65526, 73.805910000000154], [86.822300000000226, 73.93688], [86.00956, 74.459670000000145], [87.166820000000143, 75.11643], [88.31571, 75.14393], [90.26, 75.64], [92.90058, 75.77333], [93.234210000000132, 76.0472], [95.860000000000127, 76.14], [96.67821, 75.91548], [98.922540000000197, 76.44689], [100.759670000000199, 76.43028], [101.03532, 76.86189], [101.990840000000105, 77.287540000000192], [104.3516, 77.69792], [106.066640000000135, 77.37389], [104.705000000000211, 77.1274], [106.970130000000111, 76.97419]]], [[[105.07547, 78.30689], [99.43814, 77.921], [101.2649, 79.23399], [102.08635, 79.34641], [102.837815, 79.28129], [105.37243, 78.71334], [105.07547, 78.30689]]], [[[51.136186557831266, 80.54728017854093], [49.793684523320692, 80.415427761548202], [48.894411248577526, 80.33956675894369], [48.75493655782175, 80.175468248200829], [47.586119012244147, 80.010181179515328], [46.502825962109647, 80.247246812654339], [47.072455275262897, 80.559424140129451], [44.846958042181107, 80.589809882317169], [46.799138624871226, 80.771917629713627], [48.31847741068465, 80.784009914869927], [48.52280602396668, 80.514568996900138], [49.097189568890897, 80.753985907708412], [50.039767693894603, 80.918885403151791], [51.522932977103679, 80.699725653801906], [51.136186557831266, 80.54728017854093]]], [[[99.93976, 78.88094], [97.75794, 78.7562], [94.97259, 79.044745], [93.31288, 79.4265], [92.5454, 80.14379], [91.18107, 80.34146], [93.77766, 81.0246], [95.940895, 81.2504], [97.88385, 80.746975], [100.186655, 79.780135], [99.93976, 78.88094]]]] } },
-            { "type": "Feature", "properties": { "admin": "Rwanda", "name": "Rwanda", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[30.419104852019235, -1.134659112150416], [30.816134881317705, -1.698914076345388], [30.758308953583104, -2.287250257988368], [30.469696079232978, -2.413857517103458], [29.938359002407935, -2.348486830254238], [29.632176141078585, -2.917857761246096], [29.02492638521678, -2.839257907730157], [29.117478875451546, -2.292211195488384], [29.254834832483336, -2.215109958508911], [29.29188683443661, -1.620055840667987], [29.579466180140876, -1.341313164885626], [29.821518588996003, -1.443322442229785], [30.419104852019235, -1.134659112150416]]] } },
-            { "type": "Feature", "properties": { "admin": "Western Sahara", "name": "W. Sahara", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-8.794883999049075, 27.120696316022503], [-8.81782833498667, 27.656425889592349], [-8.665589565454805, 27.656425889592349], [-8.66512447756419, 27.58947907155822], [-8.684399786809051, 27.395744126895998], [-8.687293667017398, 25.881056219988899], [-11.969418911171159, 25.933352769468261], [-11.93722449385332, 23.374594224536164], [-12.874221564169574, 23.284832261645171], [-13.118754441774708, 22.771220201096249], [-12.929101935263528, 21.327070624267559], [-16.845193650773989, 21.333323472574875], [-17.063423224342568, 20.99975210213082], [-17.020428432675736, 21.422310288981475], [-17.002961798561085, 21.420734157796574], [-14.750954555713532, 21.50060008390366], [-14.630832688851068, 21.860939846274899], [-14.221167771857251, 22.310163072188153], [-13.891110398809044, 23.691009019459297], [-12.500962693725368, 24.770116278578193], [-12.030758836301613, 26.030866197203036], [-11.718219773800353, 26.104091701760616], [-11.392554897496977, 26.883423977154358], [-10.551262579785272, 26.990807603456879], [-10.18942420087758, 26.860944729107398], [-9.735343390328877, 26.860944729107398], [-9.413037482124464, 27.088476060488514], [-8.794883999049075, 27.120696316022503]]] } },
-            { "type": "Feature", "properties": { "admin": "Saudi Arabia", "name": "Saudi Arabia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[42.779332309750963, 16.34789134364868], [42.64957278826607, 16.77463532151496], [42.347989129410706, 17.075805568911996], [42.270887892431219, 17.474721787989122], [41.754381951673949, 17.833046169500971], [41.221391229015573, 18.671599636301206], [40.939341261566533, 19.486485297111752], [40.247652215339819, 20.174634507726488], [39.801684604660934, 20.338862209550054], [39.139399448408277, 21.29190481209293], [39.023695916506782, 21.986875311770191], [39.066328973147577, 22.579655666590263], [38.492772251140075, 23.688451036060851], [38.023860304523616, 24.078685614512928], [37.483634881344379, 24.285494696545008], [37.154817742671177, 24.858482977797301], [37.209491408035994, 25.084541530858104], [36.931627231602583, 25.602959499610172], [36.639603712721218, 25.826227525327219], [36.249136590323808, 26.570135606384873], [35.640181512196385, 27.376520494083415], [35.130186801907875, 28.063351955674712], [34.632336053207972, 28.058546047471559], [34.787778761541936, 28.607427273059692], [34.832220493312938, 28.957483425404838], [34.956037225084252, 29.356554673778835], [36.068940870922049, 29.19749461518445], [36.501214227043583, 29.505253607698702], [36.740527784987243, 29.865283311476183], [37.503581984209028, 30.003776150018396], [37.668119744626374, 30.338665269485894], [37.998848911294367, 30.508499864213128], [37.002165561681004, 31.508412990844736], [39.004885695152545, 32.010216986614971], [39.195468377444961, 32.16100881604266], [40.399994337736238, 31.889991766887931], [41.889980910007829, 31.190008653278362], [44.709498732284736, 29.178891099559376], [46.568713413281742, 29.099025173452283], [47.459821811722819, 29.002519436147217], [47.708850538937376, 28.526062730416136], [48.416094191283939, 28.552004299426663], [48.807594842327163, 27.689627997339876], [49.299554477745815, 27.461218166609804], [49.470913527225647, 27.109999294538078], [50.152422316290874, 26.689663194275994], [50.212935418504671, 26.277026882425371], [50.113303257045928, 25.943972276304248], [50.23985883972874, 25.608049628190923], [50.527386509000728, 25.327808335872099], [50.660556675016885, 24.999895534764018], [50.810108270069563, 24.754742539971371], [51.112415398977006, 24.556330878186721], [51.389607781790623, 24.627385972588051], [51.579518670463258, 24.245497137951102], [51.617707553926969, 24.014219265228824], [52.000733270074321, 23.001154486578937], [55.006803012924898, 22.496947536707129], [55.208341098863187, 22.708329982997039], [55.666659376859812, 22.000001125572336], [54.999981723862355, 19.999994004796104], [52.000009800022227, 19.000003363516054], [49.116671583864857, 18.616667588774941], [48.183343540241324, 18.166669216377311], [47.466694777217626, 17.116681626854877], [47.000004917189749, 16.949999294497438], [46.749994337761642, 17.283338120996174], [46.366658563020529, 17.233315334537632], [45.399999220568752, 17.333335069238554], [45.216651238797184, 17.43332896572333], [44.062613152855072, 17.410358791569589], [43.791518589051904, 17.319976711491105], [43.380794305196098, 17.579986680567668], [43.115797560403351, 17.088440456607369], [43.218375278502734, 16.666889960186406], [42.779332309750963, 16.34789134364868]]] } },
-            { "type": "Feature", "properties": { "admin": "Sudan", "name": "Sudan", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.963392794971178, 9.464285229420623], [33.824963480907506, 9.48406084571536], [33.842130853028145, 9.981914637215992], [33.721959248183097, 10.325262079630191], [33.206938084561777, 10.720111638406591], [33.086766479716729, 11.441141267476493], [33.206938084561777, 12.179338268667093], [32.743419037302537, 12.24800775714999], [32.674749548819641, 12.024831919580716], [32.073891524594778, 11.973329803218517], [32.314234734284746, 11.681484477166519], [32.400071594888338, 11.080626452941486], [31.850715687025509, 10.531270545078822], [31.352861895524875, 9.810240916008693], [30.837840731903377, 9.707236683284519], [29.996639497988546, 10.290927335388684], [29.618957311332842, 10.084918869940223], [29.515953078608607, 9.793073543888053], [29.000931914987166, 9.604232450560287], [28.966597170745779, 9.398223985111654], [27.970889587744345, 9.398223985111654], [27.833550610778783, 9.604232450560287], [27.112520981708876, 9.638567194801622], [26.752006167173811, 9.466893473594492], [26.477328213242508, 9.552730334198086], [25.96230704962101, 10.136420986302422], [25.790633328413943, 10.411098940233726], [25.069603699343979, 10.27375996326799], [24.79492574541268, 9.810240916008693], [24.537415163602017, 8.917537565731719], [24.194067721187643, 8.728696472403895], [23.886979580860665, 8.619729712933063], [23.805813429466745, 8.666318874542522], [23.459012892355979, 8.954285793489019], [23.394779087017291, 9.26506785729225], [23.557249790142915, 9.681218166538766], [23.554304233502187, 10.089255275915319], [22.977543572692749, 10.714462591998538], [22.864165480244246, 11.142395127807616], [22.87622, 11.384610000000119], [22.50869, 11.67936], [22.49762, 12.26024], [22.28801, 12.64605], [21.93681, 12.588180000000133], [22.03759, 12.95546], [22.29658, 13.37232], [22.18329, 13.78648], [22.51202, 14.09318], [22.30351, 14.32682], [22.567950000000106, 14.944290000000134], [23.02459, 15.68072], [23.886890000000101, 15.61084], [23.837660000000135, 19.580470000000101], [23.850000000000129, 20.0], [25.00000000000011, 20.00304], [25.00000000000011, 22.0], [29.02, 22.0], [32.9, 22.0], [36.86623, 22.0], [37.18872, 21.01885], [36.96941, 20.837440000000125], [37.114700000000134, 19.80796], [37.48179, 18.61409], [37.86276, 18.36786], [38.410089959473218, 17.998307399970312], [37.904000000000103, 17.42754], [37.16747, 17.263140000000128], [36.852530000000108, 16.95655], [36.75389, 16.29186], [36.32322, 14.82249], [36.42951, 14.42211], [36.27022, 13.563330000000118], [35.86363, 12.57828], [35.26049, 12.08286], [34.831630000000125, 11.318960000000116], [34.73115000000012, 10.910170000000106], [34.25745, 10.63009], [33.96162, 9.58358], [33.963392794971178, 9.464285229420623]]] } },
-            { "type": "Feature", "properties": { "admin": "South Sudan", "name": "S. Sudan", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.963392794971178, 9.464285229420623], [33.97498, 8.68456], [33.82550000000014, 8.37916], [33.294800000000116, 8.35458], [32.95418, 7.7849700000001], [33.56829, 7.71334], [34.0751, 7.22595], [34.25032, 6.82607], [34.70702, 6.59422000000012], [35.298007118233095, 5.506], [34.620196267853935, 4.847122742082034], [34.005, 4.249884947362147], [33.39, 3.79], [32.68642, 3.79232], [31.881450000000136, 3.55827], [31.24556, 3.7819], [30.83385, 3.50917], [29.95349, 4.1737], [29.715995314256013, 4.600804755060152], [29.159078403446635, 4.389267279473244], [28.696677687298795, 4.455077215996993], [28.428993768026992, 4.287154649264607], [27.979977247842946, 4.408413397637388], [27.374226108517625, 5.233944403500173], [27.213409051225248, 5.550953477394613], [26.465909458123289, 5.946717434101855], [26.213418409945113, 6.546603298362127], [25.796647983511257, 6.979315904158169], [25.124130893664805, 7.500085150579422], [25.114932488716867, 7.825104071479244], [24.567369012152191, 8.229187933785452], [23.886979580860665, 8.619729712933063], [24.194067721187643, 8.728696472403895], [24.537415163602017, 8.917537565731719], [24.79492574541268, 9.810240916008693], [25.069603699343979, 10.27375996326799], [25.790633328413943, 10.411098940233726], [25.96230704962101, 10.136420986302422], [26.477328213242508, 9.552730334198086], [26.752006167173811, 9.466893473594492], [27.112520981708876, 9.638567194801622], [27.833550610778783, 9.604232450560287], [27.970889587744345, 9.398223985111654], [28.966597170745779, 9.398223985111654], [29.000931914987166, 9.604232450560287], [29.515953078608607, 9.793073543888053], [29.618957311332842, 10.084918869940223], [29.996639497988546, 10.290927335388684], [30.837840731903377, 9.707236683284519], [31.352861895524875, 9.810240916008693], [31.850715687025509, 10.531270545078822], [32.400071594888338, 11.080626452941486], [32.314234734284746, 11.681484477166519], [32.073891524594778, 11.973329803218517], [32.674749548819641, 12.024831919580716], [32.743419037302537, 12.24800775714999], [33.206938084561777, 12.179338268667093], [33.086766479716729, 11.441141267476493], [33.206938084561777, 10.720111638406591], [33.721959248183097, 10.325262079630191], [33.842130853028145, 9.981914637215992], [33.824963480907506, 9.48406084571536], [33.963392794971178, 9.464285229420623]]] } },
-            { "type": "Feature", "properties": { "admin": "Senegal", "name": "Senegal", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-16.713728807023468, 13.594958604379853], [-17.126106736712611, 14.373515733289221], [-17.625042690490655, 14.72954051356407], [-17.185172898822227, 14.91947724045286], [-16.700706346085919, 15.621527411354107], [-16.463098110407881, 16.135036119038457], [-16.120690070041928, 16.45566254319338], [-15.623666144258689, 16.369337063049809], [-15.135737270558813, 16.587282416240779], [-14.577347581428977, 16.598263658102805], [-14.099521450242175, 16.304302273010489], [-13.43573767745306, 16.039383042866188], [-12.830658331747513, 15.303691514542942], [-12.170750291380299, 14.616834214735503], [-12.124887457721256, 13.994727484589784], [-11.927716030311613, 13.422075100147392], [-11.553397793005427, 13.141213690641063], [-11.467899135778522, 12.754518947800973], [-11.513942836950587, 12.442987575729415], [-11.658300950557928, 12.386582749882834], [-12.20356482588563, 12.465647691289401], [-12.278599005573438, 12.354440008997285], [-12.499050665730561, 12.332089952031053], [-13.217818162478235, 12.575873521367964], [-13.700476040084322, 12.586182969610192], [-15.548476935274005, 12.628170070847343], [-15.816574266004251, 12.515567124883345], [-16.147716844130581, 12.547761542201185], [-16.67745195155457, 12.38485158940105], [-16.84152462408127, 13.151393947802557], [-15.931295945692208, 13.130284125211331], [-15.691000535534991, 13.270353094938455], [-15.511812506562931, 13.278569647672864], [-15.141163295949463, 13.509511623585235], [-14.712197231494626, 13.298206691943774], [-14.277701788784553, 13.28058502853224], [-13.844963344772404, 13.505041612191999], [-14.046992356817478, 13.794067898000446], [-14.376713833055785, 13.625680243377371], [-14.687030808968483, 13.63035696049978], [-15.081735398813816, 13.876491807505982], [-15.398770310924457, 13.860368760630916], [-15.624596320039936, 13.623587347869556], [-16.713728807023468, 13.594958604379853]]] } },
-            { "type": "Feature", "properties": { "admin": "Solomon Islands", "name": "Solomon Is.", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[162.119024693040842, -10.482719008021133], [162.398645868172196, -10.826367282762119], [161.700032180018354, -10.820011081590222], [161.319796991214702, -10.204751478723123], [161.917383254237933, -10.446700534713653], [162.119024693040842, -10.482719008021133]]], [[[160.852228631837903, -9.872937106977002], [160.462588332357228, -9.89520964929484], [159.849447463214176, -9.794027194867367], [159.640002883135139, -9.639979750205269], [159.70294477766663, -9.242949720906777], [160.362956170898428, -9.400304457235533], [160.688517694337179, -9.610162448772808], [160.852228631837903, -9.872937106977002]]], [[[161.679981724289121, -9.599982191611373], [161.52939660059053, -9.784312025596433], [160.788253208660507, -8.917543226764918], [160.579997186524338, -8.320008640173965], [160.92002811100491, -8.320008640173965], [161.280006138349961, -9.120011488484449], [161.679981724289121, -9.599982191611373]]], [[[159.875027297198585, -8.337320244991714], [159.917401971677975, -8.538289890174864], [159.133677199539335, -8.114181410355398], [158.586113722974687, -7.754823500197713], [158.211149530264834, -7.421872246941147], [158.359977655265425, -7.320017998893915], [158.820001255527671, -7.56000335045739], [159.640002883135139, -8.020026950719567], [159.875027297198585, -8.337320244991714]]], [[[157.53842573468927, -7.347819919466928], [157.339419793933217, -7.404767347852554], [156.902030471014768, -7.176874281445391], [156.491357863591304, -6.765943291860394], [156.542827590153934, -6.599338474151478], [157.140000441718882, -7.021638278840653], [157.53842573468927, -7.347819919466928]]]] } },
-            { "type": "Feature", "properties": { "admin": "Sierra Leone", "name": "Sierra Leone", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-11.438779466182053, 6.785916856305746], [-11.708194545935736, 6.860098374860724], [-12.428098924193815, 7.262942002792029], [-12.949049038128193, 7.798645738145736], [-13.124025437868479, 8.163946438016977], [-13.246550258832512, 8.903048610871506], [-12.711957566773076, 9.342711696810765], [-12.596719122762206, 9.620188300001969], [-12.425928514037562, 9.835834051955953], [-12.150338100625003, 9.858571682164378], [-11.917277390988655, 10.046983954300556], [-11.117481248407328, 10.045872911006283], [-10.839151984083299, 9.688246161330367], [-10.622395188835037, 9.267910061068276], [-10.65477047366589, 8.977178452994194], [-10.494315151399629, 8.715540676300433], [-10.505477260774667, 8.348896389189603], [-10.230093553091276, 8.406205552601291], [-10.695594855176477, 7.939464016141085], [-11.14670427086838, 7.396706447779534], [-11.199801805048278, 7.105845648624735], [-11.438779466182053, 6.785916856305746]]] } },
-            { "type": "Feature", "properties": { "admin": "El Salvador", "name": "El Salvador", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-87.793111131526558, 13.384480495655051], [-87.904112108089507, 13.149016831917134], [-88.483301561216791, 13.163951320849488], [-88.843227912129692, 13.259733588102474], [-89.256742723329282, 13.4585328231293], [-89.812393561547637, 13.520622056527994], [-90.095554572290951, 13.73533763270073], [-90.064677903996568, 13.881969509328924], [-89.7219339668207, 14.134228013561694], [-89.5342193265205, 14.244815578666302], [-89.587342698916544, 14.362586167859485], [-89.353325975282772, 14.424132798719112], [-89.058511929057644, 14.340029405164085], [-88.843072882832814, 14.140506700085169], [-88.541230841815974, 13.980154730683475], [-88.50399797234968, 13.845485948130854], [-88.065342576840123, 13.964625962779774], [-87.859515347021585, 13.893312486216979], [-87.723502977229387, 13.785050360565503], [-87.793111131526558, 13.384480495655051]]] } },
-            { "type": "Feature", "properties": { "admin": "Somaliland", "name": "Somaliland", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[48.938129510296491, 9.451748968946672], [48.486735874226994, 8.837626247589979], [47.78942, 8.003], [46.948328484897942, 7.996876532417386], [43.67875, 9.183580000000116], [43.296975132018744, 9.540477403191742], [42.92812, 10.021940000000139], [42.55876, 10.572580000000126], [42.776851841000948, 10.926878566934416], [43.145304803242126, 11.462039699748853], [43.470659620951658, 11.27770986576388], [43.666668328634834, 10.864169216348158], [44.117803582542805, 10.445538438351603], [44.614259067570849, 10.442205308468941], [45.556940545439133, 10.698029486529775], [46.645401238802997, 10.816549383991171], [47.525657586462778, 11.127228094929986], [48.021596307167769, 11.193063869669741], [48.378783807169263, 11.375481675660122], [48.948206414593457, 11.410621649618516], [48.942005242718423, 11.394266058798163], [48.938491245322595, 10.982327378783451], [48.938232863161076, 9.973500067581481], [48.938129510296491, 9.451748968946672]]] } },
-            { "type": "Feature", "properties": { "admin": "Somalia", "name": "Somalia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[49.72862, 11.5789], [50.25878, 11.67957], [50.73202, 12.0219], [51.1112, 12.02464], [51.13387, 11.74815], [51.04153, 11.16651], [51.04531, 10.6409], [50.83418, 10.27972], [50.55239, 9.19874], [50.07092, 8.08173], [49.4527, 6.80466], [48.59455, 5.33911], [47.74079, 4.2194], [46.56476, 2.85529], [45.56399, 2.04576], [44.06815, 1.05283], [43.13597, 0.2922], [42.04157, -0.91916], [41.81095, -1.44647], [41.58513, -1.68325], [40.993, -0.85829], [40.98105, 2.78452], [41.855083092643966, 3.918911920483726], [42.12861, 4.23413], [42.76967, 4.25259], [43.66087, 4.95755], [44.9636, 5.00162], [47.78942, 8.003], [48.486735874226937, 8.837626247589993], [48.938129510296442, 9.451748968946616], [48.938232863161026, 9.973500067581508], [48.938491245322481, 10.982327378783465], [48.942005242718345, 11.394266058798136], [48.948204758509732, 11.410617281697961], [49.26776, 11.43033], [49.72862, 11.5789]]] } },
-            { "type": "Feature", "properties": { "admin": "Republic of Serbia", "name": "Serbia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.874312778413408, 45.416375433934306], [21.483526238702204, 45.181170152357865], [21.562022739353718, 44.768947251965635], [22.145087924902892, 44.478422349620573], [22.459022251075961, 44.702517198254426], [22.705725538837434, 44.578002834647002], [22.47400841644065, 44.409227606781762], [22.657149692483067, 44.234923000661347], [22.410446404721593, 44.008063462900047], [22.500156691180219, 43.642814439460999], [22.986018507588479, 43.211161200527094], [22.604801466571352, 42.898518785161109], [22.43659467946139, 42.580321153323943], [22.545011834409642, 42.461362006188025], [22.380525750424674, 42.320259507815074], [21.917080000000105, 42.30364], [21.576635989402117, 42.245224397061847], [21.54332, 42.32025], [21.66292, 42.43922], [21.77505, 42.6827], [21.63302, 42.67717], [21.43866, 42.86255], [21.27421, 42.90959], [21.143395, 43.068685000000123], [20.95651, 43.13094], [20.81448, 43.27205], [20.63508, 43.21671], [20.49679, 42.88469], [20.25758, 42.81275], [20.3398, 42.89852], [19.95857, 43.10604], [19.63, 43.213779970270522], [19.48389, 43.35229], [19.21852, 43.52384], [19.454, 43.568100000000115], [19.59976, 44.03847], [19.11761, 44.42307], [19.36803, 44.863], [19.00548, 44.86023], [19.390475701584588, 45.236515611342369], [19.072768995854172, 45.521511135432078], [18.82982, 45.90888], [19.596044549241636, 46.171729844744547], [20.22019249846289, 46.127468980486569], [20.76217492033998, 45.734573065771478], [20.874312778413408, 45.416375433934306]]] } },
-            { "type": "Feature", "properties": { "admin": "Suriname", "name": "Suriname", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.147436489476874, 5.973149929219161], [-55.949318406789786, 5.772877915872], [-55.841779751190408, 5.953125311706059], [-55.033250291551759, 6.025291449401662], [-53.958044603070888, 5.756548163267764], [-54.478632981979224, 4.896755682795585], [-54.3995422023565, 4.212611395683466], [-54.006930508018996, 3.620037746592558], [-54.181726040246261, 3.189779771330421], [-54.269705166223183, 2.732391669115046], [-54.524754197799709, 2.311848863123785], [-55.097587449755125, 2.523748073736612], [-55.569755011605984, 2.42150625244713], [-55.973322109589361, 2.510363877773016], [-56.073341844290283, 2.220794989425499], [-55.905600145070871, 2.021995754398659], [-55.995698004771739, 1.817667141116601], [-56.53938574891454, 1.89952260986692], [-57.150097825739898, 2.768926906745406], [-57.281433478409703, 3.333491929534119], [-57.601568976457848, 3.334654649260684], [-58.044694383360664, 4.060863552258382], [-57.860209520078691, 4.576801052260449], [-57.914288906472123, 4.812626451024413], [-57.307245856339492, 5.073566595882225], [-57.147436489476874, 5.973149929219161]]] } },
-            { "type": "Feature", "properties": { "admin": "Slovakia", "name": "Slovakia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[18.85314415861361, 49.496229763377634], [18.909574822676316, 49.435845852244562], [19.320712517990469, 49.571574001659179], [19.825022820726865, 49.217125352569219], [20.415839471119849, 49.431453355499755], [20.887955356538406, 49.328772284535823], [21.607808058364206, 49.470107326854077], [22.558137648211751, 49.08573802346713], [22.280841912533553, 48.825392157580659], [22.085608351334848, 48.422264309271782], [21.872236362401729, 48.319970811550007], [20.801293979584919, 48.62385407164237], [20.473562045989862, 48.562850043321809], [20.239054396249344, 48.327567247096916], [19.769470656013109, 48.2026911484636], [19.66136355965849, 48.266614895208647], [19.174364861739885, 48.111378892603859], [18.777024773847668, 48.081768296900627], [18.696512892336923, 47.88095368101439], [17.857132602620023, 47.758428860050365], [17.488472934649813, 47.867466132186209], [16.979666782304033, 48.123497015976298], [16.879982944412998, 48.470013332709463], [16.960288120194573, 48.596982326850593], [17.101984897538895, 48.8169688991171], [17.545006951577101, 48.800019029325362], [17.886484816161808, 48.903475246773695], [17.913511590250462, 48.996492824899072], [18.104972771891848, 49.043983466175298], [18.170498488037961, 49.271514797556421], [18.399993523846174, 49.315000515330034], [18.554971144289478, 49.495015367218777], [18.85314415861361, 49.496229763377634]]] } },
-            { "type": "Feature", "properties": { "admin": "Slovenia", "name": "Slovenia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[13.806475457421524, 46.509306138691201], [14.632471551174827, 46.431817328469535], [15.137091912504982, 46.658702704447016], [16.011663852612653, 46.683610744811688], [16.202298211337361, 46.852385972676949], [16.370504998447412, 46.841327216166498], [16.564808383864854, 46.503750922219822], [15.768732944408548, 46.238108222023442], [15.671529575267552, 45.834153550797865], [15.323953891672403, 45.731782538427673], [15.327674594797424, 45.452316392593218], [14.935243767972931, 45.471695054702671], [14.595109490627804, 45.6349409043127], [14.411968214585411, 45.466165676447446], [13.715059848697221, 45.500323798192369], [13.937630242578305, 45.591015936864608], [13.698109978905475, 46.016778062517339], [13.806475457421524, 46.509306138691201]]] } },
-            { "type": "Feature", "properties": { "admin": "Sweden", "name": "Sweden", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.183173455501922, 65.723740546320158], [21.213516879977213, 65.02600535751526], [21.369631381930954, 64.413587958424273], [19.778875766690216, 63.609554348395022], [17.847779168375208, 62.749400132896803], [17.11955488451812, 61.341165676510954], [17.831346062906388, 60.636583360427394], [18.787721795332086, 60.081914374422581], [17.869224887776337, 58.95376618105869], [16.829185011470084, 58.719826972073385], [16.44770958829147, 57.041118069071871], [15.87978559740378, 56.104301866268649], [14.666681349352071, 56.20088511822216], [14.100721062891461, 55.407781073622637], [12.942910597392054, 55.361737372450563], [12.625100538797025, 56.307080186581956], [11.787942335668671, 57.441817125063061], [11.027368605196866, 58.856149400459344], [11.468271925511145, 59.432393296946024], [12.300365838274896, 60.117932847730025], [12.631146681375181, 61.293571682370121], [11.992064243221559, 61.800362453856543], [11.930569288794228, 63.128317572676963], [12.57993533697393, 64.066218980558318], [13.571916131248711, 64.049114081469696], [13.9199052263022, 64.445420640716065], [13.555689731509087, 64.7870276963815], [15.108411492582999, 66.19386688909546], [16.108712192456775, 67.302455552836875], [16.768878614985478, 68.013936672631388], [17.729181756265344, 68.010551866316263], [17.993868442464329, 68.567391262477344], [19.878559604581248, 68.407194322372561], [20.025268995857882, 69.065138658312691], [20.645592889089521, 69.106247260200846], [21.978534783626113, 68.616845608180682], [23.539473097434435, 67.936008612735236], [23.565879754335576, 66.396050930437411], [23.903378533633795, 66.006927395279604], [22.183173455501922, 65.723740546320158]]] } },
-            { "type": "Feature", "properties": { "admin": "Swaziland", "name": "Swaziland", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[32.071665480281062, -26.733820082304902], [31.868060337051073, -27.17792734142127], [31.282773064913325, -27.285879408478991], [30.685961948374477, -26.743845310169526], [30.676608514129633, -26.398078301704604], [30.949666782359905, -26.022649021104144], [31.044079624157146, -25.731452325139436], [31.333157586397899, -25.660190525008943], [31.837777947728057, -25.843331801051342], [31.985779249811962, -26.29177988048022], [32.071665480281062, -26.733820082304902]]] } },
-            { "type": "Feature", "properties": { "admin": "Syria", "name": "Syria", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[38.792340529136077, 33.378686428352218], [36.834062127435537, 32.312937526980768], [35.719918247222743, 32.709192409794859], [35.700797967274745, 32.716013698857374], [35.836396925608618, 32.868123277308506], [35.821100701650231, 33.277426459276292], [36.066460402172048, 33.824912421192543], [36.611750115715886, 34.201788641897174], [36.448194207512095, 34.59393524834406], [35.998402540843628, 34.644914048799997], [35.905023227692219, 35.410009467097318], [36.149762811026527, 35.821534735653664], [36.417550083163029, 36.040616970355053], [36.685389031731795, 36.259699205056457], [36.739494256341395, 36.817520453431079], [37.066761102045824, 36.623036200500614], [38.167727492024191, 36.901210435527766], [38.699891391765895, 36.712927354472335], [39.522580193852541, 36.716053778625984], [40.673259311695681, 37.091276353497285], [41.212089471203043, 37.074352321921687], [42.349591098811764, 37.22987254490409], [41.837064243340954, 36.605853786763568], [41.289707472505448, 36.358814602192261], [41.383965285005807, 35.628316555314349], [41.00615888851992, 34.419372260062111], [38.792340529136077, 33.378686428352218]]] } },
-            { "type": "Feature", "properties": { "admin": "Chad", "name": "Chad", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[14.495787387762899, 12.859396267137353], [14.595781284247604, 13.330426947477859], [13.954476759505607, 13.353448798063765], [13.956698846094124, 13.996691189016925], [13.540393507550785, 14.36713369390122], [13.97217, 15.68437], [15.247731154041842, 16.627305813050778], [15.300441114979716, 17.927949937405], [15.68574059414777, 19.957180080642384], [15.90324669766431, 20.387618923417499], [15.487148064850143, 20.730414537025634], [15.47106, 21.04845], [15.096887648181847, 21.308518785074902], [14.8513, 22.862950000000119], [15.86085, 23.40972], [19.84926, 21.49509], [23.837660000000135, 19.580470000000101], [23.886890000000101, 15.61084], [23.02459, 15.68072], [22.567950000000106, 14.944290000000134], [22.30351, 14.32682], [22.51202, 14.09318], [22.18329, 13.78648], [22.29658, 13.37232], [22.03759, 12.95546], [21.93681, 12.588180000000133], [22.28801, 12.64605], [22.49762, 12.26024], [22.50869, 11.67936], [22.87622, 11.384610000000119], [22.864165480244246, 11.142395127807616], [22.231129184668756, 10.971888739460608], [21.723821648859538, 10.567055568885959], [21.000868361096305, 9.475985215691479], [20.059685499764267, 9.012706000194838], [19.094008009526071, 9.074846910025768], [18.81200971850927, 8.982914536978623], [18.911021762780589, 8.630894680206435], [18.389554884523303, 8.281303615751879], [17.964929640380884, 7.890914008002992], [16.705988396886365, 7.508327541529978], [16.4561845231874, 7.734773667832938], [16.290561557691884, 7.754307359239417], [16.106231723706738, 7.497087917506461], [15.279460483469164, 7.42192454673801], [15.436091749745737, 7.692812404811887], [15.120865512765302, 8.382150173369437], [14.979995558337688, 8.796104234243442], [14.544466586981851, 8.965861314322238], [13.954218377344088, 9.549494940626685], [14.17146609869911, 10.021378282100043], [14.627200555081057, 9.920919297724591], [14.909353875394796, 9.992129421422758], [15.46787275560524, 9.982336737503543], [14.923564894275042, 10.891325181517514], [14.960151808337679, 11.555574042197234], [14.89336, 12.21905], [14.495787387762899, 12.859396267137353]]] } },
-            { "type": "Feature", "properties": { "admin": "Togo", "name": "Togo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[1.865240512712318, 6.14215770102973], [1.060121697604927, 5.928837388528875], [0.836931186536333, 6.279978745952147], [0.570384148774849, 6.914358628767188], [0.490957472342245, 7.411744289576474], [0.712029249686878, 8.312464504423827], [0.461191847342121, 8.677222601756013], [0.365900506195885, 9.46500397382948], [0.367579990245389, 10.191212876827176], [-0.049784715159944, 10.706917832883928], [0.023802524423701, 11.018681748900802], [0.899563022474069, 10.997339382364258], [0.772335646171484, 10.470808213742357], [1.077795037448737, 10.175606594275022], [1.425060662450136, 9.825395412632998], [1.46304284018467, 9.334624335157086], [1.664477573258381, 9.128590399609378], [1.618950636409238, 6.832038072126236], [1.865240512712318, 6.14215770102973]]] } },
-            { "type": "Feature", "properties": { "admin": "Thailand", "name": "Thailand", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[102.58493248902667, 12.186594956913279], [101.687157830819928, 12.645740057826568], [100.831809523524839, 12.627084865769204], [100.978467238369191, 13.412721665902563], [100.097797479251099, 13.406856390837429], [100.018732537844528, 12.307001044153353], [99.478920526123602, 10.846366685423545], [99.153772414143134, 9.963061428258554], [99.222398716226749, 9.239255479362425], [99.873831821698118, 9.207862046745118], [100.279646844486194, 8.29515289960605], [100.45927412313273, 7.429572658717175], [101.017327915452697, 6.856868597842476], [101.623079054778032, 6.740622463401918], [102.141186964936367, 6.221636053894626], [101.81428185425797, 5.810808417174242], [101.154218784593837, 5.691384182147713], [101.075515578213327, 6.20486705161592], [100.259596388756933, 6.642824815289542], [100.085756870527092, 6.46448944745029], [99.690690545655727, 6.848212795433595], [99.519641554769606, 7.343453884302759], [98.988252801512289, 7.907993068875325], [98.503786248775967, 8.382305202666286], [98.339661899816988, 7.794511623562384], [98.150009393305808, 8.350007432483876], [98.259150018306229, 8.973922837759799], [98.553550653073017, 9.932959906448543], [99.038120558673953, 10.960545762572435], [99.587286004639694, 11.892762762901695], [99.196353794351637, 12.804748439988666], [99.212011753336071, 13.269293728076462], [99.097755161538728, 13.827502549693275], [98.430819126379859, 14.622027696180831], [98.192074009191373, 15.123702500870349], [98.537375929765687, 15.308497422746081], [98.90334842325673, 16.177824204976115], [98.493761020911322, 16.837835598207928], [97.859122755934848, 17.567946071843657], [97.375896437573516, 18.445437730375811], [97.797782830804394, 18.627080389881751], [98.253723992915582, 19.708203029860041], [98.959675734454848, 19.752980658440944], [99.543309360759281, 20.186597601802056], [100.115987583417819, 20.41784963630818], [100.548881056726856, 20.109237982661124], [100.606293573003128, 19.508344427971217], [101.282014601651667, 19.462584947176762], [101.035931431077742, 18.408928330961611], [101.059547560635139, 17.512497259994486], [102.113591750092453, 18.109101670804161], [102.413004998791592, 17.932781683824281], [102.998705682387694, 17.961694647691598], [103.200192091893726, 18.309632066312769], [103.956476678485288, 18.240954087796872], [104.716947056092465, 17.428858954330078], [104.779320509868768, 16.441864935771445], [105.589038527450128, 15.570316066952856], [105.544338413517664, 14.723933620660414], [105.218776890078871, 14.27321177821069], [104.281418084736586, 14.416743068901363], [102.988422072361601, 14.225721136934464], [102.348099399833004, 13.39424734135822], [102.58493248902667, 12.186594956913279]]] } },
-            { "type": "Feature", "properties": { "admin": "Tajikistan", "name": "Tajikistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[71.014198032520156, 40.244365546218226], [70.648018833299957, 39.935753892571157], [69.559609816368507, 40.103211371412968], [69.464886915977516, 39.526683254548693], [70.549161818325601, 39.604197902986492], [71.784693637991992, 39.279463202464363], [73.67537926625478, 39.431236884105594], [73.928852166646408, 38.505815334622724], [74.257514276022718, 38.606506862943441], [74.864815708316812, 38.378846340481587], [74.829985792952087, 37.990007025701388], [74.980002475895404, 37.419990139305888], [73.948695916646486, 37.421566270490786], [73.260055779924983, 37.495256862938994], [72.636889682917271, 37.047558091778349], [72.193040805962383, 36.94828766534566], [71.84463829945058, 36.738171291646914], [71.448693475230229, 37.065644843080513], [71.541917759084768, 37.905774441065631], [71.239403924448155, 37.953265082341879], [71.348131137990251, 38.258905341132156], [70.806820509732873, 38.486281643216408], [70.376304152309274, 38.138395901027515], [70.270574171840124, 37.73516469985401], [70.116578403610319, 37.588222764632086], [69.518785434857946, 37.608996690413413], [69.196272820924364, 37.15114350030742], [68.859445835245921, 37.344335842430588], [68.135562371701369, 37.023115139304302], [67.829999627559502, 37.144994004864678], [68.392032505165943, 38.157025254868728], [68.176025018185911, 38.901553453113898], [67.442219679641298, 39.140143541005479], [67.701428664017342, 39.580478420564518], [68.536416456989414, 39.533452867178923], [69.011632928345477, 40.086158148756653], [69.329494663372813, 40.727824408524839], [70.666622348925031, 40.960213324541407], [70.458159621059608, 40.49649485937028], [70.601406691372674, 40.218527330072284], [71.014198032520156, 40.244365546218226]]] } },
-            { "type": "Feature", "properties": { "admin": "Turkmenistan", "name": "Turkmenistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[61.21081709172573, 35.650072333309218], [61.123070509694131, 36.491597194966239], [60.377637973883864, 36.52738312432836], [59.234761997316795, 37.412987982730336], [58.436154412678192, 37.522309475243794], [57.330433790928964, 38.029229437810933], [56.619366082592805, 38.121394354803478], [56.180374790273319, 37.935126654607423], [55.511578403551894, 37.964117133123153], [54.800303989486558, 37.392420762678178], [53.921597934795543, 37.198918361961255], [53.735511102112504, 37.906136176091685], [53.880928582581831, 38.952093003895349], [53.101027866432894, 39.290573635407121], [53.357808058491216, 39.975286363274442], [52.693972609269807, 40.033629055331964], [52.91525109234361, 40.87652334244472], [53.85813927594112, 40.631034450842165], [54.736845330632136, 40.951014919593455], [54.0083109881813, 41.551210842447404], [53.721713494690576, 42.123191433270016], [52.916749708880069, 41.868116563477322], [52.81468875510361, 41.135370591794704], [52.502459751196135, 41.783315538086356], [52.94429324729164, 42.116034247397586], [54.079417759014937, 42.324109402020817], [54.755345493392625, 42.04397146256656], [55.455251092353755, 41.259859117185826], [55.968191359282898, 41.308641669269356], [57.096391229079089, 41.32231008561056], [56.93221520368779, 41.82602610937559], [57.786529982337065, 42.170552883465511], [58.629010857991453, 42.751551011723045], [59.976422153569771, 42.223081976890199], [60.083340691981654, 41.425146185871391], [60.46595299667068, 41.22032664648254], [61.547178989513547, 41.2663703476546], [61.882714064384679, 41.084856879229392], [62.374260288344992, 40.053886216790382], [63.518014764261018, 39.363256537425627], [64.170223016216752, 38.892406724598231], [65.215998976507379, 38.402695013984292], [66.546150343700205, 37.974684963526855], [66.518606805288655, 37.362784328758785], [66.217384881459324, 37.393790188133913], [65.745630731066811, 37.661164048812061], [65.588947788357828, 37.305216783185628], [64.746105177677393, 37.111817735333297], [64.546479119733888, 36.31207326918426], [63.982895949158696, 36.007957465146596], [63.193538445900337, 35.857165635718907], [62.984662306576588, 35.404040839167614], [62.230651483005879, 35.270663967422287], [61.21081709172573, 35.650072333309218]]] } },
-            { "type": "Feature", "properties": { "admin": "East Timor", "name": "Timor-Leste", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[124.96868248911619, -8.892790215697081], [125.086246372580248, -8.656887302284678], [125.947072381698234, -8.432094821815033], [126.64470421763852, -8.39824675866385], [126.957243280139792, -8.273344821814396], [127.335928175974615, -8.397316582882601], [126.967991978056517, -8.668256117388891], [125.925885044458568, -9.106007175333351], [125.088520135601073, -9.393173109579292], [125.070019972840583, -9.08998748132287], [124.96868248911619, -8.892790215697081]]] } },
-            { "type": "Feature", "properties": { "admin": "Trinidad and Tobago", "name": "Trinidad and Tobago", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-61.68, 10.76], [-61.105, 10.89], [-60.895, 10.855], [-60.935, 10.11], [-61.77, 10.0], [-61.95, 10.09], [-61.66, 10.365], [-61.68, 10.76]]] } },
-            { "type": "Feature", "properties": { "admin": "Tunisia", "name": "Tunisia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[9.482139926805273, 30.307556057246181], [9.055602654668148, 32.102691962201284], [8.439102817426116, 32.506284898400814], [8.430472853233367, 32.748337307255944], [7.612641635782181, 33.344114895148955], [7.524481642292242, 34.097376410451453], [8.140981479534302, 34.655145982393783], [8.376367628623766, 35.479876003555937], [8.217824334352313, 36.433176988260271], [8.420964389691674, 36.946427313783154], [9.509993523810605, 37.349994411766531], [10.210002475636315, 37.230001735984807], [10.180650262094529, 36.724037787415071], [11.028867221733348, 37.09210317641395], [11.100025668999249, 36.899996039368908], [10.600004510143092, 36.410000108377368], [10.593286573945134, 35.947444362932806], [10.939518670300686, 35.698984076473486], [10.807847120821007, 34.833507188449182], [10.149592726287123, 34.330773016897702], [10.339658644256613, 33.785741685515312], [10.856836378633684, 33.768740139291275], [11.108500603895118, 33.293342800422188], [11.488787469131008, 33.136995754523134], [11.432253452203692, 32.368903103152867], [10.944789666394453, 32.081814683555358], [10.636901482799484, 31.761420803345747], [9.950225050505081, 31.376069647745251], [10.056575148161752, 30.961831366493595], [9.97001712407285, 30.539324856075236], [9.482139926805273, 30.307556057246181]]] } },
-            { "type": "Feature", "properties": { "admin": "Turkey", "name": "Turkey", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[36.913127068842151, 41.335358384764291], [38.347664829264502, 40.948586127275711], [39.512606642420238, 41.102762763018561], [40.373432651538245, 41.013672593747337], [41.554084100110707, 41.535656236327604], [42.619548781104548, 41.58317271581992], [43.582745802592704, 41.09214325618256], [43.752657911968491, 40.740200914058811], [43.656436395040963, 40.253563951166157], [44.400008579288759, 40.005000311842302], [44.79398969908199, 39.713002631177027], [44.109225294782355, 39.428136298168049], [44.421402622257595, 38.281281236314513], [44.225755649600522, 37.971584377589345], [44.772699008977739, 37.170444647768441], [44.293451775902852, 37.001514390606353], [43.942258742047343, 37.256227525372928], [42.77912560402185, 37.385263576805798], [42.349591098811764, 37.229872544904104], [41.212089471203015, 37.074352321921729], [40.673259311695702, 37.091276353497356], [39.522580193852512, 36.716053778626012], [38.699891391765917, 36.712927354472313], [38.167727492024156, 36.90121043552778], [37.066761102045824, 36.623036200500614], [36.739494256341366, 36.817520453431108], [36.685389031731816, 36.259699205056499], [36.417550083163086, 36.040616970355096], [36.149762811026584, 35.821534735653664], [35.782084995269848, 36.274995429014915], [36.160821567537049, 36.650605577128367], [35.550936313628334, 36.565442816711325], [34.714553256984367, 36.795532131490909], [34.026894972476455, 36.219960028623966], [32.509158156064096, 36.107563788389193], [31.69959516777956, 36.644275214172602], [30.621624790171062, 36.677864895162308], [30.391096225717114, 36.262980658506983], [29.69997562024556, 36.144357408181001], [28.732902866335387, 36.676831366516431], [27.641186557737363, 36.658822129862749], [27.048767937943289, 37.653360907536005], [26.318218214633042, 38.208133246405382], [26.804700148228726, 38.985760199533551], [26.170785353304375, 39.463612168936457], [27.280019972449388, 40.420013739578302], [28.819977654747209, 40.460011298172212], [29.240003696415574, 41.219990749672682], [31.145933872204434, 41.087621568357058], [32.347979363745786, 41.736264146484629], [33.513282911927512, 42.018960069337304], [35.167703891751863, 42.040224921225438], [36.913127068842151, 41.335358384764291]]], [[[27.192376743282406, 40.690565700842448], [26.358009067497782, 40.151993923496477], [26.043351271272535, 40.617753607743161], [26.056942172965332, 40.824123440100735], [26.294602085075692, 40.936261298174166], [26.604195590936282, 41.562114569661013], [26.117041863720825, 41.826904608724554], [27.135739373490505, 42.141484890301307], [27.996720411905407, 42.007358710287768], [28.115524529744441, 41.622886054036279], [28.988442824018779, 41.299934190428175], [28.806438429486743, 41.05496206314853], [27.619017368284112, 40.999823309893102], [27.192376743282406, 40.690565700842448]]]] } },
-            { "type": "Feature", "properties": { "admin": "Taiwan", "name": "Taiwan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[121.777817824389899, 24.394273586519393], [121.175632358892713, 22.790857245367164], [120.747079705896198, 21.970571397382106], [120.220083449383651, 22.814860948166732], [120.106188592612369, 23.556262722258229], [120.694679803552233, 24.53845083261373], [121.49504438688875, 25.295458889257379], [121.951243931161429, 24.997595933527034], [121.777817824389899, 24.394273586519393]]] } },
-            { "type": "Feature", "properties": { "admin": "United Republic of Tanzania", "name": "Tanzania", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.903711197104592, -0.95], [34.07262, -1.05982], [37.69869, -3.09699], [37.7669, -3.67712], [39.20222, -4.67677], [38.74054, -5.90895], [38.79977, -6.47566], [39.44, -6.84], [39.470000000000134, -7.1], [39.19469, -7.7039], [39.25203, -8.00781], [39.18652, -8.48551], [39.53574, -9.112369999999883], [39.9496, -10.0984], [40.31659, -10.317099999999867], [39.521, -10.89688], [38.427556593587767, -11.285202325081626], [37.82764, -11.26879], [37.47129, -11.56876], [36.775150994622884, -11.59453744878078], [36.514081658684397, -11.720938002166745], [35.312397902169145, -11.439146416879165], [34.559989047999451, -11.520020033415845], [34.28, -10.16], [33.940837724096518, -9.693673841980283], [33.73972, -9.41715], [32.759375441221373, -9.230599053589001], [32.191864861791935, -8.930358981973255], [31.556348097466628, -8.762048841998647], [31.157751336950064, -8.594578747317312], [30.74, -8.34], [30.2, -7.08], [29.62, -6.52], [29.419992710088305, -5.939998874539297], [29.519986606573063, -5.419978936386257], [29.339997592900367, -4.499983412294113], [29.753512404099858, -4.452389418153301], [30.11632, -4.09012], [30.50554, -3.56858], [30.75224, -3.35931], [30.74301, -3.03431], [30.52766, -2.80762], [30.46967, -2.41383], [30.758308953583132, -2.287250257988375], [30.816134881317844, -1.698914076345374], [30.419104852019291, -1.134659112150416], [30.769860000000101, -1.01455], [31.86617, -1.02736], [33.903711197104592, -0.95]]] } },
-            { "type": "Feature", "properties": { "admin": "Uganda", "name": "Uganda", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.86617, -1.02736], [30.769860000000101, -1.01455], [30.419104852019291, -1.134659112150416], [29.821518588996121, -1.443322442229771], [29.579466180141019, -1.341313164885605], [29.587837762172164, -0.587405694179381], [29.8195, -0.2053], [29.875778842902431, 0.597379868976361], [30.086153598762785, 1.062312730306416], [30.468507521290285, 1.583805446779706], [30.852670118948133, 1.849396470543752], [31.174149204235952, 2.204465236821306], [30.77332, 2.339890000000139], [30.83385, 3.50917], [31.24556, 3.7819], [31.88145, 3.55827], [32.68642, 3.79232], [33.39, 3.79], [34.005, 4.249884947362147], [34.47913, 3.5556], [34.59607, 3.053740000000118], [35.03599, 1.90584], [34.6721, 1.17694], [34.18, 0.515], [33.893568969666994, 0.109813537861839], [33.903711197104592, -0.95], [31.86617, -1.02736]]] } },
-            { "type": "Feature", "properties": { "admin": "Ukraine", "name": "Ukraine", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[31.78599816257158, 52.10167796488544], [32.159412062312661, 52.061266994833204], [32.412058139787625, 52.288694973349735], [32.715760532366964, 52.238465481162038], [33.7526998227357, 52.335074571331681], [34.391730584457001, 51.768881740925778], [34.141978387190385, 51.566413479206226], [34.22481570815426, 51.255993150428942], [35.022183058417873, 51.207572333371445], [35.377923618315116, 50.773955390010343], [35.35611616388794, 50.577197374059054], [36.62616784032533, 50.225590928745127], [37.393459506995065, 50.383953355503586], [38.01063113785689, 49.915661526074622], [38.59498823421341, 49.926461900423618], [40.069058465339097, 49.601055406281688], [40.080789015469342, 49.307429917999272], [39.674663934087526, 48.783818467801872], [39.895632358567575, 48.232405097031425], [39.738277622238819, 47.898937079451983], [38.770584751141186, 47.825608222029807], [38.255112339029743, 47.546400458356807], [38.223538038899413, 47.102189846375872], [37.42513715998998, 47.022220567404197], [36.759854770664383, 46.698700263040919], [35.823684523264816, 46.645964463887054], [34.962341749823871, 46.273196519549636], [35.020787794745978, 45.65121898048465], [35.51000857925316, 45.409993394546177], [36.529997999830151, 45.46998973243705], [36.334712762199146, 45.113215643893952], [35.239999220528112, 44.939996242851599], [33.882511020652878, 44.361478583344066], [33.326420932760037, 44.564877020844875], [33.546924269349446, 45.034770819674883], [32.454174432105496, 45.327466132176063], [32.630804477679128, 45.519185695978905], [33.588162062318382, 45.851568508480227], [33.298567335754704, 46.08059845639783], [31.744140252415171, 46.333347886737378], [31.675307244602401, 46.706245022155528], [30.748748813609094, 46.583100084003995], [30.37760867688888, 46.032410183285663], [29.603289015427425, 45.293308010431119], [29.149724969201646, 45.464925442072442], [28.679779493939371, 45.30403087013169], [28.233553501099035, 45.488283189468369], [28.48526940279276, 45.596907050145887], [28.659987420371575, 45.939986884131628], [28.933717482221621, 46.258830471372491], [28.862972446414055, 46.437889309263824], [29.072106967899288, 46.517677720722482], [29.170653924279879, 46.379262396828693], [29.759971958136383, 46.349987697935354], [30.024658644335364, 46.423936672545032], [29.838210076626289, 46.525325832701675], [29.908851759569295, 46.67436066343145], [29.559674106573105, 46.928582872091312], [29.415135125452732, 47.346645209332571], [29.050867954227321, 47.510226955752493], [29.122698195113024, 47.849095160506458], [28.670891147585163, 48.118148505234089], [28.259546746541837, 48.155562242213406], [27.52253746919515, 48.467119452501102], [26.857823520624798, 48.368210761094488], [26.619336785597788, 48.220726223333457], [26.197450392366925, 48.220881252630342], [25.945941196402394, 47.987148749374207], [25.207743361112986, 47.891056423527459], [24.866317172960571, 47.737525743188307], [24.402056105250374, 47.981877753280422], [23.760958286237404, 47.985598456405448], [23.142236362406798, 48.096341050806942], [22.710531447040488, 47.882193915389394], [22.640819939878746, 48.150239569687351], [22.085608351334848, 48.422264309271782], [22.280841912533553, 48.825392157580659], [22.558137648211751, 49.08573802346713], [22.776418898212619, 49.027395331409608], [22.518450148211596, 49.476773586619736], [23.426508416444388, 50.308505764357449], [23.922757195743259, 50.424881089878738], [24.029985792748899, 50.705406602575174], [23.52707075368437, 51.578454087930233], [24.005077752384206, 51.617443956094448], [24.553106316839511, 51.888461005249177], [25.327787713327005, 51.910656032918538], [26.337958611768549, 51.832288723347915], [27.454066196408426, 51.59230337178446], [28.241615024536564, 51.572227077839059], [28.617612745892242, 51.427713934934836], [28.992835320763522, 51.602044379271462], [29.254938185347921, 51.368234361366881], [30.157363722460889, 51.416138414101454], [30.55511722181145, 51.319503485715643], [30.619454380014837, 51.822806098022362], [30.927549269338975, 52.042353420614383], [31.78599816257158, 52.10167796488544]]] } },
-            { "type": "Feature", "properties": { "admin": "Uruguay", "name": "Uruguay", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.625133429582945, -30.216294854454258], [-56.976025763564721, -30.109686374636119], [-55.97324459494093, -30.883075860316296], [-55.601510179249331, -30.853878676071385], [-54.572451544805105, -31.494511407193745], [-53.787951626182185, -32.047242526987617], [-53.209588995971529, -32.727666110974717], [-53.650543992718084, -33.202004082981823], [-53.373661668498229, -33.768377780900757], [-53.806425950726521, -34.396814874002224], [-54.935866054897716, -34.952646579733617], [-55.674089728403274, -34.752658786764066], [-56.215297003796053, -34.85983570733741], [-57.139685024633096, -34.430456231424238], [-57.817860683815489, -34.462547295877492], [-58.427074144104381, -33.909454441057569], [-58.349611172098854, -33.2631889788154], [-58.132647671121433, -33.040566908502008], [-58.142440355040748, -32.044503676076147], [-57.874937303281875, -31.016556084926201], [-57.625133429582945, -30.216294854454258]]] } },
-            { "type": "Feature", "properties": { "admin": "United States of America", "name": "United States", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-155.54211, 19.08348], [-155.68817, 18.91619], [-155.93665, 19.05939], [-155.90806, 19.33888], [-156.07347, 19.70294], [-156.02368, 19.81422], [-155.85008, 19.97729], [-155.91907, 20.17395], [-155.86108, 20.26721], [-155.78505, 20.2487], [-155.40214, 20.07975], [-155.22452, 19.99302], [-155.06226, 19.8591], [-154.80741, 19.50871], [-154.83147, 19.45328], [-155.222169999999892, 19.23972], [-155.54211, 19.08348]]], [[[-156.07926, 20.64397], [-156.41445, 20.57241], [-156.58673, 20.783], [-156.70167, 20.8643], [-156.71055, 20.92676], [-156.61258, 21.01249], [-156.25711, 20.91745], [-155.99566, 20.76404], [-156.07926, 20.64397]]], [[[-156.75824, 21.17684], [-156.78933, 21.06873], [-157.32521, 21.09777], [-157.25027, 21.21958], [-156.75824, 21.17684]]], [[[-157.65283, 21.32217], [-157.70703, 21.26442], [-157.7786, 21.27729], [-158.12667, 21.31244], [-158.2538, 21.53919], [-158.29265, 21.57912], [-158.0252, 21.71696], [-157.94161, 21.65272], [-157.65283, 21.32217]]], [[[-159.34512, 21.982], [-159.46372, 21.88299], [-159.80051, 22.06533], [-159.74877, 22.1382], [-159.5962, 22.23618], [-159.36569, 22.21494], [-159.34512, 21.982]]], [[[-94.81758, 49.38905], [-94.639999999999858, 48.840000000000103], [-94.32914, 48.67074], [-93.63087, 48.60926], [-92.61, 48.45], [-91.64, 48.14], [-90.829999999999856, 48.27], [-89.6, 48.01], [-89.272917446636654, 48.019808254582834], [-88.378114183286513, 48.302917588893806], [-87.439792623300207, 47.94], [-86.461990831228135, 47.553338019392037], [-85.652363247403215, 47.220218817730498], [-84.876079881514855, 46.900083319682366], [-84.779238247399817, 46.637101955749117], [-84.54374874544564, 46.538684190449224], [-84.6049, 46.4396], [-84.3367, 46.408770000000104], [-84.142119513673279, 46.512225857115723], [-84.091851264161463, 46.275418606138253], [-83.890765347005654, 46.116926988299149], [-83.616130947590491, 46.116926988299149], [-83.469550747394621, 45.994686387712584], [-83.592850714843067, 45.816893622412543], [-82.550924648758169, 45.347516587905446], [-82.337763125431053, 44.44], [-82.137642381503952, 43.571087551439987], [-82.43, 42.98], [-82.899999999999878, 42.430000000000135], [-83.119999999999877, 42.08], [-83.141999681312555, 41.975681057292995], [-83.029810146806909, 41.832795722005997], [-82.690089280920162, 41.675105088867319], [-82.439277716791608, 41.675105088867319], [-81.277746548167059, 42.209025987306845], [-80.247447679347843, 42.36619985612267], [-78.939362148743683, 42.863611355148116], [-78.92, 42.965], [-79.009999999999863, 43.27], [-79.171673550111862, 43.466339423184301], [-78.720279914042365, 43.625089423184953], [-77.737885097957601, 43.629055589363382], [-76.820034145805565, 43.628784288093748], [-76.5, 44.018458893758599], [-76.375, 44.09631], [-75.31821, 44.81645000000016], [-74.867, 45.00048000000011], [-73.347829999999874, 45.00738], [-71.505059999999858, 45.0082], [-71.405, 45.255000000000123], [-71.08482, 45.305240000000154], [-70.659999999999783, 45.46], [-70.305, 45.915], [-69.99997, 46.69307], [-69.237216, 47.447781], [-68.905, 47.185], [-68.23444, 47.35486], [-67.79046, 47.06636], [-67.79134, 45.702810000000134], [-67.13741, 45.13753], [-66.96466, 44.809700000000149], [-68.03252, 44.3252], [-69.059999999999874, 43.98], [-70.116169999999897, 43.684050000000141], [-70.645475633410967, 43.090238348964043], [-70.81489, 42.8653], [-70.825, 42.335], [-70.494999999999891, 41.805], [-70.08, 41.78], [-70.185, 42.145], [-69.88497, 41.922830000000111], [-69.96503, 41.637170000000161], [-70.64, 41.475], [-71.12039, 41.494450000000164], [-71.859999999999829, 41.32], [-72.295, 41.27], [-72.87643, 41.22065], [-73.71, 40.931102351654481], [-72.24126, 41.119480000000138], [-71.944999999999808, 40.93], [-73.345, 40.63], [-73.982, 40.628], [-73.952325, 40.75075], [-74.25671, 40.47351], [-73.96244, 40.42763], [-74.17838, 39.70926], [-74.90604, 38.93954], [-74.98041, 39.1964], [-75.20002, 39.24845], [-75.52805, 39.4985], [-75.32, 38.96], [-75.071834764789784, 38.782032230179276], [-75.05673, 38.404120000000106], [-75.37747, 38.01551], [-75.94023, 37.21689], [-76.03127, 37.2566], [-75.722049999999783, 37.937050000000106], [-76.23287, 38.319215], [-76.35, 39.15], [-76.542725, 38.717615], [-76.32933, 38.08326], [-76.98999793161353, 38.239991766913384], [-76.301619999999886, 37.917945], [-76.25874, 36.9664000000001], [-75.9718, 36.89726], [-75.868039999999809, 36.55125], [-75.72749, 35.550740000000125], [-76.36318, 34.808540000000129], [-77.39763499999988, 34.51201], [-78.05496, 33.92547], [-78.554349999999815, 33.861330000000116], [-79.06067, 33.49395], [-79.20357, 33.15839], [-80.301325, 32.509355], [-80.86498, 32.0333], [-81.33629, 31.44049], [-81.49042, 30.729990000000122], [-81.31371, 30.03552], [-80.98, 29.18000000000011], [-80.53558499999987, 28.47213], [-80.529999999999774, 28.04], [-80.056539284977532, 26.88000000000013], [-80.088015, 26.205765], [-80.131559999999837, 25.816775], [-80.38103, 25.20616], [-80.679999999999879, 25.08], [-81.17213, 25.201260000000126], [-81.33, 25.64], [-81.709999999999795, 25.87], [-82.239999999999895, 26.730000000000125], [-82.70515, 27.49504], [-82.85526, 27.88624], [-82.65, 28.550000000000146], [-82.929999999999865, 29.100000000000129], [-83.70959, 29.93656], [-84.1, 30.090000000000114], [-85.10882, 29.63615], [-85.28784, 29.686120000000127], [-85.7731, 30.152610000000116], [-86.399999999999878, 30.400000000000112], [-87.530359999999831, 30.27433], [-88.41782, 30.3849], [-89.180489999999836, 30.31598], [-89.593831178419748, 30.159994004836843], [-89.413735, 29.89419], [-89.43, 29.48864], [-89.21767, 29.29108], [-89.40823, 29.15961], [-89.77928, 29.307140000000135], [-90.15463, 29.11743], [-90.880224999999896, 29.148535000000116], [-91.626784999999842, 29.677000000000127], [-92.49906, 29.5523], [-93.22637, 29.78375], [-93.84842, 29.71363], [-94.69, 29.480000000000125], [-95.60026, 28.73863], [-96.59404, 28.30748], [-97.139999999999802, 27.83], [-97.37, 27.38], [-97.379999999999853, 26.69], [-97.33, 26.210000000000115], [-97.139999999999802, 25.87], [-97.529999999999859, 25.84], [-98.239999999999895, 26.060000000000109], [-99.019999999999854, 26.37], [-99.3, 26.84], [-99.52, 27.54], [-100.11, 28.11000000000012], [-100.45584, 28.696120000000118], [-100.957599999999886, 29.380710000000125], [-101.6624, 29.779300000000113], [-102.48, 29.76], [-103.11, 28.97], [-103.94, 29.27], [-104.456969999999814, 29.57196], [-104.705749999999895, 30.12173], [-105.03737, 30.64402], [-105.63159, 31.083830000000113], [-106.1429, 31.39995], [-106.507589999999794, 31.75452], [-108.24, 31.754853718166398], [-108.24194, 31.34222], [-109.035, 31.341940000000161], [-111.02361, 31.33472], [-113.30498, 32.03914], [-114.815, 32.52528], [-114.721389999999829, 32.72083], [-115.991349999999869, 32.61239000000014], [-117.127759999999753, 32.53534], [-117.295937691273863, 33.04622461520389], [-117.944, 33.621236431201389], [-118.410602275897475, 33.740909223124497], [-118.519894822799685, 34.027781577575745], [-119.081, 34.078], [-119.438840642016658, 34.348477178284291], [-120.36778, 34.44711], [-120.62286, 34.60855], [-120.74433, 35.156860000000101], [-121.714569999999853, 36.16153], [-122.54747, 37.551760000000101], [-122.51201, 37.783390000000132], [-122.95319, 38.113710000000104], [-123.7272, 38.951660000000111], [-123.865169999999878, 39.766990000000128], [-124.39807, 40.3132], [-124.17886, 41.142020000000109], [-124.2137, 41.999640000000134], [-124.532839999999894, 42.76599], [-124.14214, 43.70838], [-124.020535, 44.615895], [-123.898929999999893, 45.52341], [-124.079635, 46.86475], [-124.395669999999896, 47.72017], [-124.687210083007812, 48.184432983398537], [-124.566101074218736, 48.379714965820384], [-123.12, 48.04], [-122.587359999999876, 47.096], [-122.34, 47.36], [-122.5, 48.18], [-122.84, 49.0], [-120.0, 49.0], [-117.03121, 49.0], [-116.04818, 49.0], [-112.999999999999872, 49.0], [-110.049999999999812, 49.0], [-107.049999999999898, 49.0], [-104.04826, 48.99986], [-100.65, 49.0], [-97.228720000004699, 49.0007], [-95.159069509171943, 49.0], [-95.15609, 49.38425], [-94.81758, 49.38905]]], [[[-153.006314053336837, 57.115842190165878], [-154.0050902984581, 56.734676825581047], [-154.516402757770067, 56.992748928446687], [-154.670992804971092, 57.461195787172493], [-153.762779507441451, 57.816574612043773], [-153.228729417921073, 57.968968410872421], [-152.564790615835108, 57.901427313866961], [-152.141147223906273, 57.591058661521977], [-153.006314053336837, 57.115842190165878]]], [[[-165.579164191733554, 59.909986884187539], [-166.192770148767238, 59.754440822988961], [-166.848337368821944, 59.941406155020942], [-167.455277066090048, 60.213069159579376], [-166.467792121424566, 60.384169826897775], [-165.674429694663644, 60.293606879306232], [-165.579164191733554, 59.909986884187539]]], [[[-171.731656867539357, 63.782515367275906], [-171.114433560245175, 63.592191067144981], [-170.491112433940657, 63.694975490973505], [-169.682505459653555, 63.431115627691142], [-168.689439460300662, 63.297506212000584], [-168.77194088445458, 63.188598130945437], [-169.529439867204985, 62.976931464277882], [-170.290556200215917, 63.194437567794452], [-170.671385667990847, 63.375821845138965], [-171.553063117538642, 63.317789211675077], [-171.791110602891166, 63.40584585230048], [-171.731656867539357, 63.782515367275906]]], [[[-155.067790290324211, 71.147776394323685], [-154.344165208941206, 70.696408596470192], [-153.900006273392563, 70.889988511835682], [-152.210006069935275, 70.829992173944831], [-152.270002407826127, 70.60000621202984], [-150.739992438744508, 70.430016588005699], [-149.720003018167489, 70.530010484490433], [-147.613361579357047, 70.214034939241785], [-145.689989800225248, 70.120009670686741], [-144.920010959076393, 69.989991767040479], [-143.58944618042517, 70.152514146598307], [-142.072510348713365, 69.851938178172631], [-140.985987521560702, 69.711998399526365], [-140.985988329004869, 69.711998399526365], [-140.992498752029377, 66.000028591568665], [-140.997769748123119, 60.306396796298593], [-140.012997816153074, 60.276837877027575], [-139.03900042031583, 60.000007229240012], [-138.340889999999888, 59.562110000000146], [-137.4525, 58.905000000000101], [-136.47972, 59.46389], [-135.47583, 59.78778], [-134.945, 59.270560000000117], [-134.27111, 58.86111], [-133.355548882207188, 58.410285142645151], [-132.73042, 57.692890000000105], [-131.707809999999853, 56.55212], [-130.00778, 55.91583], [-129.979994263358265, 55.284997870497207], [-130.536110189467223, 54.802753404349389], [-131.08581823797212, 55.178906155002025], [-131.967211467142278, 55.497775580459049], [-132.250010742859445, 56.369996242897443], [-133.539181084356386, 57.178887437562125], [-134.07806292029602, 58.123067531966889], [-135.038211032279037, 58.187714748763931], [-136.628062309954629, 58.212209377670447], [-137.800006279686016, 58.499995429103777], [-139.867787041412981, 59.537761542389134], [-140.825273817133024, 59.72751740176507], [-142.574443535564427, 60.084446519604981], [-143.958880994879848, 59.99918040632339], [-145.925556816827822, 60.458609727614274], [-147.114373949146625, 60.884656073644628], [-148.224306200127643, 60.672989406977152], [-148.018065558850736, 59.978328965893631], [-148.570822516860858, 59.914172675203297], [-149.727857835875824, 59.705658270905545], [-150.608243374616421, 59.368211168039487], [-151.716392788683294, 59.155821031319974], [-151.859433153267105, 59.74498403587959], [-151.40971900124714, 60.725802720779392], [-150.346941494732505, 61.033587551509854], [-150.621110806256951, 61.284424953854447], [-151.895839199816834, 60.727197984451273], [-152.578329841095581, 60.061657212964285], [-154.019172126257558, 59.350279446034264], [-153.287511359653166, 58.864727688219787], [-154.232492438758442, 58.146373602930531], [-155.307491421510207, 57.727794501366319], [-156.308334723923082, 57.422774359763636], [-156.556097378546298, 56.979984849670636], [-158.117216559867728, 56.463608099994175], [-158.433321296197136, 55.994153550838533], [-159.603327399717415, 55.566686102920116], [-160.289719611634183, 55.643580634170561], [-161.223047655257773, 55.364734605523481], [-162.23776607974105, 55.024186916720097], [-163.069446581046378, 54.689737046927171], [-164.785569221027174, 54.40417308208216], [-164.942226325520011, 54.572224839895327], [-163.84833960676562, 55.039431464246107], [-162.870001390615897, 55.348043117893198], [-161.804174974596009, 55.894986477270429], [-160.563604702781134, 56.008054511125025], [-160.070559862284483, 56.418055324928744], [-158.684442918919416, 57.016675116597852], [-158.461097378553944, 57.216921291728866], [-157.722770352183858, 57.570000515363056], [-157.550274421193564, 58.328326321030218], [-157.041674974576949, 58.918884589261708], [-158.194731208305427, 58.615802313869828], [-158.517217984023034, 58.787781480537305], [-159.058606126928709, 58.424186102931671], [-159.711667040017318, 58.931390285876333], [-159.981288825500144, 58.572549140041623], [-160.355271165996498, 59.071123358793628], [-161.355003425115001, 58.670837714260742], [-161.968893602526293, 58.671664537177371], [-162.054986538724648, 59.266925360747436], [-161.874170702135331, 59.633621324290587], [-162.518059048492034, 59.989723619213905], [-163.818341437820123, 59.798055731843377], [-164.662217577146407, 60.267484442782639], [-165.346387702474772, 60.507495632562396], [-165.350831875651835, 61.073895168697497], [-166.121379157555907, 61.500019029376212], [-165.734451870770471, 62.074996853271792], [-164.919178636717788, 62.633076483807919], [-164.562507901039339, 63.146378485763044], [-163.753332485996964, 63.219448961023758], [-163.067224494457832, 63.05945872664801], [-162.260555386381697, 63.541935736741159], [-161.534449836248569, 63.455816962326757], [-160.772506680321101, 63.76610810002326], [-160.958335130842528, 64.222798570402759], [-161.518068407212184, 64.402787584075313], [-160.777777676414729, 64.788603827566405], [-161.391926235987597, 64.777235012462327], [-162.453050096668818, 64.559444688568206], [-162.757786017894034, 64.338605455168803], [-163.54639421288428, 64.559160468190484], [-164.960829841145141, 64.446945095468848], [-166.425288255864473, 64.686672064870706], [-166.845004238939026, 65.088895575614529], [-168.110560065767146, 65.669997056736733], [-166.70527116602193, 66.088317776139391], [-164.474709642575448, 66.576660061297488], [-163.652511766595637, 66.576660061297488], [-163.788601651036117, 66.077207343196662], [-161.677774421210131, 66.116119696712403], [-162.489714525379981, 66.735565090595102], [-163.719716966791083, 67.116394558370089], [-164.430991380856511, 67.616338202577779], [-165.390286831706703, 68.042772121850234], [-166.764440680995989, 68.35887685817967], [-166.204707404626561, 68.883030910916162], [-164.430810513343431, 68.915535386827727], [-163.168613654614489, 69.371114813912882], [-162.930566169261965, 69.858061835399255], [-161.908897264635499, 70.333329983187625], [-160.93479651593367, 70.447689927849567], [-159.039175788387126, 70.891642157668926], [-158.119722866833939, 70.824721177851032], [-156.580824551398024, 71.357763576941736], [-155.067790290324211, 71.147776394323685]]]] } },
-            { "type": "Feature", "properties": { "admin": "Uzbekistan", "name": "Uzbekistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[66.518606805288655, 37.362784328758785], [66.546150343700205, 37.974684963526855], [65.215998976507379, 38.402695013984292], [64.170223016216752, 38.892406724598231], [63.518014764261018, 39.363256537425627], [62.374260288344992, 40.053886216790382], [61.882714064384679, 41.084856879229392], [61.547178989513547, 41.2663703476546], [60.46595299667068, 41.22032664648254], [60.083340691981654, 41.425146185871391], [59.976422153569771, 42.223081976890199], [58.629010857991453, 42.751551011723045], [57.786529982337065, 42.170552883465511], [56.93221520368779, 41.82602610937559], [57.096391229079089, 41.32231008561056], [55.968191359282898, 41.308641669269356], [55.928917270741081, 44.995858466159099], [58.503127068928457, 45.586804307632818], [58.689989048095882, 45.500013739598621], [60.239971958258316, 44.784036770194717], [61.05831994003244, 44.405816962250505], [62.013300408786236, 43.504476630215642], [63.185786981056559, 43.650074978197999], [64.900824415959264, 43.728080552742576], [66.098012322865074, 42.997660020513088], [66.023391554635609, 41.994646307943974], [66.510648634715707, 41.987644151368436], [66.714047072216502, 41.168443508461493], [67.985855747351806, 41.135990708982213], [68.259895867795606, 40.662324530594894], [68.632482944620008, 40.668680731766798], [69.070027296835306, 41.384244289712363], [70.388964878220776, 42.081307684897439], [70.96231489449913, 42.266154283205481], [71.259247674448218, 42.167710679689456], [70.420022414028196, 41.519998277343134], [71.157858514291576, 41.143587144529107], [71.870114780570447, 41.392900092121259], [73.055417108049156, 40.86603302668945], [71.774875115856545, 40.145844428053763], [71.014198032520156, 40.244365546218226], [70.601406691372674, 40.218527330072284], [70.458159621059608, 40.49649485937028], [70.666622348925031, 40.960213324541407], [69.329494663372813, 40.727824408524839], [69.011632928345477, 40.086158148756653], [68.536416456989414, 39.533452867178923], [67.701428664017342, 39.580478420564518], [67.442219679641298, 39.140143541005479], [68.176025018185911, 38.901553453113898], [68.392032505165943, 38.157025254868728], [67.829999627559502, 37.144994004864678], [67.075782098259609, 37.35614390720928], [66.518606805288655, 37.362784328758785]]] } },
-            { "type": "Feature", "properties": { "admin": "Venezuela", "name": "Venezuela", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-71.331583624950284, 11.776284084515805], [-71.36000566271079, 11.53999359786121], [-71.947049933546495, 11.423282375530018], [-71.620868292920164, 10.969459947142791], [-71.633063930941063, 10.446494452349027], [-72.074173956984495, 9.865651353388369], [-71.695644090446521, 9.072263088411246], [-71.26455929226772, 9.137194525585981], [-71.039999355743376, 9.859992784052407], [-71.350083787710773, 10.211935126176213], [-71.400623338492224, 10.968969021036013], [-70.155298834906503, 11.375481675660039], [-70.293843349881016, 11.846822414594211], [-69.943244594996813, 12.162307033736095], [-69.584300096297454, 11.459610907431211], [-68.882999233664435, 11.44338450769156], [-68.233271450458716, 10.885744126829945], [-68.194126552997616, 10.554653225135921], [-67.296248541926317, 10.545868231646306], [-66.227864142507983, 10.648626817258684], [-65.655237596281737, 10.20079885501732], [-64.890452236578156, 10.077214667191296], [-64.329478725833724, 10.389598700395679], [-64.318006557864933, 10.641417954953978], [-63.079322475828725, 10.701724351438598], [-61.880946010980182, 10.7156253117251], [-62.730118984616396, 10.420268662960904], [-62.388511928950969, 9.948204453974636], [-61.588767462801918, 9.873066921422263], [-60.830596686431711, 9.38133982994894], [-60.671252407459718, 8.580174261911877], [-60.150095587796166, 8.602756862823425], [-59.758284878159181, 8.367034816924045], [-60.550587938058186, 7.779602972846178], [-60.637972785063752, 7.414999904810853], [-60.295668097562377, 7.043911444522918], [-60.543999192940966, 6.856584377464881], [-61.159336310456467, 6.696077378766317], [-61.139415045807937, 6.234296779806142], [-61.410302903881941, 5.959068101419616], [-60.733574184803707, 5.2002772078619], [-60.601179165271922, 4.918098049332129], [-60.966893276601517, 4.536467596856638], [-62.085429653559125, 4.162123521334308], [-62.804533047116692, 4.006965033377951], [-63.093197597899092, 3.770571193858784], [-63.888342861574145, 4.020530096854571], [-64.628659430587533, 4.14848094320925], [-64.816064012294007, 4.056445217297422], [-64.368494432214092, 3.797210394705246], [-64.408827887617903, 3.126786200366623], [-64.269999152265783, 2.497005520025566], [-63.422867397705105, 2.411067613124174], [-63.368788011311644, 2.200899562993129], [-64.083085496666072, 1.91636912679408], [-64.199305792890499, 1.49285492594602], [-64.611011928959854, 1.328730576987041], [-65.354713304288353, 1.0952822941085], [-65.548267381437554, 0.78925446207603], [-66.325765143484944, 0.724452215982012], [-66.876325853122566, 1.253360500489336], [-67.181294318293041, 2.250638129074062], [-67.447092047786299, 2.600280869960869], [-67.809938117123693, 2.820655015469569], [-67.303173183853417, 3.31845408773718], [-67.33756384954367, 3.542342230641721], [-67.621835903581271, 3.839481716319994], [-67.823012254493534, 4.503937282728898], [-67.744696621355203, 5.221128648291667], [-67.521531948502741, 5.556870428891968], [-67.34143958196556, 6.095468044454021], [-67.695087246355001, 6.267318020040645], [-68.265052456318216, 6.153268133972473], [-68.985318569602327, 6.206804917826856], [-69.389479946557103, 6.099860541198835], [-70.093312954372408, 6.960376491723109], [-70.674233567981503, 7.087784735538717], [-71.960175747348629, 6.991614895043538], [-72.19835242378187, 7.340430813013682], [-72.444487270788059, 7.42378489830048], [-72.479678921178831, 7.632506008327352], [-72.360900641555958, 8.002638454617893], [-72.439862230097944, 8.405275376820027], [-72.660494757768092, 8.62528778730268], [-72.788729824500379, 9.085027167187331], [-73.304951544880026, 9.151999823437604], [-73.027604132769554, 9.736770331252441], [-72.905286017534692, 10.45034434655477], [-72.614657762325194, 10.821975409381777], [-72.227575446242923, 11.108702093953237], [-71.973921678338272, 11.608671576377116], [-71.331583624950284, 11.776284084515805]]] } },
-            { "type": "Feature", "properties": { "admin": "Vietnam", "name": "Vietnam", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[108.050180291782908, 21.552379869060111], [106.715067987090066, 20.696850694252014], [105.881682163519002, 19.752050482659694], [105.662005649846279, 19.058165188060567], [106.426816847765991, 18.004120998603224], [107.36195356651973, 16.697456569887049], [108.269495070429599, 16.079742336486145], [108.877106561317447, 15.276690578670436], [109.335269810017209, 13.42602834721772], [109.200135939573954, 11.666859239137761], [108.366129998815424, 11.00832062422627], [107.22092858279521, 10.36448395430183], [106.4051127462034, 9.530839748569317], [105.158263787865081, 8.599759629750492], [104.795185174582372, 9.2410383162765], [105.076201613385592, 9.918490505406806], [104.334334751403446, 10.486543687375228], [105.199914992292321, 10.889309800658094], [106.249670037869436, 10.961811835163585], [105.810523716253101, 11.567614650921225], [107.491403029410861, 12.337205918827944], [107.614547967562402, 13.535530707244202], [107.382727492301058, 14.202440904186968], [107.564525181103875, 15.202173163305554], [107.312705926545576, 15.908538316303177], [106.55600792849566, 16.604283962464802], [105.925762160264, 17.485315456608955], [105.094598423281496, 18.666974595611073], [103.896532017026701, 19.265180975821799], [104.183387892678908, 19.624668077060214], [104.822573683697073, 19.886641750563879], [104.435000441508024, 20.758733221921528], [103.203861118586431, 20.766562201413745], [102.754896274834636, 21.675137233969462], [102.170435825613552, 22.464753119389297], [102.706992222100084, 22.708795070887668], [103.504514601660546, 22.703756618739202], [104.476858351664447, 22.819150092046961], [105.329209425886603, 23.352063300056908], [105.811247186305209, 22.976892401617899], [106.725403273548451, 22.794267889898414], [106.567273390735295, 22.218204860924768], [107.043420037872608, 21.811898912029907], [108.050180291782908, 21.552379869060111]]] } },
-            { "type": "Feature", "properties": { "admin": "Vanuatu", "name": "Vanuatu", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[167.844876743845077, -16.466333103097153], [167.515181105822847, -16.597849623279966], [167.180007765977791, -16.159995212470957], [167.2168013857696, -15.891846205308449], [167.844876743845077, -16.466333103097153]]], [[[167.107712437201485, -14.933920179913951], [167.2700281110302, -15.74002084723487], [167.001207310247935, -15.614602146062492], [166.79315799384085, -15.668810723536719], [166.649859247095549, -15.392703545801192], [166.629136997746429, -14.6264970842096], [167.107712437201485, -14.933920179913951]]]] } },
-            { "type": "Feature", "properties": { "admin": "Yemen", "name": "Yemen", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[53.108572625547502, 16.651051133688949], [52.385205926325874, 16.38241120041965], [52.191729363825075, 15.938433132384018], [52.168164910699986, 15.597420355689945], [51.172515089732471, 15.175249742081489], [49.574576450403136, 14.708766587782746], [48.679230584514151, 14.003202419485657], [48.238947381387412, 13.948089504446369], [47.938914015500771, 14.007233181204423], [47.354453566279702, 13.592219753468379], [46.71707645039173, 13.399699204965016], [45.877592807810252, 13.347764390511681], [45.625050083199874, 13.290946153206759], [45.406458774605241, 13.02690542241143], [45.144355910020849, 12.953938300015306], [44.9895333188744, 12.699586900274708], [44.494576450382844, 12.721652736863344], [44.175112745954486, 12.585950425664873], [43.48295861183712, 12.63680003504008], [43.222871128112118, 13.220950425667422], [43.251448195169516, 13.767583726450848], [43.087943963398047, 14.062630316621306], [42.892245314308717, 14.802249253798745], [42.604872674333606, 15.213335272680592], [42.805015496600042, 15.261962795467252], [42.702437778500652, 15.718885809791995], [42.823670688657408, 15.911742255105263], [42.779332309750963, 16.34789134364868], [43.218375278502734, 16.666889960186406], [43.115797560403351, 17.088440456607369], [43.380794305196098, 17.579986680567668], [43.791518589051904, 17.319976711491105], [44.062613152855072, 17.410358791569589], [45.216651238797184, 17.43332896572333], [45.399999220568752, 17.333335069238554], [46.366658563020529, 17.233315334537632], [46.749994337761642, 17.283338120996174], [47.000004917189749, 16.949999294497438], [47.466694777217626, 17.116681626854877], [48.183343540241324, 18.166669216377311], [49.116671583864857, 18.616667588774941], [52.000009800022227, 19.000003363516054], [52.782184279192037, 17.349742336491229], [53.108572625547502, 16.651051133688949]]] } },
-            { "type": "Feature", "properties": { "admin": "South Africa", "name": "South Africa", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.521001417778869, -29.257386976846245], [31.325561150850994, -29.401977634398907], [30.901762729625336, -29.909956963828034], [30.622813348113816, -30.423775730106122], [30.055716180142774, -31.140269463832951], [28.925552605919535, -32.172041110972494], [28.219755893677092, -32.771952813448848], [27.464608188595967, -33.226963799778794], [26.419452345492818, -33.614950453426175], [25.909664340933482, -33.667040297176392], [25.78062828950069, -33.944646091448334], [25.172861769315965, -33.796851495093577], [24.67785322439212, -33.987175795224537], [23.594043409934635, -33.794474379208147], [22.988188917744729, -33.916430759416976], [22.574157342222232, -33.864082533505304], [21.542799106541022, -34.258838799782922], [20.689052768646999, -34.417175388325226], [20.071261020597628, -34.795136814107984], [19.616405063564567, -34.819166355123706], [19.193278435958714, -34.462598972309777], [18.855314568769867, -34.444305515278458], [18.424643182049376, -33.997872816708963], [18.377410922934612, -34.13652068454806], [18.244499139079917, -33.867751560198023], [18.250080193767442, -33.281430759414434], [17.925190463948436, -32.61129078545342], [18.247909783611185, -32.429131361624563], [18.221761508871477, -31.661632989225662], [17.566917758868861, -30.72572112398754], [17.0644161312627, -29.878641045859158], [17.06291751472622, -29.875953871379977], [16.344976840895239, -28.576705010697697], [16.824017368240899, -28.082161553664466], [17.218928663815401, -28.355943291946804], [17.387497185951499, -28.783514092729774], [17.836151971109526, -28.856377862261311], [18.464899122804745, -29.045461928017271], [19.002127312911082, -28.972443129188857], [19.89473432788861, -28.461104831660769], [19.895767856534427, -24.767790215760588], [20.165725538827186, -24.917961928000768], [20.758609246511831, -25.868136488551446], [20.666470167735437, -26.477453301704916], [20.889609002371731, -26.828542982695907], [21.60589603036939, -26.726533705351748], [22.105968865657864, -26.28025603607913], [22.579531691180584, -25.979447523708142], [22.824271274514896, -25.500458672794768], [23.312096795350179, -25.268689873965712], [23.733569777122703, -25.39012948985161], [24.211266717228792, -25.670215752873567], [25.025170525825782, -25.719670098576891], [25.664666375437712, -25.486816094669706], [25.765848829865206, -25.174845472923671], [25.941652052522151, -24.696373386333214], [26.485753208123292, -24.616326592713097], [26.78640669119741, -24.240690606383478], [27.119409620886238, -23.574323011979772], [28.017235955525244, -22.827753594659072], [29.432188348109033, -22.091312758067584], [29.839036899542965, -22.102216485281172], [30.322883335091767, -22.271611830333931], [30.659865350067083, -22.151567478119912], [31.191409132621278, -22.251509698172395], [31.670397983534645, -23.658969008073861], [31.930588820124242, -24.369416599222532], [31.752408481581874, -25.484283949487406], [31.837777947728057, -25.843331801051342], [31.333157586397899, -25.660190525008943], [31.044079624157146, -25.731452325139436], [30.949666782359905, -26.022649021104144], [30.676608514129633, -26.398078301704604], [30.685961948374477, -26.743845310169526], [31.282773064913325, -27.285879408478991], [31.868060337051073, -27.17792734142127], [32.071665480281062, -26.733820082304902], [32.830120477028878, -26.74219166433619], [32.580264926897677, -27.470157566031808], [32.462132602678444, -28.30101124442055], [32.203388706193032, -28.752404880490065], [31.521001417778869, -29.257386976846245]], [[28.978262566857236, -28.955596612261708], [28.541700066855491, -28.647501722937562], [28.07433841320778, -28.851468601193581], [27.532511020627471, -29.242710870075353], [26.999261915807629, -29.875953871379977], [27.749397006956478, -30.645105889612214], [28.107204624145421, -30.545732110314944], [28.291069370239903, -30.226216729454293], [28.848399692507734, -30.070050551068245], [29.018415154748016, -29.743765557577362], [29.325166456832587, -29.257386976846245], [28.978262566857236, -28.955596612261708]]] } },
-            { "type": "Feature", "properties": { "admin": "Zambia", "name": "Zambia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[32.759375441221316, -9.230599053589058], [33.231387973775291, -9.676721693564799], [33.485687697083584, -10.525558770391111], [33.315310499817279, -10.796549981329695], [33.114289178201908, -11.607198174692311], [33.306422153463068, -12.435778090060214], [32.991764357237876, -12.783870537978272], [32.688165317523122, -13.712857761289273], [33.214024692525207, -13.97186003993615], [30.179481235481827, -14.796099134991525], [30.274255812305103, -15.507786960515208], [29.51683434420314, -15.644677829656386], [28.947463413211256, -16.043051446194436], [28.825868768028492, -16.389748630440611], [28.467906121542676, -16.468400160388843], [27.598243442502753, -17.290830580314005], [27.044427117630729, -17.938026218337427], [26.706773309035633, -17.961228936436477], [26.381935255648919, -17.846042168857892], [25.264225701608005, -17.736539808831413], [25.084443393664564, -17.661815687737366], [25.076950310982255, -17.578823337476617], [24.6823490740015, -17.35341073981947], [24.033861525170771, -17.29584319424632], [23.215048455506057, -17.52311614346598], [22.562478468524255, -16.89845142992181], [21.887842644953867, -16.080310153876876], [21.933886346125913, -12.898437188369357], [24.016136508894672, -12.91104623784857], [23.930922072045373, -12.565847670138854], [24.079905226342838, -12.191296888887361], [23.904153680118181, -11.722281589406318], [24.017893507592586, -11.237298272347088], [23.912215203555714, -10.926826267137512], [24.257155389103982, -10.951992689663655], [24.314516228947948, -11.262826429899269], [24.783169793402948, -11.238693536018962], [25.418118116973197, -11.330935967659958], [25.752309604604726, -11.784965101776356], [26.55308759939961, -11.924439792532125], [27.164419793412456, -11.608748467661071], [27.38879886242378, -12.132747491100663], [28.15510867687998, -12.272480564017894], [28.52356163912102, -12.698604424696679], [28.934285922976834, -13.248958428605132], [29.699613885219485, -13.257226657771827], [29.616001417771223, -12.178894545137307], [29.341547885869087, -12.36074391037241], [28.642417433392346, -11.971568698782312], [28.372253045370421, -11.793646742401389], [28.496069777141763, -10.789883721564044], [28.673681674928922, -9.605924981324931], [28.449871046672818, -9.164918308146083], [28.734866570762495, -8.526559340044576], [29.002912225060467, -8.40703175215347], [30.34608605319081, -8.238256524288216], [30.740015496551781, -8.340007419470913], [31.157751336950042, -8.594578747317362], [31.55634809746649, -8.76204884199864], [32.191864861791963, -8.930358981973276], [32.759375441221316, -9.230599053589058]]] } },
-            { "type": "Feature", "properties": { "admin": "Zimbabwe", "name": "Zimbabwe", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.191409132621278, -22.251509698172395], [30.659865350067083, -22.151567478119912], [30.322883335091767, -22.271611830333931], [29.839036899542965, -22.102216485281172], [29.432188348109033, -22.091312758067584], [28.794656202924209, -21.639454034107445], [28.02137007010861, -21.485975030200578], [27.727227817503252, -20.851801853114711], [27.724747348753247, -20.499058526290387], [27.296504754350501, -20.391519870690995], [26.164790887158478, -19.293085625894935], [25.850391473094724, -18.714412937090533], [25.649163445750155, -18.536025892818987], [25.264225701608005, -17.736539808831413], [26.381935255648919, -17.846042168857892], [26.706773309035633, -17.961228936436477], [27.044427117630729, -17.938026218337427], [27.598243442502753, -17.290830580314005], [28.467906121542676, -16.468400160388843], [28.825868768028492, -16.389748630440611], [28.947463413211256, -16.043051446194436], [29.51683434420314, -15.644677829656386], [30.274255812305103, -15.507786960515208], [30.338954705534537, -15.880839125230242], [31.173063999157673, -15.860943698797868], [31.636498243951188, -16.071990248277881], [31.852040643040592, -16.319417006091374], [32.328238966610222, -16.392074069893749], [32.847638787575839, -16.713398125884613], [32.849860874164385, -17.979057305577175], [32.654885695127142, -18.672089939043492], [32.611994256324884, -19.419382826416268], [32.772707960752619, -19.715592136313294], [32.659743279762573, -20.30429005298231], [32.508693068173436, -20.395292250248303], [32.244988234188007, -21.116488539313689], [31.191409132621278, -22.251509698172395]]] } }
-        ]
-    };
-
-var randomcountriesData1 = [
-    { country: "Iran", "continent": "Asia", "CategoryName": "Books", "Sales": 550 },
-    { country: "Benin", "continent": "Africa", "CategoryName": "Books", "Sales": 1000 },
-    { country: "China", "continent": "Asia", "CategoryName": "Books", "Sales": 420 },
-    { country: "Chile", "continent": "South America", "CategoryName": "Books", "Sales": 1100 },
-    { country: "Cuba", "continent": "North America", "CategoryName": "Books", "Sales": 450 },
-    { country: "Spain", "continent": "Europe", "CategoryName": "Books", "Sales": 1200 },
-    { country: "Fiji", "continent": "Oceania", "CategoryName": "Books", "Sales": 618.0 },
-];
-
-module mapcomponenet {
-    $(function () {
-        var mapsample = new ej.datavisualization.Map($("#map"), {
-            enableAnimation: true,
-            navigationControl: {
-                enableNavigation: true,
-                orientation: 'vertical',
-                absolutePosition: { x: 5, y: 15 },
-                dockPosition: 'none'
-            },
-            layers: [
-                {
-                    layerType: 'geometry',
-                    enableMouseHover: false,
-                    enableSelection: false,
-                    shapeSettings: {
-                        fill: "#626171",
-                        autoFill: false,
-                        highlightStroke: "white",
-                        stroke: "white",
-                        strokeThickness: 0.5,
-                        highlightColor: "#BFBFBF"
-                    },
-                    shapeData: world_map,
-                    legendSettings: { dockOnMap: false }
-                }
-            ]
-        });
-    });
-}
-
-
-
-module MenuComponent {
-    $(function () {
-        var sample = new ej.Menu($("#syncfusionProducts"),{
-            width: "100%",
-            animationType: ej.AnimationType.Default,
-            cssClass: 'gradient-lime ',
-            enableAnimation: true,
-            enableSeparator: true,
-            height: 40,
-            htmlAttributes: { "aria-label": "menu" },
-            menuType: "normalmenu",
-            orientation: ej.Orientation.Horizontal,
-            showRootLevelArrows: true,
-            showSubLevelArrows: true,
-            subMenuDirection: ej.Direction.Right,
-            titleText: "Menu",
-
-        });
-    });
-
-}
-
-
-
-
-
-
-module NavigationDrawerComponent {
-    $(function () {
-        var navigationdrawerInstance = new ej.NavigationDrawer($("#navpane"), {
-           targetId: "butdrawer",
-            contentId: "content_container",
-            type: "overlay",
-            direction: "left",
-            enableListView: true,
-            listViewSettings: {
-                width: 300,
-                selectedItemIndex: 0
-            },
-            position: "normal"
-        });
-		$("#navpane_listview").click(function(e: any) {
-            var text=e.target["text"]||$(e.target).closest("li.e-list").text();
-            $("#butdrawer").parent().children("h2").text(text);
-        });
-    });
-}
-
-module PDFViewerComponent {
-    $(function () {
-        var pdfviewerControl = new ej.PdfViewer($("#pdfviewer"), {
-            serviceUrl:(<any>window).baseurl+ "api/PdfViewer",
-            isResponsive: true
-        });
-    });
-}
-
-module PivotChartOlap {
-    $(function () {
-        var sample = new ej.PivotChart($("#PivotChart"), {
-            dataSource: {
-                data: "http://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 },
-        });
-    });
-}
-
-
-var pivot_dataset = [
-    { Amount: 100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Alberta" },
-    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 3, State: "British Columbia" },
-    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
-    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
-    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
-    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
-    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
-    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
-    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
-    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
-    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
-    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
-    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
-    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
-    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
-    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
-    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
-    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
-    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
-    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
-    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
-    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
-]
-
-module PivotChartRelational {
-
-    $(function () {
-        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 },
-        });
-    });
-}
-
-module PivotGaugeOlap {
-
-    $(function () {
-        var sample = new ej.PivotGauge($("#PivotGauge"),{
-            dataSource: {
-				data: "http://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,
-                border: {
-					width: 0.5
-				},
-				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",
-                    distanceFromScale: 2,
-					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"
-                },
-				{
-					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"
-                }]
-            }]
-        });
-    });
-}
-
-
-var pivot_dataset = [
-    { Amount: 100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Alberta" },
-    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 3, State: "British Columbia" },
-    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
-    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
-    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
-    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
-    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
-    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
-    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
-    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
-    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
-    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
-    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
-    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
-    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
-    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
-    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
-    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
-    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
-    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
-    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
-    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
-]
-
-module PivotGaugeRelational {
-    $(function () {
-        var sample = new ej.PivotGauge($("#PivotGauge"), {
-            dataSource: {
-                data: pivot_dataset,
-                rows: [
-                    {
-                        fieldName: "Country",
-                    },
-                    {
-                        fieldName: "State",
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "Product",
-                    }
-                ],
-                values: [
-                    {
-                        fieldName: "Amount",
-                    },
-                    {
-                        fieldName: "Quantity",
-                    }
-                ]
-            },
-            enableTooltip: true, isResponsive: true,
-            labelFormatSettings: { decimalPlaces: 2 },
-            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
-                },
-                    {
-                        type: "marker",
-                        markerType: "diamond",
-                        distanceFromScale: 5,
-                        placement: "center",
-                        backgroundColor: "#29A4D9",
-                        length: 25,
-                        width: 15
-                    }],
-                ticks: [{
-                    type: "major",
-                    distanceFromScale: 2,
-                    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"
-                },
-                    {
-                        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"
-                    }]
-            }]
-        });
-    });
-}
-
-module PivotGridOlap {
-
-    $(function () {
-        var sample = new ej.PivotGrid($("#PivotGrid"), {
-            dataSource: {
-                data: "http://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();
-    });
-}
-
-var pivot_dataset = [
-    { Amount: 100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Alberta" },
-    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 3, State: "British Columbia" },
-    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
-    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
-    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
-    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
-    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
-    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
-    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
-    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
-    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
-    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
-    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
-    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
-    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
-    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
-    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
-    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
-    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
-    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
-    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
-    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
-]
-
-module PivotGridRelational {
-    $(function () {
-        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"
-        });
-        $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
-
-    });
-}
-
-module PivotTreeMap {
-    $(function () {
-        var sample = new ej.PivotTreeMap($("#PivotTreeMap"),{
-            dataSource: {
-			data: "http://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:[]
-		}
-        });
-    });
-}
-
-module ProgressBarComponent {
-    $(function () {
-        var sample = new ej.ProgressBar($("#progressBar"),{
-            width: 200,
-            value: 45,
-            height: 20,
-            enablePersistence: true,
-            maxValue: 200,
-            minValue: 0,
-            showRoundedCorner: true,
-            text: 'loading...'
-        });
-    });
-
-}
-
-
-declare var rteObj: any;
-declare var data: any;
-var radialEle = $('#defaultradialmenu'), action = 0, forRedo = 0;
-var rteEle = $("#rteSample1");
-module RadialMenuComponent {
-    $(function () {
-
-        if (!(ej.browserInfo().name == "msie" && parseInt(ej.browserInfo().version) < 9)) {
-            var radialmenuInstance = new ej.RadialMenu($("#defaultradialmenu"), {
-                imageClass: "imageclass",
-                backImageClass: "backimageclass",
-                targetElementId: "radialtarget1"
-            });
-			$("#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" });
-        }
-        var rteInstance = new ej.RTE($("#rteSample1"), {
-            width: "100%",
-            minWidth: "10px",
-            change: (e) => { radialEle.ejRadialMenu("enableItem", "Undo"); },
-            select: (e) => {
-                var target = $("#radialtarget1"), radialRadius = 150, radialDiameter = 2 * radialRadius,
-                    // To get Iframe positions
-                    iframeY = e.event.clientY, iframeX = e.event.clientX,
-                    // To set Radial Menu position within target
-                    x = iframeX > target.width() - radialRadius ? target.width() - radialDiameter : (iframeX > radialRadius ? iframeX - radialRadius : 0),
-                    y = iframeY > target.height() - radialRadius ? target.height() - radialDiameter : (iframeY > radialRadius ? iframeY - radialRadius : 0);
-                radialEle.ejRadialMenu("setPosition", x, y);
-                radialEle.focus();
-                $('iframe').contents().find('body').blur();
-            },
-            showToolbar: false,
-            showContextMenu: false
-        });
-        $(window).resize(function () {
-            if (ej.isMobile() && ej.isPortrait())
-                $('#defaultradialmenu').css({ "left": 25 });
-        });
-    });
-}
-
-
-function bold(e: any) {
-
-    rteObj = rteEle.data("ejRTE");
-    rteObj.executeCommand("bold");
-    data = rteObj._getSelectedHtmlString() ? true : false;
-    if (data) action += 1;
-    forRedo = action;
-    radialEle.focus();
-}
-function italic(e: any) {
-    rteObj = rteEle.data("ejRTE");
-    rteObj.executeCommand("italic");
-    data = rteObj._getSelectedHtmlString() ? true : false;
-    if (data) action += 1;
-    forRedo = action;
-    radialEle.focus();
-}
-function undo(e: any) {
-    rteObj = rteEle.data("ejRTE");
-    rteObj.executeCommand("undo");
-    action -= 1;
-    if (action == 0)
-        radialEle.ejRadialMenu("disableItem", "Undo");
-    radialEle.ejRadialMenu("enableItem", "Redo");
-    radialEle.focus();
-}
-function redo(e: any) {
-    rteObj = rteEle.data("ejRTE");
-    rteObj.executeCommand("redo");
-    action += 1;
-    if (forRedo == action) radialEle.ejRadialMenu("disableItem", "Redo");
-    radialEle.ejRadialMenu("enableItem", "Undo");
-    radialEle.focus();
-}
-
-module RadialSliderComponent {
-    $(function () {
-        var radialsliderInstance = new ej.RadialSlider($("#radialSlider"), {
-           innerCircleImageUrl: "images/radialslider/chevron-right.png"
-        });
-    });
-}
-
-module rangecomponent {
-    $(function () {
-        var linearsample = new ej.datavisualization.RangeNavigator($("#RangeNavigator"), {
-            enableDeferredUpdate: true,
-            padding: "15",
-            allowSnapping: true,
-            selectedRangeSettings: {
-                start: "2010/5/1", end: "2011/10/1"
-            },
-            isResponsive: true,
-            tooltipSettings: {
-                visible: true, labelFormat: "MM/dd/yyyy", backgroundColor: "gray", tooltipDisplayMode: "ondemand"
-            },
-            load: () => {
-                var rn = $("#RangeNavigator").data("ejRangeNavigator");
-                rn.model.series = [
-                    {
-                        type: 'line',
-                        dataSource: data.Open, xName: "XValue", yName: "YValue",
-                        fill: '#69D2E7'
-                    }
-                ];
-            },
-            loaded: function () {
-                var sender = $("#RangeNavigator").data("ejRangeNavigator");
-                var theme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
-                if (theme) {
-                    switch (theme) {
-                        case "flatazurelight":
-                            theme = "azurelight";
-                            break;
-                        case "flatlimelight":
-                            theme = "limelight";
-                            break;
-                        case "flatsaffronlight":
-                            theme = "saffronlight";
-                            break;
-                        case "gradientazurelight":
-                            theme = "gradientazure";
-                            break;
-                        case "gradientlimelight":
-                            theme = "gradientlime";
-                            break;
-                        case "gradientsaffronlight":
-                            theme = "gradientsaffron";
-                            break;
-                        case "flatazuredark":
-                            theme = "azuredark";
-                            break;
-                        case "flatlimedark":
-                            theme = "limedark";
-                            break;
-                        case "flatsaffrondark":
-                            theme = "saffrondark";
-                            break;
-                        case "gradientazuredark":
-                            theme = "gradientazuredark";
-                            break;
-                        case "gradientlimedark":
-                            theme = "gradientlimedark";
-                            break;
-                        case "gradientsaffrondark":
-                            theme = "gradientsaffrondark";
-                            break;
-                        case "flathigh-contrast-01dark":
-                            theme = "highcontrast01";
-                            break;
-                        case "flathigh-contrast-02dark":
-                            theme = "highcontrast02";
-                            break;
-                        case "flatmateriallight":
-                            theme = "material";
-                            break;
-                        case "flatoffice-365light":
-                            theme = "office";
-                            break;
-                        default:
-                            theme = "flatlight";
-                            break;
-                    }
-                    sender.model.theme = theme;
-                }
-            }
-
-        });
-    });
-}
-var data;
-data = GetData();
-
-function GetData() {
-    var series1:any[]=[];
-    var series2:any[]= [];
-    var value = 100;
-    var value1 = 120;
-    for (var i = 1; i < 730; i++) {
-
-        if (Math.random() > .5) {
-            value += Math.random();
-            value1 += Math.random();
-        } else {
-            value -= Math.random();
-            value1 -= Math.random();
-        }
-        var point1 = { XValue: new Date(2010, 0, i), YValue: value };
-        var point2 = { XValue: new Date(2010, 0, i), YValue: value1 };
-        series1.push(point1);
-        series2.push(point2);
-    }
-
-    data = { Open: series1, Close: series2 };
-    return data;
-};
-
-module RatingComponent {
-    $(function () {
-
-        var sample1 = new ej.Rating($("#fullRating"), {
-            value: 4,
-            precision: ej.Rating.Precision.Full,
-            allowReset: true,
-            cssClass: "gradient-lime",
-            enabled: true,
-            enablePersistence: true,
-            incrementStep: 2,
-            maxValue: 10,
-            minValue: 0,
-            orientation: ej.Orientation.Horizontal,
-            shapeHeight: 25,
-            shapeWidth: 25,
-            showTooltip: true
-        });
-
-        var sample2 = new ej.Rating($("#halfRating"), {
-            precision: ej.Rating.Precision.Half,
-            value: 3.5,
-            allowReset: true,
-            cssClass: "gradient-lime",
-            enabled: true,
-            enablePersistence: true,
-            incrementStep: 2,
-            maxValue: 10,
-            minValue: 0,
-            orientation: "horizontal",
-            shapeHeight: 25,
-            shapeWidth: 25,
-            showTooltip: true
-        });
-
-        var sample3 = new ej.Rating($("#exactRating"), {
-            precision: ej.Rating.Precision.Exact,
-            value: 3.7,
-            allowReset: true,
-            cssClass: "gradient-lime",
-            enabled: true,
-            enablePersistence: true,
-            incrementStep: 2,
-            maxValue: 10,
-            minValue: 0,
-            orientation: "horizontal",
-            shapeHeight: 25,
-            shapeWidth: 25,
-            showTooltip: true
-        });
-    });
-
-}
-
-module ReportViewerComponent {
-	$(function () {
-		var report = new ej.ReportViewer($("#territoryReportViewer"), {
-			reportServiceUrl: (<any>window).baseurl + 'api/ReportViewer',
-			reportServerUrl: 'http://mvc.syncfusion.com/reportserver',
-			processingMode: ej.ReportViewer.ProcessingMode.Remote,
-			reportPath: "/SSRSSamples2/Territory Sales new",
-			isResponsive: true
-		});
-	});
-}
-
-var fontfamily = ["Segoe UI", "Arial", "Times New Roman", "Tahoma", "Helvetica"], fontsize = ["1pt", "2pt", "3pt", "4pt", "5pt"], action1 = ["New", "Clear"], action2 = ["Bold", "Italic", "Underline", "strikethrough", "superscript", "subscript", "JustifyLeft", "JustifyCenter", "JustifyRight", "JustifyFull", "Undo", "Redo"];
-module RibbonComponent {
-    $(function () {
-        var sample = new ej.Ribbon($("#defaultRibbon"), {
-            width: "100%",
-            expandPinSettings: {
-                toolTip: "Collapse the Ribbon"
-            },
-            collapsePinSettings: {
-                toolTip: "Pin the Ribbon"
-            },
-            applicationTab: {
-                type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false }
-            },
-            tabs: [{
-                id: "home", text: "HOME", groups: [{
-                    text: "New", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                        groups: [{
-                            id: "new",
-                            text: "New",
-                            toolTip: "New",
-                            buttonSettings: {
-                                contentType: ej.ContentType.ImageOnly,
-                                imagePosition: ej.ImagePosition.ImageTop,
-                                prefixIcon: "e-icon e-ribbon e-new",
-                                click: "onClick"
-                            }
-                        }
-                        ],
-                        defaults: {
-                            type: "button",
-                            width: 60,
-                            height: 70
-                        }
-                    }]
-                },
-                    {
-                        text: "Clipboard", alignType: ej.Ribbon.AlignType.Columns, content: [{
-                            groups: [{
-                                id: "paste",
-                                text: "paste",
-                                toolTip: "Paste",
-                                splitButtonSettings: {
-                                    contentType: ej.ContentType.ImageOnly,
-                                    prefixIcon: "e-icon e-ribbon e-ribbonpaste",
-                                    targetID: "pasteSplit",
-                                    buttonMode: "dropdown",
-                                    click: "onClick",
-                                    arrowPosition: ej.ArrowPosition.Bottom
-                                }
-                            }
-                            ],
-                            defaults: {
-                                type: "splitbutton",
-                                width: 50,
-                                height: 70
-                            }
-                        },
-                            {
-                                groups: [{
-                                    id: "cut",
-                                    text: "Cut",
-                                    toolTip: "Cut",
-                                    buttonSettings: {
-                                        contentType: ej.ContentType.TextAndImage,
-                                        click: "onClick",
-                                        prefixIcon: "e-icon e-ribbon e-ribboncut"
-                                    }
-                                },
-                                    {
-                                        id: "copy",
-                                        text: "Copy",
-                                        toolTip: "Copy",
-                                        buttonSettings: {
-                                            contentType: ej.ContentType.TextAndImage,
-                                            click: "onClick",
-                                            prefixIcon: "e-icon e-ribbon e-ribboncopy"
-                                        }
-                                    },
-                                    {
-                                        id: "clear",
-                                        text: "Clear",
-                                        toolTip: "Clear All",
-                                        buttonSettings: {
-                                            contentType: ej.ContentType.TextAndImage,
-                                            click: "onClick",
-                                            prefixIcon: "e-icon e-ribbon clearAll"
-                                        }
-                                    }],
-                                defaults: {
-                                    type: "button",
-                                    width: 60,
-                                    isBig: false
-                                }
-                            }]
-                    },
-                    {
-                        text: "Font", alignType: "rows", content: [{
-                            groups: [{
-                                id: "fontfamily",
-                                toolTip: "Font",
-                                dropdownSettings: {
-                                    dataSource: fontfamily,
-                                    text: "Segoe UI",
-                                    select: "onClick",
-                                    width: 150
-                                }
-                            },
-                                {
-                                    id: "fontsize",
-                                    toolTip: "FontSize",
-                                    dropdownSettings: {
-                                        dataSource: fontsize,
-                                        text: "1pt",
-                                        select: "onClick",
-                                        width: 65
-                                    }
-                                }],
-                            defaults: {
-                                type: "dropdownlist",
-                                height: 28
-                            }
-                        },
-                            {
-                                groups: [{
-                                    id: "bold",
-                                    toolTip: "Bold",
-                                    type: ej.Ribbon.Type.ToggleButton,
-                                    toggleButtonSettings: {
-                                        contentType: ej.ContentType.ImageOnly,
-                                        defaultText: "Bold",
-                                        activeText: "Bold",
-                                        click: "onClick",
-                                        defaultPrefixIcon: "e-icon e-ribbon bold",
-                                        activePrefixIcon: "e-icon e-ribbon bold"
-                                    }
-                                },
-                                    {
-                                        id: "italic",
-                                        toolTip: "Italic",
-                                        type: ej.Ribbon.Type.ToggleButton,
-                                        toggleButtonSettings: {
-                                            contentType: ej.ContentType.ImageOnly,
-                                            defaultText: "Italic",
-                                            activeText: "Italic",
-                                            click: "onClick",
-                                            defaultPrefixIcon: "e-icon e-ribbon e-ribbonitalic",
-                                            activePrefixIcon: "e-icon e-ribbon e-ribbonitalic"
-                                        }
-                                    },
-                                    {
-                                        id: "underline",
-                                        text: "Underline",
-                                        toolTip: "Underline",
-                                        type: ej.Ribbon.Type.ToggleButton,
-                                        toggleButtonSettings: {
-                                            contentType: ej.ContentType.ImageOnly,
-                                            defaultText: "Underline",
-                                            activeText: "Underline",
-                                            click: "onClick",
-                                            defaultPrefixIcon: "e-icon e-ribbon e-ribbonunderline",
-                                            activePrefixIcon: "e-icon e-ribbon e-ribbonunderline"
-                                        }
-                                    },
-                                    {
-                                        id: "strikethrough",
-                                        text: "strikethrough",
-                                        toolTip: "Strikethrough",
-                                        type: ej.Ribbon.Type.ToggleButton,
-                                        toggleButtonSettings: {
-                                            contentType: ej.ContentType.ImageOnly,
-                                            defaultText: "Strikethrough",
-                                            activeText: "Strikethrough",
-                                            click: "onClick",
-                                            defaultPrefixIcon: "e-icon e-ribbon strikethrough",
-                                            activePrefixIcon: "e-icon e-ribbon strikethrough"
-                                        }
-                                    },
-                                    {
-                                        id: "superscript",
-                                        text: "superscript",
-                                        toolTip: "Superscript",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-superscripticon"
-                                        }
-                                    },
-                                    {
-                                        id: "subscript",
-                                        text: "subscript",
-                                        toolTip: "Subscript",
-                                        enableSeparator: true,
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-subscripticon"
-                                        }
-                                    },
-                                    {
-                                        id: "fontcolor",
-                                        text: "Font Color",
-                                        toolTip: "Font Color",
-                                        type: ej.Ribbon.Type.Custom,
-                                        contentID: "fontcolor"
-                                    },
-                                    {
-                                        id: "fillcolor",
-                                        text: "Fill Color",
-                                        toolTip: "Fill Color",
-                                        type: ej.Ribbon.Type.Custom,
-                                        contentID: "fillcolor"
-                                    }
-                                ],
-                                defaults: {
-                                    isBig: false
-                                }
-                            }]
-                    },
-                    {
-                        text: "Alignment", alignType: ej.Ribbon.AlignType.Rows, content: [
-                            {
-                                groups: [{
-                                    id: "bullet",
-                                    text: "Bullet Format",
-                                    toolTip: "Bullets",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.ImageOnly,
-                                        prefixIcon: "e-icon e-ribbon e-bullet"
-                                    }
-                                },
-                                    {
-                                        id: "number",
-                                        text: "Number Format",
-                                        toolTip: "Numbering",
-                                        enableSeparator: true,
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-numbericon"
-                                        }
-                                    },
-                                    {
-                                        id: "textindent",
-                                        text: "Indent",
-                                        toolTip: "Text Indent",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-indent"
-                                        }
-                                    },
-                                    {
-                                        id: "textoudent",
-                                        text: "Outdent",
-                                        toolTip: "Text Outdent",
-                                        enableSeparator: true,
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-outdent"
-                                        }
-                                    },
-                                    {
-                                        id: "sortascending",
-                                        text: "Sort",
-                                        toolTip: "Sort",
-                                        enableSeparator: true,
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-sort"
-                                        }
-                                    },
-                                    {
-                                        id: "border",
-                                        text: "Border",
-                                        toolTip: "Border",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-border"
-                                        }
-                                    }],
-                                defaults: {
-                                    type: "button",
-                                    isBig: false
-                                }
-                            },
-                            {
-                                groups: [{
-                                    id: "alignleft",
-                                    text: "JustifyLeft",
-                                    toolTip: "Align Left",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.ImageOnly,
-                                        prefixIcon: "e-icon e-ribbon alignleft"
-                                    }
-                                },
-                                    {
-                                        id: "aligncenter",
-                                        text: "JustifyCenter",
-                                        toolTip: "Align Center",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon aligncenter"
-                                        }
-                                    },
-                                    {
-                                        id: "alignright",
-                                        text: "JustifyRight",
-                                        toolTip: "Align Right",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon alignright"
-                                        }
-                                    },
-                                    {
-                                        id: "justify",
-                                        text: "JustifyFull",
-                                        toolTip: "Justify",
-                                        enableSeparator: true,
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon justify"
-                                        }
-                                    },
-                                    {
-                                        id: "uppercase",
-                                        text: "Upper Case",
-                                        toolTip: "Upper Case",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-uppercase"
-                                        }
-                                    },
-                                    {
-                                        id: "lowercase",
-                                        text: "Lower Case",
-                                        toolTip: "Lower Case",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-lowercase"
-                                        }
-                                    }],
-                                defaults: {
-                                    type: "button",
-                                    isBig: false
-                                }
-                            }]
-                    },
-                    {
-                        text: "Actions", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                            groups: [{
-                                id: "undo",
-                                text: "Undo",
-                                toolTip: "Undo",
-                                buttonSettings: {
-                                    click: "onClick",
-                                    contentType: ej.ContentType.TextAndImage,
-                                    imagePosition: ej.ImagePosition.ImageTop,
-                                    prefixIcon: "e-icon e-ribbon e-undo"
-                                }
-                            },
-                                {
-                                    id: "redo",
-                                    text: "Redo",
-                                    toolTip: "Redo",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-redo"
-                                    }
-                                }
-                            ],
-                            defaults: {
-                                type: "button",
-                                width: 40,
-                                height: 70
-                            }
-                        }]
-                    },
-                    {
-                        text: "View", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                            groups: [{
-                                id: "zoomin",
-                                text: "Zoom In",
-                                toolTip: "Zoom In",
-                                buttonSettings: {
-                                    width: 58,
-                                    click: "onClick",
-                                    contentType: ej.ContentType.TextAndImage,
-                                    imagePosition: ej.ImagePosition.ImageTop,
-                                    prefixIcon: "e-icon e-ribbon e-zoomin"
-                                }
-                            },
-                                {
-                                    id: "zoomout",
-                                    text: "Zoom Out",
-                                    toolTip: "Zoom Out",
-                                    buttonSettings: {
-                                        width: 70,
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-zoomout"
-                                    }
-                                },
-                                {
-                                    id: "fullscreen",
-                                    text: "Full Screen",
-                                    toolTip: "Full Screen",
-                                    buttonSettings: {
-                                        width: 73,
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-fullscreen"
-                                    }
-                                }
-                            ],
-                            defaults: {
-                                type: "button",
-                                height: 70
-                            }
-                        }]
-                    }]
-            }, {
-                    id: "insert", text: "INSERT", groups: [{
-                        text: "Tables", alignType: ej.Ribbon.AlignType.Columns, content: [{
-                            groups: [{
-                                id: "tables",
-                                text: "Tables",
-                                toolTip: "Tables",
-                                buttonSettings: {
-                                    click: "onClick",
-                                    contentType: ej.ContentType.TextAndImage,
-                                    imagePosition: ej.ImagePosition.ImageTop,
-                                    prefixIcon: "e-icon e-ribbon e-table"
-                                }
-                            }
-                            ],
-                            defaults: {
-                                type: "button",
-                                width: 50,
-                                height: 70
-                            }
-                        }]
-                    },
-                        {
-                            text: "Illustrations", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "pictures",
-                                    text: "Pictures",
-                                    toolTip: "Pictures",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-picture"
-                                    }
-                                },
-                                    {
-                                        id: "videos",
-                                        text: "Videos",
-                                        toolTip: "Videos",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.TextAndImage,
-                                            imagePosition: ej.ImagePosition.ImageTop,
-                                            prefixIcon: "e-icon e-ribbon e-video"
-                                        }
-                                    },
-                                    {
-                                        id: "shapes",
-                                        text: "Shapes",
-                                        toolTip: "Shapes",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.TextAndImage,
-                                            imagePosition: ej.ImagePosition.ImageTop,
-                                            prefixIcon: "e-icon e-ribbon e-shape"
-                                        }
-                                    },
-                                    {
-                                        id: "charts",
-                                        text: "Charts",
-                                        toolTip: "Charts",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.TextAndImage,
-                                            imagePosition: ej.ImagePosition.ImageTop,
-                                            prefixIcon: "e-icon e-ribbon e-chart"
-                                        }
-                                    }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 56,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Comments", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "comments",
-                                    text: "Comments",
-                                    toolTip: "Comments",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-comment"
-                                    }
-                                }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 70,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Text", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "text",
-                                    text: "Text",
-                                    toolTip: "Text",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-text",
-                                        width: 50
-                                    }
-                                },
-                                    {
-                                        id: "datetime",
-                                        text: "Date Time",
-                                        toolTip: "DateTime",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.TextAndImage,
-                                            imagePosition: ej.ImagePosition.ImageTop,
-                                            prefixIcon: "e-icon e-ribbon e-datetimenew"
-                                        }
-                                    }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 70,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Hyperlink", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "hyperlink",
-                                    text: "Hyperlink",
-                                    toolTip: "Hyperlink",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-hyperlink"
-                                    }
-                                }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 70,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Equation", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "equation",
-                                    text: "Equation",
-                                    toolTip: "Equation",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-equation"
-                                    }
-                                }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 60,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Print Layout", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "printlayout",
-                                    text: "Print Layout",
-                                    toolTip: "Print Layout",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-printlayout"
-                                    }
-                                }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 80,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Save", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "print",
-                                    text: "Print",
-                                    toolTip: "Print",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-print"
-                                    }
-                                },
-                                    {
-                                        id: "save",
-                                        text: "Save",
-                                        toolTip: "Save",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.TextAndImage,
-                                            imagePosition: ej.ImagePosition.ImageTop,
-                                            prefixIcon: "e-icon e-ribbon e-save"
-                                        }
-                                    }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 50,
-                                    height: 70
-                                }
-                            }]
-                        }
-                    ]
-                }
-            ],
-            create: function createControl(args: any) {
-                var ribbon = $("#defaultRibbon").data("ejRibbon");
-                $("#fontcolor").ejColorPicker({ value: "#FFFF00", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fontcoloricon", select: colorHandler });
-                $("#fillcolor").ejColorPicker({ value: "#FF0000", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fillcoloricon", select: colorHandler });
-            }
-        });
-    });
-}
-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) {
-    var val, prop = args.text;
-    val = (ej.isNullOrUndefined(args.model.text)) ? args.model.activeText : args.model.text;
-    if (action1.indexOf(val) != -1)
-        $("#contenteditor").empty();
-    else if (action2.indexOf(val) != -1)
-        document.execCommand(val, false, null);
-    else if (fontfamily.indexOf(prop) != -1)
-        document.execCommand("FontName", false, prop);
-    else if (fontsize.indexOf(prop) != -1)
-        document.execCommand("FontSize", false, prop.replace("pt", ""));
-    else
-        $("#contenteditor").append("<p> Action: " + val + " Triggered </p>");
-}
-
-
-
-module RotatorComponent {
-    $(function () {
-        var rotatorInstance = new ej.Rotator($("#sliderContent"), {
-            slideWidth: "100%",
-            frameSpace: "0px",
-            slideHeight: "auto",
-            displayItemsCount: "1",
-            navigateSteps: "1",
-            pagerPosition:"outside",
-            orientation: "horizontal",
-            showPager: true,
-            enabled: true,
-            showCaption: true,
-            allowKeyboardNavigation: true,
-            showPlayButton: true,
-            isResponsive:true,
-            animationType: "slide",
-        });
-    });
-}
-
-module RTEComponent {
-    $(function () {
-        var sample = new ej.RTE($("#rteSample"),{
-            width: "100%",
-            minWidth: "150px",
-            showFooter: true,
-            showHtmlSource: true,
-            allowEditing: true,
-            allowKeyboardNavigation: true,
-            autoFocus: true,
-            autoHeight: true,
-            colorPaletteColumns: 10,
-            colorPaletteRows: 5,
-            cssClass: 'gradient-lime',
-            enableResize: true,
-            enableTabKeyNavigation: true,
-            fileBrowser: {
-                filePath: (<any>window).baseurl + "Content/FileBrowser/",
-                extensionAllow: "*.png, *.doc, *.pdf, *.txt, *.docx",
-                ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
-            },
-            imageBrowser: {
-                filePath: (<any>window).baseurl + "Content/FileBrowser/",
-                extensionAllow: "*.png, *.gif, *.jpg, *.jpeg, *.docx",
-                ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
-            },
-            isResponsive: true,
-            showClearAll: true,
-            showClearFormat: true,
-            showDimensions: true,
-            showCharCount: true,
-            tools: {
-                formatStyle: ["format"],
-                edit: ["findAndReplace"],
-                font: ["fontName", "fontSize", "fontColor", "backgroundColor"],
-                style: ["bold", "italic", "underline", "strikethrough"],
-                alignment: ["justifyLeft", "justifyCenter", "justifyRight", "justifyFull"],
-                lists: ["unorderedList", "orderedList"],
-                clipboard: ["cut", "copy", "paste"],
-                doAction: ["undo", "redo"],
-                indenting: ["outdent", "indent"],
-                clear: ["clearFormat", "clearAll"],
-                links: ["createLink", "removeLink"],
-                images: ["image"],
-                media: ["video"],
-                tables: ["createTable", "addRowAbove", "addRowBelow", "addColumnLeft", "addColumnRight", "deleteRow", "deleteColumn", "deleteTable"],
-                effects: ["superscript", "subscript"],
-                casing: ["upperCase", "lowerCase"],
-                view: ["fullScreen", "zoomIn", "zoomOut"],
-                print: ["print"],
-                customUnorderedList: [{
-                    name: "unOrderInsert",
-                    tooltip: "Custom UnOrderList",
-                    css: "e-rte-toolbar-icon e-rte-unlistitems customUnOrder",
-                    text: "Smiley",
-                    listImage: "url('../content/images/rte/Smiley-GIF.gif')"
-                }],
-                customOrderedList: [{
-                    name: "orderInsert",
-                    tooltip: "Custom OrderList",
-                    css: "e-rte-toolbar-icon e-rte-listitems customOrder",
-                    text: "Lower-Greek",
-                    listStyle: "lower-greek"
-                }]
-            }
-        });
-    });
-
-}
-
-module ScheduleComponent {
-    $(function () {
-        var sample = new ej.Schedule($("#Schedule1"), {
-            width: "100%",
-            height: "525px",
-            currentDate: new Date(2017, 5, 5),
-            timeScale: {
-                minorSlotCount: 4,
-                majorSlot: 60
-            },
-            contextMenuSettings: {
-                enable: true,
-                menuItems: {
-                    appointment: [
-                        { id: "open", text: "Open Appointment" },
-                        { id: "delete", text: "Delete Appointment" },
-                        { id: "customMenu3", text: "Menu Item 3" },
-                        { id: "customMenu4", text: "Menu Item 4" }
-                    ],
-                    cells: [
-                        { id: "new", text: "New Appointment" },
-                        { id: "recurrence", text: "New Recurring Appointment" },
-                        { id: "today", text: "Today" },
-                        { id: "gotodate", text: "Go to date" },
-                        { id: "settings", text: "Settings" },
-                        { id: "view", text: "View", parentId: "settings" },
-                        { id: "timemode", text: "TimeMode", parentId: "settings" },
-                        { id: "view_Day", text: "Day", parentId: "view" },
-                        { id: "view_Week", text: "Week", parentId: "view" },
-                        { id: "view_Workweek", text: "Workweek", parentId: "view" },
-                        { id: "view_Month", text: "Month", parentId: "view" },
-                        { id: "timemode_Hour12", text: "12 Hours", parentId: "timemode" },
-                        { id: "timemode_Hour24", text: "24 Hours", parentId: "timemode" },
-                        { id: "workhours", text: "Work Hours", parentId: "settings" },
-                        { id: "customMenu1", text: "Menu Item 1" },
-                        { id: "customMenu2", text: "Menu Item 2" }
-                    ]
-                }
-            },
-            resources: [{
-                field: "ownerId",
-                title: "Owner",
-                name: "Owners", allowMultiple: true,
-                resourceSettings: {
-                    dataSource: [
-                        { text: "Nancy", id: 1, groupId: 1, color: "#f8a398" },
-                        { text: "Steven", id: 3, groupId: 2, color: "#56ca85" },
-                        { text: "Michael", id: 5, groupId: 1, color: "#51a0ed" }
-                    ],
-                    text: "text", id: "id", groupId: "groupId", color: "color"
-                }
-            }],
-            appointmentSettings: {
-                dataSource: new ej.DataManager((<any>window).ResourcesData).executeLocal(new ej.Query().take(10)),
-                id: "Id",
-                subject: "Subject",
-                startTime: "StartTime",
-                endTime: "EndTime",
-                description: "Description",
-                allDay: "AllDay",
-                recurrence: "Recurrence",
-                recurrenceRule: "RecurrenceRule",
-                resourceFields: "ownerId"
-            }
-        });
-    });
-}
-
-module ScrollerComponent {
-    $(function () {
-        var scrollerSample = new ej.Scroller($("#scrollcontent"), {
-            height: "300px",
-            width: "100%"
-        });
-        $(window).bind('resize', function () {
-            scrollerSample.refresh();
-        });    });
-}
-
-module SignatureComponent {
-    $(function () {
-        var basicSignature = new ej.Signature($("#signature"), {
-            height: "400px",
-            isResponsive: true,
-            strokeWidth: 3
-        });
-    });
-}
-
-module SliderComponent {
-    $(function () {
-        var slider = new ej.Slider($("#minSlider"), {
-            sliderType: "MinRange",
-            value: 60,
-            minValue: 0,
-            maxValue: 100
-        });
-        var rangeslider = new ej.Slider($("#rangeSlider"), {
-            sliderType: "Range",
-            values: [30, 60],
-            minValue: 0
-        });
-
-    });
-}
-
-
-
-
-module linesparkline {
-    $(function () {
-
-        var sparklinesample = new ej.Sparkline($("#line"), {
-            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" }
-            },
-            type: "line",
-            size: { height: "40", width:"170" },
-        });
-    });
-}
-
-module columnsparkline {
-    $(function () {
-        var sparkcolumnsample = new ej.Sparkline($("#column"), {
-            dataSource: [2, 6, -1, 1, 12, 5, -2, 7, -3, 5, 8, 10,],
-            negativePointColor: "red",
-            highPointColor: "blue",
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            type: "column",
-            size: { height: "100", width: "150" },
-        });
-    });
-}
-
-module areasparkline {
-    $(function () {
-        var sparkareasample = new ej.Sparkline($("#area"), {
-            dataSource: [12, -10, 11, 8, 17, 6, 2, -17, 13, -6, 8, 10,],
-            markerSettings: { visible: true },
-            highPointColor: "blue",
-            lowPointColor: "orange",
-            type: "area",
-            opacity: 0.5,
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            size: { height: "100", width: "150" },
-        });
-    });
-}
-
-module windlosssparkline {
-    $(function () {
-        var sparkwinlosssample = new ej.Sparkline($("#winloss"), {
-            dataSource: [12, 15, -11, 13, 17, 0, -12, 17, 13, -15, 8, 10,],
-            type: "winloss",
-            size: { height: "100", width: "150" },
-        });
-    });
-}
-
-module piesparkline1 {
-    $(function () {
-        var sparkpiesample1 = new ej.Sparkline($("#pie1"), {
-            dataSource: [4, 6, 7],
-            type: "pie",
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            size: { height: "40", width: "40" },
-        });
-    });
-}
-
-module piesparkline2 {
-    $(function () {
-        var sparkpiesample2 = new ej.Sparkline($("#pie2"), {
-            dataSource: [8, 9, 1,],
-            type: "pie",
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            size: { height: "40", width: "40" },
-        });
-    });
-}
-
-module piesparkline3 {
-    $(function () {
-        var sparkpiesample3 = new ej.Sparkline($("#pie3"), {
-            dataSource: [2, 3, 5],
-            type: "pie",
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            size: { height: "40", width: "40" },
-        });
-    });
-}
-
-module piesparkline4 {
-    $(function () {
-        var sparkpiesample4 = new ej.Sparkline($("#pie4"), {
-            dataSource: [10, 12, 11],
-            type: "pie",
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            size: { height: "40", width: "40" },
-        });
-    });
-}
-
-
-
-module SplitterComponent {
-    $(function () {
-        var splitterInstance = new ej.Splitter($("#outterSpliter"), {
-            height: "250px",
-            width: "50%",
-            orientation: ej.Orientation.Vertical,
-            properties: [{}, { paneSize: 80 }],
-            isResponsive:true
-        });
-        var splitterInstance1 = new ej.Splitter($("#innerSpliter"), {
-            isResponsive:true,
-        });
-    });
-}
-
-
-module SpreadsheetComponent {
-$(function () {
-        var sample = new ej.Spreadsheet($("#basicSpreadsheet"), {
-            scrollSettings: {
-                height: 550,
-            },
-            importSettings: {
-                importMapper: (<any>window).baseurl + "api/Spreadsheet/Import"
-            },
-            exportSettings: {
-                excelUrl: (<any>window).baseurl + "api/Spreadsheet/ExcelExport",
-                csvUrl: (<any>window).baseurl + "api/Spreadsheet/CsvExport",
-                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();
-                }
-            }
-        });
-    });
-}
-
-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  }
-];
-
-module sunburstcomponent {
-    $(function () {
-        var sunburstsample = new ej.SunburstChart($("#Sunburst"), {
-            valueMemberPath: "EmployeesCount",
-            levels: [
-                { 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,
-            load: function () {
-                var sender = $("#Sunburst").data("ejSunburstChart");
-                var SunBurstTheme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
-                SunBurstTheme = SunBurstTheme.toString();
-                if (SunBurstTheme.indexOf("dark") > -1 || SunBurstTheme.indexOf("contrast") > -1)
-                    SunBurstTheme = "flatdark";
-                else
-                    SunBurstTheme = "flatlight";
-                sender.model.theme = SunBurstTheme;
-            },
-            title: { text: "Employees Count" },
-            zoomSettings: { enable: false },
-            legend: { visible: true, position: 'top' },
-        });
-    });
-}
-
-module TabComponent {
-    $(function () {
-        var sample = new ej.Tab($("#defaultTab"),{
-            width: "500px",
-            collapsible: true,
-            events: "click",
-            heightAdjustMode: ej.Tab.HeightAdjustMode.Content,
-            showCloseButton: true,
-            showRoundedCorner: false
-        });
-    });
-}
-
-module TagCloudComponent {
-    var websiteCollection = [
-        { text: "Google", url: "http://www.google.com", frequency: 12 },
-        { text: "All Things Digital", url: "http://allthingsd.com/", frequency: 3 },
-        { text: "Arts Technica", url: "http://arstechnica.com/", frequency: 8 },
-        { text: "Business Week", url: "http://www.businessweek.com/", frequency: 2 },
-        { text: "Yahoo", url: "http://in.yahoo.com/", frequency: 12 },
-        { text: "Center Networks", url: "http://www.centernetworks.com/", frequency: 5 },
-        { text: "Crave", url: "http://news.cnet.com/crave/", frequency: 8 },
-        { text: "Crunch Gear", url: "http://techcrunch.com/gadgets/", frequency: 20 },
-        { text: "Daily Tech", url: "http://www.dailytech.com/", frequency: 1 },
-        { text: "Electronista", url: "http://www.electronista.com/", frequency: 3 },
-        { text: "Engadget", url: "http://www.engadget.com/", frequency: 5 },
-        { text: "Gearlog", url: "http://www.gearlog.com/", frequency: 9 },
-        { text: "Information Week", url: "http://www.informationweek.com/", frequency: 0 },
-        { text: "PCWorld", url: "http://www.pcworld.com/", frequency: 11 },
-        { text: "Tech Republic", url: "http://techrepublic.com/", frequency: 3 },
-        { text: "Valleywag", url: "http://valleywag.gawker.com/", frequency: 6 },
-        { text: "Rediff", url: "http://in.rediff.com/", frequency: 9 },
-        { text: "WebProNews", url: "http://www.webpronews.com/", frequency: 2 }
-    ];
-
-    $(function () {
-        var sample = new ej.TagCloud($("#techWebList"), {
-            titleText: "Tech Sites",
-            dataSource: websiteCollection,
-            cssClass: "gradient-lime",
-            fields: {
-                text: "text", url: "url", frequency: "frequency"
-            }
-        });
-    });
-}
-
-module EditorComponent {
-    $(function () {
-        var num = new ej.NumericTextbox($("#numeric"), {
-            value: 30,
-            minValue: 1,
-            maxValue: 100,
-            name: "numeric",
-            width: "100%"
-        });
-        var per = new ej.PercentageTextbox($("#percent"), {
-            value: 60,
-            minValue: 10,
-            maxValue: 1000,
-            name: "percent",
-            width: "100%"
-        });
-        var cur = new ej.CurrencyTextbox($("#currency"), {
-            value: 100,
-            minValue: 10,
-            maxValue: 1000,
-            name: "currency",
-            width: "100%"
-        });
-        var mask = new ej.MaskEdit($("#maskedit"), {
-            name: "mask",
-            value: "4242422424",
-            maskFormat: "99 999-99999",
-            width: "100%"
-        })
-    });
-}
-
-
-
-module TileViewComponent {
-    $(function () {
-        var tile1 = new ej.Tile($("#tile1"), {
-            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 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 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 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 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 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 tile13 = new ej.Tile($("#tile13"), {
-            imagePosition:"center",
-			tileSize:"medium",
-			imageUrl:'content/images/tile/windows/favs.png',
-			caption:{text:"Favorites"}
-        });
-    });
-}
-module TimePickerComponent {
-    $(function () {
-        var timeSample = new ej.TimePicker($("#timepick"), {
-            width: "100%"
-        });
-    });
-}
-
-module ToolbarComponent {
-
-    $(function () {
-        var sample = new ej.Toolbar($("#editingToolbar"), {
-            width: "100%",
-            cssClass: "gradient-lime",
-            enableSeparator: true,
-
-            isResponsive: true,
-            orientation: ej.Orientation.Horizontal,
-            showRoundedCorner: true
-        });
-    });
-
-}
-
-module TooltipComponent {
-
-    $(function () {
-
-        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,
-            collision: "fit",
-            containment: ".frame",
-            showRoundedCorner: true,
-            showShadow: true
-        });
-
-        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: {
-                    horizontal: "right",
-                    vertical: "center"
-                },
-                target: {
-                    horizontal: "left",
-                    vertical: "center"
-                }
-            },
-            autoCloseTimeout: 5000,
-            collision: "fit",
-            containment: ".frame",
-            showRoundedCorner: true,
-            showShadow: true
-        });
-
-        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: {
-                    horizontal: "right",
-                    vertical: "center"
-                },
-                target: {
-                    horizontal: "left",
-                    vertical: "center",
-                },
-            },
-            associate: "mousefollow",
-            autoCloseTimeout: 5000,
-            collision: "fit",
-            containment: ".frame",
-            showRoundedCorner: true,
-            showShadow: true
-        });
-    });
-}
-
-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,
-    });
-});
-}
-
-
-var population_data: Array<Object> = [
-    { Continent: "Asia", Country: "Indonesia", Growth: 3, Population: 237641326 },
-    { Continent: "Asia", Country: "Russia", Growth: 2, Population: 152518015 },
-    { Continent: "Asia", Country: "Malaysia", Growth: 1, Population: 29672000 },
-    { Continent: "North America", Country: "United States", Growth: 4, Population: 315645000 },
-    { Continent: "North America", Country: "Mexico", Growth: 2, Population: 112336538 },
-    { Continent: "North America", Country: "Canada", Growth: 1, Population: 39056064 },
-    { Continent: "South America", Country: "Colombia", Growth: 1, Population: 47000000 },
-    { Continent: "South America", Country: "Brazil", Growth: 3, Population: 193946886 },
-    { Continent: "Africa", Country: "Nigeria", Growth: 2, Population: 170901000 },
-    { Continent: "Africa", Country: "Egypt", Growth: 1, Population: 83661000 },
-    { Continent: "Europe", Country: "Germany", Growth: 1, Population: 81993000 },
-    { Continent: "Europe", Country: "France", Growth: 1, Population: 65605000 },
-    { Continent: "Europe", Country: "UK", Growth: 1, Population: 63181775 }
-];
-
-module treemapcomponent {
-    $(function () {
-        var treemapsample = new ej.datavisualization.TreeMap($("#treemap"), {
-            leafItemSettings: { showLabels: true, labelPath: "Country" },
-            rangeColorMapping: [
-                { color: "#77D8D8", legendLabel: "1% Growth", from: 0, to: 1 },
-                { color: "#AED960", from: 0, legendLabel: "2% Growth", to: 2 },
-                { color: "#FFAF51", from: 0, legendLabel: "3% Growth", to: 3 },
-                { color: "#F3D240", from: 0, legendLabel: "4% Growth", to: 4 }
-            ],
-            levels: [
-                { groupPath: "Continent", groupGap: 5, headerHeight: 25, showHeader: true, headerTemplate: 'headertemplate' }
-            ],
-            dataSource: population_data,
-            colorValuePath: "Growth",
-            weightValuePath: "Population",
-            borderThickness: 0,
-            showLegend: true
-        });
-    });
-}
-
-
-
-module TreeViewComponent {
-    $(function () {
-        var tree = new ej.TreeView($("#treeView"), {
-            allowEditing: true,
-            allowDragAndDrop: true,
-            allowDropChild: true,
-            allowDropSibling: true,
-        });
-    });
-}
-
-module UploadboxComponent {
-
-    $(function () {
-        var sample = new ej.Uploadbox($("#UploadDefault"), {
-            saveUrl: (<any>window).baseurl + "api/uploadbox/Save",
-            removeUrl: (<any>window).baseurl + "api/uploadbox/Remove",
-            buttonText: {
-                browse: "Choose File", upload: "Upload", cancel: "Cancel"
-            },
-            cssClass: "gradient- purple",
-            dialogAction: {
-                modal: false, closeOnComplete: false, drag: true
-            },
-            extensionsAllow: ".zip",
-            multipleFilesSelection: true,
-            showFileDetails: true
-        });
-    });
-
-}
-
-module WaitingPopupComponent {
-    $(function () {
-        var sample = new ej.WaitingPopup($("#target"),{
-            showOnInit: true,
-            showImage: true,
-            text: 'waiting&hellip;',
-			target: "#target",
-			appendTo: "#waiting"
-        });
-    });
-
-}
+/* tslint:disable */
+
+ 
+
+module AccordionComponent {
+    $(function () {
+        var sample = new ej.Accordion($("#basicAccordion"), {
+            width: "100%",
+            allowKeyboardNavigation: true,
+            collapseSpeed: 500,
+            collapsible: true,
+            enableAnimation: true,
+            enableMultipleOpen: true,
+            events: "click",
+            expandSpeed: 500,
+            headerSize: "40px",
+            htmlAttributes: { title: "Demo" },
+            selectedItemIndex: 1,
+            showCloseButton: true,
+            showRoundedCorner: true
+        });
+    });
+}
+
+ 
+
+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"), {        
+            width: "100%",
+            watermarkText: "Select a car",
+            dataSource: carList,
+            enableAutoFill: true,
+            showPopupButton: true,
+            multiSelectMode: "delimiter"
+        });  
+    });
+}
+
+
+
+
+
+module Barcodecomponent {
+    $(function () {
+        var barcodesample = new ej.datavisualization.Barcode($("#Barcode"), {
+            text:"http://www.syncfusion.com"
+        });
+    });
+}
+
+
+
+
+
+module Bulletgraphcomponent {
+    $(function () {
+        var bulletsample = new ej.datavisualization.BulletGraph($("#BulletGraph"), {
+            isResponsive: true,
+            load: function () {
+                var sender = $("#BulletGraph").data("ejBulletGraph");
+                var bulletTheme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
+                if (bulletTheme) {
+                    switch (bulletTheme) {
+                        case "flatdark":
+                        case "flatazuredark":
+                        case "flatlimedark":
+                        case "flatsaffrondark":
+                        case "gradientdark":
+                        case "gradientazuredark":
+                        case "gradientlimedark":
+                        case "gradientsaffrondark":
+                        case "flathigh-contrast-01dark":
+                        case "flathigh-contrast-02dark":
+                            bulletTheme = "flatdark";
+                            break;
+                        case "flatoffice-365light":
+                        case "flatmateriallight":
+                            bulletTheme = "material";
+                            break;
+                        default:
+                           bulletTheme = "flatlight";
+                            break;
+                    }
+                    sender.model.theme = bulletTheme;
+                }
+
+            },
+            tooltipSettings: { visible: true },
+            quantitativeScaleSettings: {
+                featureMeasures: [{
+                    value: 8, comparativeMeasureValue:6.7
+                }]
+            },
+            qualitativeRanges: [{
+                rangeEnd: 4.3, rangeStroke:"#ebebeb",
+            },
+                {
+                    rangeEnd: 7.3, rangeStroke:"#d8d8d8"
+                },
+                {
+                    rangeEnd: 10, rangeStroke: "#7f7f7f"
+                }
+            ],
+            captionSettings: {
+                textPosition: 'right', text: 'Revenue YTD',
+                subTitle: {
+                    text: "$ in Thousands", textPosition:"right"
+                }
+            }
+        });
+    });
+}
+
+
+
+
+
+module ButtonComponent {
+    $(function () {
+        var basicButton = new ej.Button($("#buttonnormal"), {
+            size: "large",
+            showRoundedCorner: true,
+            contentType: "textandimage",
+            prefixIcon: "e-icon e-save",
+            text: "Save"
+        });
+        var toggleButton = new ej.ToggleButton($("#TextOnly"), {
+            showRoundedCorner: true,
+            size: "large",
+            contentType: "textandimage",
+            defaultPrefixIcon: "e-icon e-save",
+            activePrefixIcon: "e-icon e-delete",
+            defaultText: "Save",
+            activeText: "Delete"
+        });
+        var splitbuttonnormal = new ej.SplitButton($("#splitbuttonnormal"), {
+            showRoundedCorner: true,
+            size: "large",
+            prefixIcon: "e-icon e-file-empty",
+            targetID: "menu1",
+            contentType: "textandimage",
+            text: "File"
+        });
+        var groupButton = new ej.GroupButton($("#groupButton"), {
+            showRoundedCorner: true,
+            size: "large"
+        });
+        var check1 = new ej.CheckBox($("#check1"), {
+            size: "medium", enableTriState: true
+        });
+        var check2 = new ej.CheckBox($("#check2"), {
+            size: "medium", enableTriState: true
+        });
+        var radio1 = new ej.RadioButton($("#radio1"), {
+            size: "medium"
+        });
+        var radio2 = new ej.RadioButton($("#radio2"), {
+            size: "medium", checked: true
+        });
+    });
+}
+
+
+
+
+module ChartComponent {
+    $(function () {
+        var chartsample = new ej.datavisualization.Chart($("#Chart"), {
+            primaryXAxis: {
+                range: { min: 2005, max: 2011, interval: 1 },
+                title: { text: "Year" },
+                valueType: "category"
+            },
+            primaryYAxis: {
+                range: { min: 25, max: 50, interval: 5 },
+                labelFormat: "{value}%",
+                title: { text: "Efficiency" },
+                
+            },
+            commonSeriesOptions:
+			{
+                type: 'line', enableAnimation: true,
+				tooltip:{ visible :true, template:'Tooltip'},
+                marker:
+                {
+                    shape: 'circle',
+                    size:
+                    {
+                        height: 10, width: 10
+                    },
+                    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'
+                },						
+                {
+                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 () {
+                var sender = $("#Chart").data("ejChart");
+                if (!!window.orientation && sender) {           //to modify chart properties for mobile view
+                    var model = sender.model,
+                        seriesLength = model.series.length;
+                    model.legend.visible = false;
+                    model.size.height = null;
+                    model.size.width = null;
+                    for (var i = 0; i < seriesLength; i++) {
+                        if (!model.series[i].marker)
+                            model.series[i].marker = {};
+                        if (!model.series[i].marker.size)
+                            model.series[i].marker.size = {};
+                        model.series[i].marker.size.width = 6;
+                        model.series[i].marker.size.height = 6;
+                    }
+                    model.primaryXAxis.labelIntersectAction = "rotate45";
+                    if (model.primaryXAxis.title)
+                        model.primaryXAxis.title.text = "";
+                    if (model.primaryYAxis.title)
+                        model.primaryYAxis.title.text = "";
+                    model.primaryXAxis.edgeLabelPlacement = "hide";
+                    model.primaryYAxis.labelIntersectAction = "rotate45";
+                    model.primaryYAxis.edgeLabelPlacement = "hide";
+                }
+                var theme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
+                if (theme) {
+                    switch (theme) {
+                        case "flatdark":
+                        case "flatazuredark":
+                        case "flatlimedark":
+                        case "flatsaffrondark":
+                            theme = "flatdark";
+                            break;
+                        case "gradientlight":
+                        case "gradientazurelight":
+                        case "gradientlimelight":
+                        case "gradientsaffronlight":
+                            theme = "gradientlight";
+                            break;
+                        case "gradientdark":
+                        case "gradientazuredark":
+                        case "gradientlimedark":
+                        case "gradientsaffrondark":
+                            theme = "gradientdark";
+                            break;
+                        case "flatbootstraplight":
+                            theme = "bootstrap";
+                            break;
+                        case "flathigh-contrast-01dark":
+                        case "flathigh-contrast-02dark":
+                            theme = "high-contrast-01";
+                            break;
+                        case "flatmateriallight":
+                        case "flatoffice-365light":
+                            theme = "material";
+                            break;
+
+                        default:
+                            theme = "flatlight";
+                            break;
+                    }
+                    sender.model.theme = theme;                    
+                }
+            },
+            title: { text: 'Efficiency of oil-fired power production' },
+            size: { height: "600" },
+            legend: { visible: true},	
+        });
+    //    chartsample.model.load="loadTheme";
+    });
+}
+
+
+
+
+
+module circulargaugecomponent {
+    $(function () {
+        var circularsample = new ej.datavisualization.CircularGauge($("#CircularGauge"), {
+            enableAnimation: false,
+            isResponsive: true,
+            backgroundColor: "transparent", width: 500,
+            scales: [{
+                showRanges: true,
+                startAngle: 122, sweepAngle: 296, radius: 130, showScaleBar: true, size: 1, maximum: 120, majorIntervalValue: 20, minorIntervalValue: 10,
+                border: {
+                    width: 0.5,
+                },
+                pointers: [{
+                    value: 60,
+                    showBackNeedle: true,
+                    backNeedleLength: 20,
+                    length: 95,
+                    width: 7
+                }],
+                ticks: [{
+                    type: "major",
+                    distanceFromScale: 2,
+                    height: 16,
+                    width: 1, color: "#8c8c8c"
+                }, { type: "minor", height: 8, width: 1, distanceFromScale: 2, color: "#8c8c8c" }],
+                labels: [{
+                    color: "#8c8c8c"
+                }],
+                ranges: [{
+                    distanceFromScale: -30,
+                    startValue: 0,
+                    endValue: 70
+                }, {
+                        distanceFromScale: -30,
+                        startValue: 70,
+                        endValue: 110,
+                        backgroundColor: "#fc0606",
+                        border: { color: "#fc0606" }
+                    },
+                    {
+                        distanceFromScale: -30,
+                        startValue: 110,
+                        endValue: 120,
+                        backgroundColor: "#f5b43f",
+                        border: { color: "#f5b43f" }
+                    }]
+            }]	
+        });
+    });
+}
+
+
+
+
+module ColorPickerComponent {
+    $(function () {
+        var colorSample = new ej.ColorPicker($("#colorpick"), {
+            value: "#278787"
+        });
+    });
+}
+
+
+
+
+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"), {        
+            width: "100%",
+            placeholder: "Select a Bike",
+			fields: { text: "text", value: "empid" },
+            dataSource: BikeList,
+            autofill: true
+        });  
+    });
+}
+
+
+
+
+
+module DatePickerComponent {
+    $(function () {
+        var dateSample = new ej.DatePicker($("#datepick"), {
+            width: "100%"
+        });
+    });
+}
+
+
+
+
+module DateTimePickerComponent {
+    $(function () {
+        var datetimeSample = new ej.DateRangePicker($("#daterangepick"), {
+            width: "100%"
+        });
+    });
+}
+
+
+
+module DateTimePickerComponent {
+    $(function () {
+        var datetimeSample = new ej.DateTimePicker($("#datetimepick"), {
+            width: "100%"
+        });
+    });
+}
+
+
+
+$(function () {
+    var diagram = new ej.datavisualization.Diagram($("#diagram"), {
+        width: "1000px",
+        height: "600px",
+        pageSettings: {
+            //Sets page size
+            pageHeight: 500,
+            pageWidth: 500,
+            //Customizes the appearance of page
+            pageBorderWidth: 4,
+            pageBackgroundColor: "white",
+            pageBorderColor: "lightgray",
+            pageMargin: 25,
+            showPageBreak: true,
+            multiplePage: true,
+            pageOrientation: ej.datavisualization.Diagram.PageOrientations.Portrait
+        },
+        scrollSettings: {
+            horizontalOffset: 0,
+            verticalOffset: 0
+        },
+        snapSettings: {
+            snapConstraints: ej.datavisualization.Diagram.SnapConstraints.ShowLines
+        },
+        nodes: [
+            createNode({ name: "NewIdea", width: 150, height: 60, offsetX: 300, offsetY: 60, labels: [createLabel({ "text": "New idea identified" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Terminator }),
+            createNode({ name: "Meeting", width: 150, height: 60, offsetX: 300, offsetY: 155, labels: [createLabel({ "text": "Meeting with board" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
+            createNode({
+                name: "BoardDecision", width: 150, height: 110, offsetX: 300, offsetY: 280, labels: [createLabel({ text: "Board decides \nwhether \nto proceed", wrapText: "true", "margin": { left: 20, top: 0, right: 20, bottom: 0 } })],
+                type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Decision
+            }),
+            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 }),
+            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 })
+        ],
+        connectors: [
+            createConnector({ name: "connector1", sourceNode: "NewIdea", targetNode: "Meeting" }),
+            createConnector({ name: "connector2", sourceNode: "Meeting", targetNode: "BoardDecision" }),
+            createConnector({ name: "connector3", sourceNode: "BoardDecision", targetNode: "Project", labels: [createLabel({ "text": "Yes" })] }),
+            createConnector({ name: "connector4", sourceNode: "Project", targetNode: "End", labels: [createLabel({ "text": "Yes" })] }),
+            createConnector({ name: "connector5", sourceNode: "BoardDecision", targetNode: "Reject", labels: [createLabel({ "text": "No" })] }),
+            createConnector({ name: "connector6", sourceNode: "Project", targetNode: "Resources", labels: [createLabel({ "text": "No" })] })
+        ]
+    });
+    
+});
+
+function createNode(option: ej.datavisualization.Diagram.Node) {
+    if (!option.fillColor) {
+        option.borderColor = "#1BA0E2";
+        option.fillColor = "#1BA0E2";
+    }
+    option.labels[0].fontColor = "white";
+    return option;
+}
+
+function createConnector(option: ej.datavisualization.Diagram.Connector) {
+    option.targetDecorator = { shape: ej.datavisualization.Diagram.DecoratorShapes.Arrow, borderColor: "#606060", width: 10, height: 10 };
+    option.lineColor = "#606060";
+    if (option.labels && option.labels.length > 0) {
+        option.labels[0].fillColor = "white";
+    }
+    return option;
+}
+
+function createLabel(options : any) {
+    return options;
+}
+
+ 
+
+module DialogComponent {
+    $(function () {
+        var dialogInstance = new ej.Dialog($("#basicDialog"), {
+            width: 550,
+            minWidth: 310,
+            minHeight: 215,
+			target:".control",
+            close:()=>{
+			$("#btnOpen").show();}
+        });
+        var btnInstance = new ej.Button($("#btnOpen"), {
+            size: "medium",
+            click: ()=>{
+			$("#btnOpen").hide();
+        $("#basicDialog").ejDialog("open");},
+            type: "button",
+            height: 30,
+            width: 150
+        });
+    });
+}
+
+
+
+
+module digitalgaugecomponent {
+    $(function () {
+        var digitalgaugesample = new ej.datavisualization.DigitalGauge($("#DigitalGauge"), {
+            width: 525,
+            height: 305,
+            isResponsive: true,
+            items: [{
+                segmentSettings: {
+                    width: 1,
+                    spacing: 0,
+                    color: "#8c8c8c"
+                },
+                characterSettings: {
+                    opacity: 0.8,
+                },
+                value: "Syncfusion",
+                position: { x: 52, y: 52 }
+            }]
+        });
+    });
+}
+
+
+		
+
+
+
+module DropDownListComponent {
+    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 sample = new ej.DropDownList($("#bikeList"),{
+            dataSource: BikeList,
+            width: "100%",
+            watermarkText: "Select a bike",
+            fields: { id: "empid", text: "text", value: "text" },
+            enableFilterSearch: true,
+            caseSensitiveSearch: true,
+            enableIncrementalSearch: true,
+            enablePopupResize: true, 
+            delimiterChar: ";",
+            multiSelectMode: ej.MultiSelectMode.Delimiter,
+            maxPopupHeight: "300px",
+            minPopupHeight: "150px", 
+            maxPopupWidth: "500px", 
+            minPopupWidth: "350px",
+            showCheckbox: true,
+            showRoundedCorner: true
+        });
+    });
+
+}
+
+
+
+
+
+
+module ExplorerComponent {
+    $(function () {
+        var file = new ej.FileExplorer($("#fileExplorer"), {
+            path: (<any>window).baseurl + "Content/FileBrowser/",
+            width: "100%",
+            minWidth: "150px",
+            layout: "tile",
+            isResponsive: true,
+            ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
+        });
+    });
+}
+
+
+
+
+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,
+    });
+}); 
+}
+
+
+
+module GridComponent {
+    $(function () {
+        var gridInstance = new ej.Grid($("#Grid"), {
+            dataSource: (<any>window).gridData,
+            allowGrouping: true,
+            allowSorting: true,
+            allowMultiSorting: true,
+            enableAltRow: true,
+            allowPaging: true,
+            allowReordering: true,
+            allowResizing: true,
+            allowFiltering: true,
+            allowScrolling: true,
+            enableRowHover: true,
+            selectionType: "multiple",
+            selectionSettings: { enableToggle: true, selectionMode: ["row", "cell", "column"] },
+            allowKeyboardNavigation: true,
+            editSettings: { allowEditing: true, allowAdding: true, allowDeleting: true, allowEditOnDblClick: true, showDeleteConfirmDialog: true },
+            toolbarSettings: { showToolbar: true, toolbarItems: ["add", "edit", "delete", "update", "cancel", "search"] },
+            columns: [
+                { field: "OrderID", headerText: "Order ID", isPrimaryKey: true, width: 75, textAlign: ej.TextAlign.Right },
+                { field: "CustomerID", headerText: "Customer ID", editType: ej.Grid.EditingType.String, width: 80 },
+                { field: "EmployeeID", headerText: "Employee ID", width: 75, editType: ej.Grid.EditingType.Dropdown, textAlign: ej.TextAlign.Right, priority: 4 },
+                { field: "Freight", width: 75, format: "{0:C}", editType: ej.Grid.EditingType.Numeric, textAlign: ej.TextAlign.Right, priority: 3 },
+                { field: "OrderDate", headerText: "Order Date", width: 80, format: "{0:MM/dd/yyyy}", textAlign: ej.TextAlign.Right, priority: 2 },
+                { field: "ShipCity", headerText: "Ship City", editType: ej.Grid.EditingType.Dropdown, width: 110, priority: 2 }
+            ],
+            isResponsive: true,
+            minWidth: 700,
+            showSummary: true,
+            summaryRows: [{ title: "Sum", summaryColumns: [{ summaryType: ej.Grid.SummaryType.Sum, displayColumn: "Freight", dataMember: "Freight", format: "{0:C2}" }] }]
+        });
+    });
+}
+
+
+
+var columns = ["Vegie-spread", "Tofuaa", "Alice Mutton", "Konbu", "Fl�temysost"]
+var itemSource: any[] = [];
+for (var i = 0; i < columns.length; i++) {
+    for (var j = 0; j < 6; j++) {
+        var value = Math.floor((Math.random() * 100) + 1);
+        itemSource.push({ ProductName: columns[i], Year: "Y" + (2011 + j), Value: value })
+    }
+}
+
+$(function () {
+    var heatmap = new ej.datavisualization.HeatMap($("#heatmap"), {
+        colorMappingCollection: [
+            { value: 0, color: "#8ec8f8", label: { text: "0" } },
+            { value: 100, color: "#0d47a1", label: { text: "100" } }
+        ],
+        isResponsive: true,
+        itemsSource: itemSource,
+        width: "100%",
+        itemsMapping: {
+            column: { propertyName: "ProductName", displayName: "Product Name" },
+            row: { propertyName: "Year", displayName: "Year" },
+            value: { propertyName: "Value" },
+            columnMapping: [
+                { "propertyName": columns[0], "displayName": columns[0] },
+                { "propertyName": columns[1], "displayName": columns[1] },
+                { "propertyName": columns[2], "displayName": columns[2] },
+                { "propertyName": columns[3], "displayName": columns[3] },
+                { "propertyName": columns[4], "displayName": columns[4] },
+                { "propertyName": columns[5], "displayName": columns[5] }
+            ],
+            headerMapping: { propertyName: "Year", displayName: "Year", columnStyle: { width: 105, textAlign: "right" } },
+        },
+        legendCollection: ["heatmap_legend"]
+    });
+    var heatmaplegend = new ej.datavisualization.HeatMapLegend($("#heatmap_legend"), {
+        colorMappingCollection: [
+            { value: 0, color: "#8ec8f8", label: { text: "0" } },
+            { value: 100, color: "#0d47a1", label: { text: "100" } }
+        ],
+        height: "50px",
+        width: "75%",
+        isResponsive: true
+    });
+});
+
+
+
+
+module KanbanComponent {
+    $(function () {
+        var sample = new ej.Kanban($("#Kanban"), {
+           dataSource: new ej.DataManager((<any>window).kanbanData).executeLocal(new ej.Query().take(20)),
+            columns: [
+                { headerText: "Backlog", key: "Open" },
+                { headerText: "In Progress", key: "InProgress" },
+                { headerText: "Testing", key: "Testing" },
+                { headerText: "Done", key: "Close" }
+            ],
+            keyField: "Status",
+            allowTitle: true,
+            fields: {
+                content: "Summary",
+                primaryKey: "Id",
+                imageUrl: "ImgUrl"
+            },
+            allowSelection: false
+        });
+    });
+}
+
+ 
+
+
+module lineargaugecomponent {
+    $(function () {
+        var linearsample = new ej.datavisualization.LinearGauge($("#LinearGauge"), {
+            labelColor: "#8c8c8c", width: 500,
+            isResponsive: true, enableAnimation: false,
+            scales: [{
+                width: 4, border: { color: "transparent", width: 0 }, showBarPointers: false, showRanges: true, length: 310,
+                position: { x: 52, y: 50 }, markerPointers: [{
+                    value: 50, length: 10, width: 10, backgroundColor: "#4D4D4D", border: { color: "#4D4D4D" }
+                }],
+                labels: [{ font: { size: "11px", fontFamily: "Segoe UI", fontStyle: "bold" }, distanceFromScale: { x: -13 } }],
+                ticks: [{ type: "majorinterval", width: 1, color: "#8c8c8c" }],
+                ranges: [{
+                    endValue: 60,
+                    startValue: 0,
+                    backgroundColor: "#F6B53F",
+                    border: { color: "#F6B53F" }, startWidth: 4, endWidth: 4
+                }, {
+                        endValue: 100,
+                        startValue: 60,
+                        backgroundColor: "#E94649",
+                        border: { color: "#E94649" }, startWidth: 4, endWidth: 4
+                    }]
+            }]		
+        });
+    });
+}
+
+	
+
+ 
+
+module ListBoxComponent {
+    $(function () {
+        var listboxInstance = new ej.ListBox($("#selectcar"), {
+            showCheckbox: true
+        });
+    });
+}
+
+ 
+
+module ListviewComponent {
+    $(function () {
+        var listviewInstance = new ej.ListView($("#defaultlistview"), {
+            enableCheckMark: true, 
+		    width: 400
+        });
+    });
+}
+
+
+var world_map=
+    {
+        "type": "FeatureCollection",
+        "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
+        "features": [
+            { "type": "Feature", "properties": { "admin": "Afghanistan", "name": "Afghanistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[61.21081709172573, 35.650072333309218], [62.230651483005879, 35.270663967422287], [62.984662306576588, 35.404040839167614], [63.193538445900337, 35.857165635718907], [63.982895949158696, 36.007957465146596], [64.546479119733888, 36.31207326918426], [64.746105177677393, 37.111817735333297], [65.588947788357828, 37.305216783185628], [65.745630731066811, 37.661164048812061], [66.217384881459324, 37.393790188133913], [66.518606805288655, 37.362784328758785], [67.075782098259609, 37.35614390720928], [67.829999627559502, 37.144994004864678], [68.135562371701369, 37.023115139304302], [68.859445835245921, 37.344335842430588], [69.196272820924364, 37.15114350030742], [69.518785434857946, 37.608996690413413], [70.116578403610319, 37.588222764632086], [70.270574171840124, 37.73516469985401], [70.376304152309274, 38.138395901027515], [70.806820509732873, 38.486281643216408], [71.348131137990251, 38.258905341132156], [71.239403924448155, 37.953265082341879], [71.541917759084768, 37.905774441065631], [71.448693475230229, 37.065644843080513], [71.84463829945058, 36.738171291646914], [72.193040805962383, 36.94828766534566], [72.636889682917271, 37.047558091778349], [73.260055779924983, 37.495256862938994], [73.948695916646486, 37.421566270490786], [74.980002475895404, 37.419990139305888], [75.158027785140902, 37.13303091078911], [74.575892775372964, 37.02084137628345], [74.067551710917812, 36.836175645488446], [72.920024855444453, 36.720007025696312], [71.846291945283909, 36.509942328429851], [71.262348260385735, 36.074387518857797], [71.498767938121077, 35.650563259415996], [71.613076206350698, 35.153203436822857], [71.115018751921625, 34.733125718722228], [71.156773309213449, 34.348911444632144], [70.881803012988385, 33.988855902638512], [69.93054324735958, 34.020120144175102], [70.323594191371583, 33.358532619758385], [69.687147251264847, 33.105498969041228], [69.262522007122541, 32.501944078088293], [69.317764113242546, 31.901412258424436], [68.926676873657655, 31.620189113892064], [68.556932000609308, 31.713310044882011], [67.792689243444769, 31.582930406209623], [67.683393589147457, 31.303154201781414], [66.938891229118454, 31.304911200479346], [66.38145755398601, 30.738899237586448], [66.346472609324408, 29.88794342703617], [65.046862013616092, 29.472180691031902], [64.350418735618504, 29.560030625928089], [64.148002150331237, 29.340819200145965], [63.550260858011164, 29.468330796826162], [62.549856805272775, 29.318572496044304], [60.874248488208778, 29.829238999952604], [61.78122155136343, 30.735850328081231], [61.699314406180811, 31.379506130492661], [60.941944614511115, 31.548074652628745], [60.863654819588952, 32.182919623334421], [60.536077915290761, 32.981268825811561], [60.963700392505991, 33.528832302376252], [60.528429803311575, 33.676446031217999], [60.80319339380744, 34.404101874319856], [61.21081709172573, 35.650072333309218]]] } },
+            { "type": "Feature", "properties": { "admin": "Angola", "name": "Angola", "continent": "Africa" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[16.326528354567042, -5.877470391466217], [16.573179965896141, -6.622644545115092], [16.860190870845226, -7.222297865429978], [17.089995965247166, -7.545688978712474], [17.472970004962288, -8.068551120641656], [18.134221632569048, -7.987677504104865], [18.464175652752683, -7.847014255406475], [19.016751743249664, -7.988245944860138], [19.166613396896079, -7.738183688999724], [19.417502475673214, -7.155428562044277], [20.037723016040214, -7.116361179231658], [20.091621534920616, -6.943090101756949], [20.60182295093832, -6.939317722199688], [20.514748162526526, -7.299605808138663], [21.728110792739752, -7.290872491081315], [21.74645592620336, -7.920084730667113], [21.949130893652033, -8.305900974158304], [21.80180138518795, -8.908706556842985], [21.875181919042397, -9.523707777548564], [22.208753289486417, -9.894796237836529], [22.155268182064326, -11.084801120653777], [22.402798292742428, -10.99307545333569], [22.837345411884762, -11.017621758674334], [23.456790805767461, -10.867863457892481], [23.912215203555743, -10.926826267137541], [24.017893507592614, -11.237298272347115], [23.904153680118235, -11.722281589406332], [24.079905226342895, -12.191296888887305], [23.930922072045373, -12.565847670138821], [24.0161365088947, -12.91104623784855], [21.933886346125941, -12.898437188369353], [21.887842644953871, -16.080310153876891], [22.562478468524283, -16.898451429921831], [23.215048455506086, -17.523116143465952], [21.377176141045592, -17.930636488519706], [18.956186964603628, -17.789094740472233], [18.263309360434217, -17.309950860262003], [14.209706658595049, -17.353100681225708], [14.058501417709035, -17.423380629142653], [13.462362094789963, -16.971211846588741], [12.814081251688405, -16.941342868724075], [12.21546146001938, -17.111668389558059], [11.734198846085146, -17.301889336824498], [11.640096062881609, -16.673142185129205], [11.778537224991563, -15.793816013250687], [12.123580763404444, -14.878316338767927], [12.175618930722264, -14.449143568583889], [12.500095249083014, -13.547699883684398], [12.738478631245439, -13.137905775609934], [13.312913852601834, -12.483630466362511], [13.633721144269824, -12.038644707897189], [13.738727654686924, -11.297863050993142], [13.686379428775293, -10.73107594161584], [13.38732791510216, -10.373578383020726], [13.120987583069873, -9.766897067914112], [12.875369500386567, -9.166933689005488], [12.929061313537797, -8.959091078327573], [13.23643273280987, -8.56262948978434], [12.933040398824314, -7.596538588087752], [12.728298374083916, -6.927122084178803], [12.227347039446441, -6.294447523629372], [12.322431674863562, -6.100092461779651], [12.735171339578695, -5.965682061388476], [13.024869419006988, -5.984388929878106], [13.375597364971892, -5.864241224799555], [16.326528354567042, -5.877470391466217]]], [[[12.436688266660919, -5.684303887559223], [12.182336866920277, -5.789930515163801], [11.914963006242115, -5.037986748884733], [12.318607618873923, -4.606230157086158], [12.620759718484548, -4.438023369976121], [12.995517205465202, -4.781103203961918], [12.631611769265842, -4.991271254092935], [12.468004184629759, -5.248361504744991], [12.436688266660919, -5.684303887559223]]]] } },
+            { "type": "Feature", "properties": { "admin": "Albania", "name": "Albania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.590247430104906, 41.855404161133592], [20.463175083099195, 41.515089016275333], [20.605181919037356, 41.086226304685219], [21.020040317476397, 40.842726955725873], [20.99998986174722, 40.580003973953964], [20.67499677906363, 40.43499990494302], [20.61500044117275, 40.110006822259365], [20.150015903410516, 39.624997666983965], [19.980000441170144, 39.694993394523401], [19.9600016618732, 39.915005805006039], [19.40608198413673, 40.250773423822459], [19.319058872157139, 40.727230129553554], [19.403549838954287, 41.409565741535445], [19.540027296637099, 41.71998607031275], [19.371768833094958, 41.87754751237064], [19.304486118250786, 42.195745144207812], [19.738051385179627, 42.688247382165564], [19.801613396898681, 42.500093492190835], [20.0707, 42.58863], [20.28375451018189, 42.320259507815074], [20.52295, 42.21787], [20.590247430104906, 41.855404161133592]]] } },
+            { "type": "Feature", "properties": { "admin": "United Arab Emirates", "name": "United Arab Emirates", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[51.579518670463258, 24.245497137951102], [51.757440626844172, 24.294072984305462], [51.794389275932865, 24.019826158132499], [52.577080519425593, 24.177439276622703], [53.404006788960139, 24.151316840099167], [54.008000929587574, 24.121757920828212], [54.693023716048614, 24.797892360935084], [55.439024692614126, 25.439145209244934], [56.070820753814544, 26.055464178973978], [56.261041701080948, 25.714606431576762], [56.396847365143991, 24.924732163995483], [55.886232537667993, 24.92083059335744], [55.804118686756212, 24.269604193615258], [55.981213820220454, 24.130542914317822], [55.528631626208231, 23.933604030853498], [55.525841098864461, 23.524869289640929], [55.234489373602869, 23.110992743415316], [55.208341098863187, 22.708329982997039], [55.006803012924898, 22.496947536707129], [52.000733270074321, 23.001154486578937], [51.617707553926969, 24.014219265228824], [51.579518670463258, 24.245497137951102]]] } },
+            { "type": "Feature", "properties": { "admin": "Argentina", "name": "Argentina", "continent": "South America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-65.5, -55.2], [-66.45, -55.25], [-66.95992, -54.89681], [-67.56244, -54.87001], [-68.63335, -54.8695], [-68.634010227583147, -52.636370458874453], [-68.25, -53.1], [-67.75, -53.85], [-66.45, -54.45], [-65.05, -54.7], [-65.5, -55.2]]], [[[-64.964892137294569, -22.075861504812348], [-64.377021043542257, -22.79809132252354], [-63.986838141522462, -21.993644301035953], [-62.84646847192154, -22.034985446869452], [-62.685057135657885, -22.249029229422401], [-60.846564704009928, -23.880712579038299], [-60.028966030503973, -24.032796319273238], [-58.807128465394939, -24.771459242453268], [-57.777217169817952, -25.162339776309032], [-57.633660040911124, -25.603656508081666], [-58.618173590719707, -27.123718763947117], [-57.609759690976134, -27.395898532828419], [-56.486701626192989, -27.548499037386243], [-55.695845506398186, -27.387837009390815], [-54.788794928595038, -26.621785577096087], [-54.625290696823541, -25.739255466415479], [-54.130049607954412, -25.547639255477243], [-53.628348965048716, -26.12486500417743], [-53.648735317587885, -26.923472588816104], [-54.490725267135517, -27.474756768505767], [-55.162286342984586, -27.881915378533414], [-56.290899624239088, -28.852760512000849], [-57.62513342958291, -30.21629485445424], [-57.874937303281897, -31.016556084926158], [-58.14244035504074, -32.044503676076182], [-58.132647671121404, -33.040566908502008], [-58.349611172098818, -33.263188978815428], [-58.427074144104367, -33.909454441057541], [-58.495442064026541, -34.4314897600701], [-57.225829637263629, -35.288026625307886], [-57.362358771378737, -35.977390232081497], [-56.737487352105447, -36.413125909166574], [-56.788285285048339, -36.901571547189327], [-57.749156867083421, -38.183870538079901], [-59.231857062401865, -38.720220228837199], [-61.2374452378656, -38.92842457454114], [-62.335956997310134, -38.827707208004362], [-62.125763108962914, -39.424104913084868], [-62.33053097191943, -40.172586358400316], [-62.145994432205228, -40.676896661136723], [-62.74580278181697, -41.028761488612083], [-63.770494757732514, -41.166789239263657], [-64.732089809819698, -40.802677097335128], [-65.118035244391578, -41.064314874028874], [-64.97856055363583, -42.058000990569312], [-64.303407965742466, -42.359016208669495], [-63.755947842042339, -42.043686618824495], [-63.458059048095883, -42.563138116222355], [-64.378803880456289, -42.873558444999638], [-65.181803961839691, -43.495380954767782], [-65.328823411710133, -44.501366062193689], [-65.565268927661592, -45.03678557716978], [-66.509965786389344, -45.039627780945843], [-67.293793911392427, -45.551896254255183], [-67.580546434180079, -46.301772963242527], [-66.597066413017259, -47.033924655953804], [-65.641026577401433, -47.23613453551188], [-65.98508826360073, -48.133289076531128], [-67.166178961847649, -48.697337334996931], [-67.816087612566449, -49.869668877970412], [-68.728745083273154, -50.26421843851886], [-69.138539191347789, -50.732510267947788], [-68.815561489523517, -51.771104011594097], [-68.149994879820397, -52.349983406127699], [-68.571545376241332, -52.299443855346247], [-69.498362189396076, -52.142760912637236], [-71.914803839796321, -52.009022305865912], [-72.329403856074023, -51.425956312872394], [-72.309973517532342, -50.677009779666342], [-72.975746832964617, -50.741450290734299], [-73.328050910114456, -50.378785088909865], [-73.415435757120022, -49.318436374712952], [-72.648247443314929, -48.878618259476774], [-72.331160854771937, -48.244238376661819], [-72.44735531278026, -47.738532810253517], [-71.917258470330196, -46.884838148791786], [-71.552009446891233, -45.560732924177117], [-71.659315558545316, -44.973688653341434], [-71.222778896759721, -44.784242852559409], [-71.329800788036195, -44.407521661151677], [-71.793622606071935, -44.207172133156099], [-71.464056159130493, -43.787611179378324], [-71.915423956983901, -43.408564548517404], [-72.148898078078517, -42.254888197601375], [-71.746803758415453, -42.051386407235988], [-71.915734015577542, -40.832339369470716], [-71.680761277946445, -39.808164157878061], [-71.413516608349042, -38.916022230791107], [-70.814664272734703, -38.552995293940732], [-71.118625047475419, -37.576827487947192], [-71.121880662709771, -36.65812387466233], [-70.364769253201658, -36.005088799789931], [-70.388049485949082, -35.169687595359441], [-69.817309129501453, -34.193571465798279], [-69.814776984319209, -33.273886000299839], [-70.074399380153622, -33.09120981214803], [-70.535068935819439, -31.365010267870279], [-69.919008348251921, -30.336339206668306], [-70.013550381129861, -29.367922865518544], [-69.656130337183143, -28.459141127233686], [-69.001234910748266, -27.521213881136127], [-68.295541551370391, -26.899339694935787], [-68.594799770772667, -26.50690886811126], [-68.386001146097342, -26.185016371365229], [-68.417652960876111, -24.518554782816874], [-67.328442959244128, -24.025303236590908], [-66.985233934177629, -22.986348565362825], [-67.106673550063604, -22.735924574476392], [-66.273339402924833, -21.832310479420677], [-64.964892137294569, -22.075861504812348]]]] } },
+            { "type": "Feature", "properties": { "admin": "Armenia", "name": "Armenia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[43.582745802592726, 41.09214325618256], [44.972480096218071, 41.248128567055588], [45.179495883979335, 40.985353908851401], [45.560351189970433, 40.812289537105919], [45.359174839058156, 40.561503811193447], [45.891907179555076, 40.218475653639992], [45.610012241402913, 39.899993801425175], [46.034534132680662, 39.628020738273058], [46.483498976432443, 39.464154771475528], [46.505719842317966, 38.770605373686287], [46.143623081248812, 38.74120148371221], [45.735379266143006, 39.319719143219736], [45.739978468616975, 39.473999131827114], [45.298144972521456, 39.471751207022422], [45.00198733905674, 39.740003567049548], [44.793989699081934, 39.713002631177041], [44.400008579288695, 40.005000311842267], [43.656436395040934, 40.253563951166178], [43.752657911968399, 40.740200914058754], [43.582745802592726, 41.09214325618256]]] } },
+            { "type": "Feature", "properties": { "admin": "French Southern and Antarctic Lands", "name": "Fr. S. Antarctic Lands", "continent": "Seven seas (open ocean)" }, "geometry": { "type": "Polygon", "coordinates": [[[68.935, -48.625], [69.58, -48.94], [70.525, -49.065], [70.56, -49.255], [70.28, -49.71], [68.745, -49.775], [68.72, -49.2425], [68.8675, -48.83], [68.935, -48.625]]] } },
+            { "type": "Feature", "properties": { "admin": "Australia", "name": "Australia", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[145.397978143494782, -40.792548516605883], [146.364120721623692, -41.137695407883335], [146.908583612250823, -41.000546156580668], [147.689259474884125, -40.808258152022681], [148.289067824495987, -40.875437514002122], [148.359864536735785, -42.062445163746439], [148.017301467073082, -42.40702361426861], [147.914051955353784, -43.211522312188485], [147.564564243763982, -42.937688897473855], [146.87034305235494, -43.634597263362082], [146.663327264593647, -43.580853773778543], [146.048377720320389, -43.54974456153888], [145.431929559510536, -42.693776137056268], [145.295090366801674, -42.03360971452755], [144.7180713238306, -41.162551771815707], [144.743754510679622, -40.703975111657705], [145.397978143494782, -40.792548516605883]]], [[[143.561811151299935, -13.763655694232209], [143.922099237238882, -14.548310642152], [144.563713820574804, -14.171176039285879], [144.894908075133515, -14.594457696188622], [145.374723748963419, -14.984976495018284], [145.271991001567244, -15.428205254785691], [145.48525963763575, -16.285672295804769], [145.637033319276952, -16.784918308176611], [145.888904250267672, -16.906926364817647], [146.160308872664473, -17.76165455492524], [146.063673944278662, -18.280072523677315], [146.387478469019584, -18.958274021075905], [147.471081577747896, -19.480722751546676], [148.177601760042478, -19.955939222902767], [148.848413527623222, -20.391209812097252], [148.717465448195583, -20.633468926681513], [149.289420200802056, -21.260510756111096], [149.678337030230637, -22.342511895438388], [150.07738244038859, -22.122783705333315], [150.482939081015161, -22.556142266533012], [150.727265252891158, -22.402404880464655], [150.899554478152254, -23.462236830338679], [151.609175246384211, -24.076256198830755], [152.07353966695905, -24.45788665130619], [152.855197381805908, -25.267501316023008], [153.136162144176751, -26.071173191026187], [153.161948683890358, -26.641319268502439], [153.09290897034856, -27.260299574494503], [153.569469028944184, -28.110066827102099], [153.512108189100218, -28.995077406532751], [153.339095493787056, -29.458201592732443], [153.069241164358857, -30.350240166954809], [153.089601678681788, -30.923641859665445], [152.891577590139377, -31.640445651985949], [152.450002476205327, -32.550002536755237], [151.709117466436766, -33.041342054986337], [151.343971795862387, -33.816023451473846], [151.010555454715103, -34.310360202777879], [150.714139439089024, -35.173459974916803], [150.328219842733233, -35.671879164371923], [150.075212030232251, -36.420205580390508], [149.946124302367139, -37.109052422841224], [149.997283970336127, -37.425260512035123], [149.423882277625523, -37.772681166333463], [148.304622430615893, -37.809061374666875], [147.38173302631526, -38.219217217767543], [146.922122837511324, -38.606532077795116], [146.317921991154776, -39.035756524411433], [145.489652134380549, -38.593767999019043], [144.876976353128157, -38.41744801203911], [145.032212355732952, -37.896187839510972], [144.485682407814011, -38.085323581699257], [143.609973586196077, -38.809465427405321], [142.745426873952965, -38.538267510737519], [142.17832970598198, -38.380034275059835], [141.606581659104677, -38.308514092767872], [140.638578729413211, -38.019332777662541], [139.992158237874321, -37.402936293285094], [139.806588169514043, -36.643602797188272], [139.574147577065219, -36.138362318670666], [139.082808058834075, -35.732754001611774], [138.120747918856296, -35.612296237939397], [138.449461704664998, -35.127261244447887], [138.207564325106659, -34.384722588845925], [137.719170363516128, -35.07682504653102], [136.829405552314711, -35.260534763328614], [137.352371047108477, -34.707338555644093], [137.503886346588331, -34.130267836240769], [137.890116001537649, -33.640478610978327], [137.810327590079112, -32.900007012668105], [136.996837192940347, -33.752771498348629], [136.372069126531642, -34.094766127256186], [135.98904341038434, -34.89011809666048], [135.208212518454104, -34.478670342752601], [135.239218377829161, -33.947953383114971], [134.613416782774607, -33.222778008763136], [134.085903761939107, -32.848072198214759], [134.273902622617015, -32.617233575166949], [132.990776808809812, -32.011224053680188], [132.288080682504869, -31.982646986622761], [131.326330601120901, -31.495803318001041], [129.535793898639668, -31.590422865527476], [128.240937534702198, -31.948488864877849], [127.102867466338282, -32.282266941051041], [126.148713820501129, -32.2159660784206], [125.088623488465586, -32.728751316052829], [124.22164798390493, -32.959486586236061], [124.028946567888511, -33.483847344701708], [123.65966678273071, -33.890179131812722], [122.811036411633609, -33.914467054989835], [122.18306440642283, -34.003402194964217], [121.299190708502579, -33.821036065406126], [120.580268182458113, -33.930176690406618], [119.893695103028222, -33.976065362281808], [119.298899367348781, -34.50936614353396], [119.007340936357977, -34.464149265278529], [118.505717808100769, -34.746819349915093], [118.024971958489516, -35.064732761374707], [117.295507440257438, -35.025458672832862], [116.62510908413492, -35.025096937806829], [115.564346958479689, -34.386427911111547], [115.026808709779516, -34.196517022438918], [115.048616164206763, -33.623425388322026], [115.545123325667078, -33.487257989232951], [115.714673700016661, -33.259571628554944], [115.679378696761376, -32.900368747694124], [115.801645135563959, -32.205062351207026], [115.689610630355105, -31.612437025683782], [115.160909051576937, -30.601594333622455], [114.99704308477942, -30.030724786094162], [115.040037876446249, -29.461095472940794], [114.64197431850198, -28.810230808224706], [114.61649783738217, -28.516398614213042], [114.173579136208446, -28.118076674107321], [114.048883905088132, -27.33476531342712], [113.477497593236876, -26.543134047147898], [113.338953078262477, -26.116545098578477], [113.77835778204026, -26.549025160429174], [113.440962355606587, -25.621278171493152], [113.936901076311642, -25.911234633082877], [114.232852004047288, -26.298446140245868], [114.216160516417006, -25.786281019801105], [113.721255324357685, -24.998938897402123], [113.625343866024025, -24.683971042583146], [113.393523390762667, -24.384764499613262], [113.502043898575607, -23.80635019297025], [113.706992629045146, -23.56021534596406], [113.843418410295669, -23.059987481378734], [113.736551548316072, -22.475475355725372], [114.149756300921865, -21.755881036061009], [114.225307244932651, -22.51748829517863], [114.64776207891866, -21.829519952076904], [115.460167270979298, -21.495173435148541], [115.94737267462699, -21.068687839443708], [116.711615431791529, -20.701681817306817], [117.166316359527684, -20.623598728113802], [117.441545037914238, -20.746898695562162], [118.229558953932951, -20.374208265873232], [118.836085239742701, -20.263310642174822], [118.987807244951753, -20.044202569257319], [119.252493931150624, -19.952941989829835], [119.805225050944543, -19.976506442954978], [120.856220330896633, -19.683707777589188], [121.399856398607199, -19.239755547769729], [121.655137974129062, -18.70531788500713], [122.241665480641757, -18.197648614171765], [122.286623976735655, -17.798603204013911], [122.312772251475408, -17.254967136303446], [123.012574497571904, -16.405199883695854], [123.433789097183009, -17.268558037996225], [123.859344517106592, -17.069035332917249], [123.503242222183232, -16.596506036040363], [123.817073195491915, -16.11131601325199], [124.258286574399847, -16.32794361741956], [124.379726190285794, -15.567059828353973], [124.926152785340022, -15.07510019293532], [125.167275018413875, -14.680395603090004], [125.670086704613823, -14.510070082256018], [125.685796340030493, -14.230655612853834], [126.125149367376096, -14.347340996968949], [126.142822707219864, -14.095986830301211], [126.582589146023736, -13.95279143642041], [127.065867140817332, -13.817967624570922], [127.804633416861932, -14.276906019755042], [128.359689976108939, -14.869169610252253], [128.985543247595899, -14.875990899314738], [129.621473423379598, -14.969783623924553], [129.409600050982988, -14.420669854391031], [129.888640578328591, -13.618703301653481], [130.339465773642928, -13.357375583553473], [130.183506300985982, -13.107520033422301], [130.617795037966971, -12.536392103732464], [131.223494500859999, -12.183648776908113], [131.73509118054946, -12.302452894747159], [132.575298293183096, -12.114040622611013], [132.557211541881031, -11.603012383676683], [131.824698114143644, -11.273781833545097], [132.357223748911395, -11.128519382372641], [133.019560581596409, -11.376411228076844], [133.550845981989028, -11.786515394745134], [134.393068475481982, -12.042365411022173], [134.678632440327021, -11.9411829565947], [135.298491245667975, -12.248606052299051], [135.882693312727611, -11.962266940969796], [136.258380975489445, -12.049341729381606], [136.492475213771627, -11.857208754120389], [136.951620314684988, -12.351958916882735], [136.685124953355739, -12.887223402562054], [136.305406528875096, -13.291229750219895], [135.961758254134111, -13.324509372615889], [136.077616815332533, -13.72427825282578], [135.783836297753226, -14.223989353088211], [135.4286641786112, -14.715432224183896], [135.500184360903177, -14.997740573794427], [136.295174595281367, -15.550264987859121], [137.065360142159477, -15.870762220933353], [137.580470819244795, -16.215082289294084], [138.303217401278971, -16.807604261952658], [138.58516401586337, -16.806622409739173], [139.108542922115475, -17.062679131745366], [139.260574985918197, -17.371600843986183], [140.215245396078274, -17.710804945550063], [140.875463495039241, -17.36906869880394], [141.071110467696258, -16.832047214426719], [141.274095493738798, -16.388870131091604], [141.398222284103781, -15.840531508042584], [141.702183058844611, -15.044921156476928], [141.563380161708665, -14.561333103089506], [141.635520461188094, -14.270394789286284], [141.519868605718955, -13.698078301653805], [141.650920038011009, -12.944687595270562], [141.842691278246207, -12.741547539931187], [141.68699018775078, -12.407614434461134], [141.928629185147543, -11.877465915578778], [142.118488397387978, -11.328042087451619], [142.14370649634634, -11.04273650476814], [142.51526004452495, -10.668185723516642], [142.797310011974048, -11.157354831591515], [142.866763136974271, -11.784706719614929], [143.11594689348567, -11.90562957117791], [143.158631626558758, -12.325655612846187], [143.522123651299864, -12.834358412327429], [143.597157830987669, -13.400422051652594], [143.561811151299935, -13.763655694232209]]]] } },
+            { "type": "Feature", "properties": { "admin": "Austria", "name": "Austria", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.979666782304033, 48.123497015976298], [16.903754103267257, 47.714865627628321], [16.340584344150411, 47.712901923201215], [16.534267612380372, 47.496170966169103], [16.202298211337361, 46.852385972676949], [16.011663852612653, 46.683610744811688], [15.137091912504982, 46.658702704447016], [14.632471551174827, 46.431817328469535], [13.806475457421524, 46.509306138691201], [12.376485223040813, 46.767559109069843], [12.153088006243051, 47.115393174826437], [11.164827915093268, 46.941579494812721], [11.048555942436533, 46.751358547546324], [10.442701450246627, 46.893546250997424], [9.932448357796657, 46.920728054382948], [9.479969516649019, 47.102809963563367], [9.632931756232974, 47.347601223329974], [9.594226108446346, 47.525058091820256], [9.896068149463188, 47.58019684507569], [10.402083774465209, 47.302487697939156], [10.544504021861625, 47.566399237653762], [11.426414015354736, 47.523766181012967], [12.141357456112784, 47.703083401065761], [12.620759718484491, 47.672387600284395], [12.932626987365945, 47.467645575543983], [13.025851271220487, 47.637583523135824], [12.884102817443901, 48.289145819687903], [13.243357374736998, 48.41611481382904], [13.595945672264433, 48.877171942737135], [14.33889773932472, 48.555305284207193], [14.901447381254055, 48.964401760445817], [15.253415561593979, 49.039074205107575], [16.029647251050218, 48.733899034207916], [16.49928266771877, 48.785808010445095], [16.960288120194573, 48.596982326850593], [16.879982944412998, 48.470013332709463], [16.979666782304033, 48.123497015976298]]] } },
+            { "type": "Feature", "properties": { "admin": "Azerbaijan", "name": "Azerbaijan", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[45.001987339056789, 39.740003567049591], [45.298144972521435, 39.471751207022422], [45.739978468616997, 39.473999131827149], [45.735379266143092, 39.319719143219785], [46.143623081248812, 38.74120148371221], [45.457721795438729, 38.874139105783108], [44.952688022650264, 39.33576467544642], [44.79398969908199, 39.713002631177027], [45.001987339056789, 39.740003567049591]]], [[[47.373315464066216, 41.219732367511249], [47.81566572448471, 41.151416124021338], [47.987283156126033, 41.405819200194223], [48.584352654826283, 41.808869533854669], [49.110263706260653, 41.282286688800518], [49.618914829309588, 40.572924302729966], [50.084829542853093, 40.526157131505776], [50.392821079312704, 40.256561184239096], [49.569202101444795, 40.176100979160701], [49.395259230350419, 39.39948171646224], [49.2232283872507, 39.04921885838791], [48.856532423707584, 38.815486355131775], [48.883249139202533, 38.320245266262638], [48.634375441284831, 38.270377509100925], [48.010744256386502, 38.794014797514528], [48.355529412637928, 39.288764960276886], [48.060095249225256, 39.582235419262439], [47.685079380083117, 39.508363959301185], [46.505719842317966, 38.770605373686251], [46.483498976432443, 39.464154771475528], [46.034534132680697, 39.628020738273044], [45.610012241402913, 39.899993801425175], [45.891907179555133, 40.21847565363997], [45.359174839058156, 40.561503811193482], [45.560351189970469, 40.812289537105947], [45.179495883979392, 40.98535390885143], [44.972480096218156, 41.248128567055623], [45.217426385281634, 41.411451931314041], [45.962600538930438, 41.123872585609789], [46.501637404166978, 41.064444688474104], [46.637908156120567, 41.181672675128219], [46.145431756378983, 41.72280243587263], [46.404950799348818, 41.860675157227341], [46.686070591016652, 41.827137152669899], [47.373315464066216, 41.219732367511249]]]] } },
+            { "type": "Feature", "properties": { "admin": "Burundi", "name": "Burundi", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[29.339997592900342, -4.499983412294092], [29.276383904749046, -3.293907159034063], [29.02492638521678, -2.839257907730157], [29.632176141078585, -2.917857761246096], [29.938359002407935, -2.348486830254238], [30.469696079232978, -2.413857517103458], [30.527677036264457, -2.807631931167534], [30.743012729624692, -3.034284763199686], [30.752262811004943, -3.359329522315569], [30.505559523243559, -3.568567396665364], [30.116332635221166, -4.090137627787242], [29.753512404099919, -4.45238941815328], [29.339997592900342, -4.499983412294092]]] } },
+            { "type": "Feature", "properties": { "admin": "Belgium", "name": "Belgium", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[3.314971144228536, 51.345780951536071], [4.047071160507527, 51.267258612668556], [4.973991326526913, 51.475023708698124], [5.60697594567, 51.037298488969768], [6.156658155958779, 50.803721015010574], [6.043073357781109, 50.128051662794221], [5.782417433300905, 50.090327867221205], [5.674051954784828, 49.52948354755749], [4.799221632515809, 49.985373033236371], [4.286022983425084, 49.90749664977254], [3.588184441755685, 50.378992418003563], [3.123251580425801, 50.780363267614561], [2.658422071960274, 50.796848049515731], [2.513573032246142, 51.148506171261815], [3.314971144228536, 51.345780951536071]]] } },
+            { "type": "Feature", "properties": { "admin": "Benin", "name": "Benin", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[2.691701694356254, 6.258817246928628], [1.865240512712318, 6.14215770102973], [1.618950636409238, 6.832038072126236], [1.664477573258381, 9.128590399609378], [1.46304284018467, 9.334624335157086], [1.425060662450136, 9.825395412632998], [1.077795037448737, 10.175606594275022], [0.772335646171484, 10.470808213742357], [0.899563022474069, 10.997339382364258], [1.243469679376488, 11.11051076908346], [1.447178175471066, 11.547719224488857], [1.93598554851988, 11.641150214072551], [2.154473504249921, 11.940150051313337], [2.49016360841793, 12.233052069543671], [2.84864301922667, 12.235635891158266], [3.611180454125558, 11.660167141155966], [3.572216424177469, 11.327939357951516], [3.797112257511713, 10.734745591673104], [3.600070021182801, 10.332186184119406], [3.705438266625918, 10.063210354040207], [3.220351596702101, 9.4441525333997], [2.912308383810255, 9.13760793704432], [2.723792758809509, 8.506845404489708], [2.74906253420022, 7.870734361192886], [2.691701694356254, 6.258817246928628]]] } },
+            { "type": "Feature", "properties": { "admin": "Burkina Faso", "name": "Burkina Faso", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-2.827496303712706, 9.642460842319775], [-3.511898972986272, 9.900326239456216], [-3.980449184576684, 9.862344061721698], [-4.330246954760383, 9.610834865757139], [-4.779883592131966, 9.821984768101741], [-4.954653286143098, 10.152713934769732], [-5.404341599946973, 10.370736802609144], [-5.470564947929004, 10.951269842976044], [-5.197842576508648, 11.375145778850136], [-5.220941941743119, 11.713858954307224], [-4.427166103523802, 12.542645575404292], [-4.280405035814879, 13.228443508349738], [-4.006390753587225, 13.472485459848112], [-3.52280270019986, 13.337661647998612], [-3.103706834312759, 13.54126679122859], [-2.967694464520576, 13.798150336151506], [-2.191824510090384, 14.246417548067352], [-2.001035122068771, 14.559008287000887], [-1.066363491205663, 14.973815009007764], [-0.515854458000348, 15.116157741755725], [-0.26625729003058, 14.924308986872147], [0.374892205414682, 14.928908189346128], [0.295646396495101, 14.444234930880651], [0.429927605805517, 13.988733018443922], [0.993045688490071, 13.335749620003821], [1.024103224297477, 12.851825669806573], [2.177107781593775, 12.625017808477532], [2.154473504249921, 11.940150051313337], [1.93598554851988, 11.641150214072551], [1.447178175471066, 11.547719224488857], [1.243469679376488, 11.11051076908346], [0.899563022474069, 10.997339382364258], [0.023802524423701, 11.018681748900802], [-0.438701544588582, 11.09834096927872], [-0.761575893548183, 10.936929633015053], [-1.203357713211431, 11.009819240762736], [-2.94040930827046, 10.962690334512557], [-2.963896246747111, 10.395334784380081], [-2.827496303712706, 9.642460842319775]]] } },
+            { "type": "Feature", "properties": { "admin": "Bangladesh", "name": "Bangladesh", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[92.672720981825549, 22.041238918541247], [92.652257114637976, 21.324047552978481], [92.30323449093865, 21.475485337809815], [92.368553501355606, 20.670883287025344], [92.082886183646124, 21.192195135985767], [92.025215285208361, 21.701569729086764], [91.834890985077408, 22.182935695885561], [91.417087029997646, 22.765019029221218], [90.496006300827247, 22.805016587815125], [90.586956821660948, 22.392793687422863], [90.272970819055544, 21.836367702720107], [89.847467075564268, 22.039146023033421], [89.70204959509492, 21.857115790285299], [89.41886274613546, 21.966178900637296], [89.031961297566198, 22.055708319582973], [88.876311883503064, 22.879146429937826], [88.529769728553759, 23.631141872649163], [88.699940220090895, 24.233714911388557], [88.084422235062405, 24.501657212821918], [88.30637251175601, 24.866079413344199], [88.931553989623069, 25.238692328384769], [88.209789259802477, 25.768065700782707], [88.56304935094974, 26.446525580342716], [89.355094028687276, 26.014407253518065], [89.832480910199592, 25.965082098895476], [89.920692580121838, 25.269749864192171], [90.872210727912105, 25.13260061288954], [91.799595981822065, 25.14743174895731], [92.376201613334786, 24.976692816664961], [91.915092807994398, 24.130413723237108], [91.467729933643668, 24.072639471934789], [91.158963250699713, 23.503526923104381], [91.706475050832083, 22.985263983649183], [91.869927606171302, 23.62434642180278], [92.146034783906799, 23.62749868417259], [92.672720981825549, 22.041238918541247]]] } },
+            { "type": "Feature", "properties": { "admin": "Bulgaria", "name": "Bulgaria", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.657149692482985, 44.234923000661276], [22.94483239105184, 43.823785305347123], [23.332302280376322, 43.897010809904707], [24.100679152124169, 43.741051337247846], [25.569271681426923, 43.688444729174712], [26.065158725699739, 43.943493760751259], [27.242399529740904, 44.175986029632398], [27.970107049275068, 43.812468166675202], [28.55808149589199, 43.707461656258118], [28.039095086384712, 43.293171698574177], [27.673897739378042, 42.577892361006214], [27.996720411905383, 42.007358710287775], [27.135739373490473, 42.141484890301335], [26.117041863720793, 41.826904608724554], [26.106138136507205, 41.328898830727766], [25.197201368925441, 41.234485988930523], [24.492644891058031, 41.583896185872028], [23.692073601992345, 41.309080918943842], [22.952377150166445, 41.337993882811141], [22.881373732197424, 41.999297186850242], [22.380525750424585, 42.320259507815081], [22.545011834409614, 42.461362006188025], [22.436594679461273, 42.580321153323929], [22.604801466571324, 42.898518785161137], [22.986018507588479, 43.211161200526959], [22.500156691180276, 43.642814439460977], [22.410446404721593, 44.008063462899948], [22.657149692482985, 44.234923000661276]]] } },
+            { "type": "Feature", "properties": { "admin": "The Bahamas", "name": "Bahamas", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-77.53466, 23.75975], [-77.78, 23.71], [-78.03405, 24.28615], [-78.40848, 24.57564], [-78.19087, 25.2103], [-77.89, 25.17], [-77.54, 24.34], [-77.53466, 23.75975]]], [[[-77.82, 26.58], [-78.91, 26.42], [-78.98, 26.79], [-78.51, 26.87], [-77.85, 26.84], [-77.82, 26.58]]], [[[-77.0, 26.59], [-77.17255, 25.87918], [-77.35641, 26.00735], [-77.34, 26.53], [-77.78802, 26.92516], [-77.79, 27.04], [-77.0, 26.59]]]] } },
+            { "type": "Feature", "properties": { "admin": "Bosnia and Herzegovina", "name": "Bosnia and Herz.", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[19.005486281010118, 44.860233669609144], [19.36803, 44.863], [19.11761, 44.42307], [19.59976, 44.03847], [19.454, 43.568100000000115], [19.21852, 43.52384], [19.03165, 43.43253], [18.70648, 43.20011], [18.56, 42.65], [17.674921502358981, 43.028562527023603], [17.297373488034449, 43.446340643887353], [16.916156447017325, 43.667722479825663], [16.456442905348862, 44.041239732431265], [16.239660271884528, 44.351143296885695], [15.750026075918978, 44.81871165626255], [15.959367303133373, 45.233776760430935], [16.318156772535868, 45.004126695325901], [16.534939406000202, 45.211607570977705], [17.00214603035101, 45.233776760430935], [17.861783481526398, 45.067740383477137], [18.553214145591646, 45.08158966733145], [19.005486281010118, 44.860233669609144]]] } },
+            { "type": "Feature", "properties": { "admin": "Belarus", "name": "Belarus", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[23.484127638449841, 53.912497667041123], [24.45068362803703, 53.905702216194747], [25.536353794056989, 54.282423407602515], [25.768432651479792, 54.846962592175082], [26.588279249790386, 55.167175604871659], [26.494331495883749, 55.61510691997762], [27.102459751094525, 55.783313707087672], [28.17670942557799, 56.169129950578807], [29.2295133806603, 55.918344224666356], [29.371571893030669, 55.67009064393617], [29.896294386522353, 55.789463202530406], [30.87390913262, 55.550976467503396], [30.971835971813132, 55.081547756564028], [30.75753380709871, 54.811770941784303], [31.384472283663733, 54.157056382862422], [31.791424187962232, 53.974638576872117], [31.731272820774503, 53.794029446012011], [32.405598585751157, 53.618045355842028], [32.693643019346034, 53.351420803432106], [32.304519484188226, 53.132726141972903], [31.497643670382924, 53.167426866256889], [31.30520063652801, 53.073995876673195], [31.540018344862254, 52.742052313846344], [31.78599816257158, 52.10167796488544], [30.927549269338975, 52.042353420614383], [30.619454380014837, 51.822806098022362], [30.55511722181145, 51.319503485715643], [30.157363722460889, 51.416138414101454], [29.254938185347921, 51.368234361366881], [28.992835320763522, 51.602044379271462], [28.617612745892242, 51.427713934934836], [28.241615024536564, 51.572227077839059], [27.454066196408426, 51.59230337178446], [26.337958611768549, 51.832288723347915], [25.327787713327005, 51.910656032918538], [24.553106316839511, 51.888461005249177], [24.005077752384206, 51.617443956094448], [23.52707075368437, 51.578454087930233], [23.508002150168689, 52.023646552124717], [23.19949384938618, 52.486977444053664], [23.799198846133375, 52.691099351606553], [23.804934930117774, 53.08973135030606], [23.527535841574995, 53.47012156840654], [23.484127638449841, 53.912497667041123]]] } },
+            { "type": "Feature", "properties": { "admin": "Belize", "name": "Belize", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-89.143080410503302, 17.808318996649316], [-89.150909389995519, 17.955467637600414], [-89.029857347351808, 18.001511338772485], [-88.848343878926585, 17.883198147040229], [-88.490122850279334, 18.486830552641603], [-88.300031094093669, 18.499982204659897], [-88.296336229184803, 18.353272813383263], [-88.106812913754368, 18.348673610909284], [-88.123478563168476, 18.076674709541003], [-88.285354987322776, 17.644142971258031], [-88.197866787452625, 17.489475409408453], [-88.302640753924422, 17.13169363043566], [-88.239517991879893, 17.036066392479551], [-88.355428229510551, 16.530774237529624], [-88.551824510435821, 16.265467434143144], [-88.732433641295927, 16.233634751851351], [-88.930612759135244, 15.887273464415072], [-89.229121670269265, 15.886937567605166], [-89.15080603713092, 17.015576687075832], [-89.143080410503302, 17.808318996649316]]] } },
+            { "type": "Feature", "properties": { "admin": "Bolivia", "name": "Bolivia", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-62.84646847192154, -22.034985446869442], [-63.986838141522462, -21.993644301035946], [-64.377021043542243, -22.798091322523533], [-64.964892137294598, -22.07586150481232], [-66.273339402924833, -21.832310479420713], [-67.10667355006359, -22.735924574476414], [-67.82817989772272, -22.872918796482171], [-68.219913092711266, -21.494346612231858], [-68.757167121033731, -20.372657972904459], [-68.442225104430904, -19.405068454671426], [-68.966818406841853, -18.9816834449041], [-69.100246955019472, -18.260125420812674], [-69.590423753524036, -17.580011895419329], [-68.959635382753291, -16.500697930571267], [-69.389764166934697, -15.66012908291165], [-69.160346645774936, -15.323973890853015], [-69.339534674747, -14.953195489158828], [-68.94888668483658, -14.45363941819328], [-68.929223802349526, -13.602683607643007], [-68.880079515239956, -12.89972909917665], [-68.665079718689611, -12.561300144097171], [-69.52967810736493, -10.951734307502193], [-68.786157599549469, -11.036380303596276], [-68.27125362819325, -11.014521172736817], [-68.048192308205373, -10.712059014532484], [-67.173801235610725, -10.30681243249961], [-66.646908331962791, -9.931331475466861], [-65.33843522811641, -9.76198780684639], [-65.444837002205375, -10.51145110437543], [-65.321898769783004, -10.895872084194675], [-65.402281460213018, -11.566270440317151], [-64.31635291203159, -12.461978041232191], [-63.196498786050562, -12.627032565972433], [-62.803060268796372, -13.000653171442682], [-62.127080857986371, -13.19878061284972], [-61.713204311760769, -13.489202162330049], [-61.084121263255646, -13.479383640194595], [-60.503304002511122, -13.775954685117656], [-60.459198167550014, -14.354007256734551], [-60.264326341377355, -14.645979099183638], [-60.251148851142922, -15.077218926659318], [-60.542965664295131, -15.093910414289592], [-60.158389655179022, -16.258283786690082], [-58.241219855366673, -16.299573256091289], [-58.388058437724027, -16.877109063385273], [-58.280804002502244, -17.271710300366014], [-57.734558274960989, -17.552468357007765], [-57.498371141170971, -18.174187513911289], [-57.676008877174297, -18.961839694904025], [-57.949997321185819, -19.400004164306814], [-57.853801642474494, -19.969995212486186], [-58.166392381408038, -20.176700941653674], [-58.183471442280492, -19.868399346600359], [-59.11504248720609, -19.356906019775398], [-60.043564622626477, -19.342746677327419], [-61.786326463453761, -19.633736667562957], [-62.265961269770784, -20.513734633061272], [-62.291179368729203, -21.051634616787389], [-62.685057135657871, -22.24902922942238], [-62.84646847192154, -22.034985446869442]]] } },
+            { "type": "Feature", "properties": { "admin": "Brazil", "name": "Brazil", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.625133429582945, -30.216294854454258], [-56.290899624239067, -28.852760512000884], [-55.162286342984558, -27.881915378533456], [-54.49072526713551, -27.474756768505785], [-53.648735317587885, -26.923472588816086], [-53.628348965048737, -26.124865004177465], [-54.130049607954376, -25.547639255477247], [-54.625290696823562, -25.739255466415507], [-54.428946092330577, -25.162184747012162], [-54.293476325077435, -24.570799655863958], [-54.292959560754511, -24.021014092710722], [-54.652834235235119, -23.839578138933955], [-55.027901780809543, -24.001273695575225], [-55.400747239795407, -23.956935316668797], [-55.517639329639621, -23.57199757252663], [-55.61068274598113, -22.655619398694839], [-55.797958136606894, -22.356929620047815], [-56.473317430229379, -22.086300144135279], [-56.881509568902885, -22.282153822521476], [-57.937155727761287, -22.090175876557169], [-57.870673997617786, -20.732687676681948], [-58.166392381408038, -20.176700941653674], [-57.853801642474494, -19.969995212486186], [-57.949997321185819, -19.400004164306814], [-57.676008877174297, -18.961839694904025], [-57.498371141170971, -18.174187513911289], [-57.734558274960989, -17.552468357007765], [-58.280804002502244, -17.271710300366014], [-58.388058437724027, -16.877109063385273], [-58.241219855366673, -16.299573256091289], [-60.158389655179022, -16.258283786690082], [-60.542965664295131, -15.093910414289592], [-60.251148851142922, -15.077218926659318], [-60.264326341377355, -14.645979099183638], [-60.459198167550014, -14.354007256734551], [-60.503304002511122, -13.775954685117656], [-61.084121263255646, -13.479383640194595], [-61.713204311760769, -13.489202162330049], [-62.127080857986371, -13.19878061284972], [-62.803060268796372, -13.000653171442682], [-63.196498786050562, -12.627032565972433], [-64.31635291203159, -12.461978041232191], [-65.402281460213018, -11.566270440317151], [-65.321898769783004, -10.895872084194675], [-65.444837002205375, -10.51145110437543], [-65.33843522811641, -9.76198780684639], [-66.646908331962791, -9.931331475466861], [-67.173801235610725, -10.30681243249961], [-68.048192308205373, -10.712059014532484], [-68.27125362819325, -11.014521172736817], [-68.786157599549469, -11.036380303596276], [-69.52967810736493, -10.951734307502193], [-70.093752204046879, -11.123971856331011], [-70.548685675728393, -11.009146823778462], [-70.481893886991159, -9.490118096558842], [-71.302412278921523, -10.079436130415372], [-72.184890713169821, -10.05359791426943], [-72.563033006465631, -9.520193780152715], [-73.226713426390148, -9.462212823121233], [-73.015382656532537, -9.03283334720806], [-73.571059332967053, -8.424446709835832], [-73.987235480429646, -7.523829847853063], [-73.723401455363486, -7.340998630404412], [-73.724486660441627, -6.918595472850638], [-73.120027431923575, -6.629930922068238], [-73.219711269814596, -6.089188734566076], [-72.964507208941185, -5.741251315944892], [-72.891927659787243, -5.274561455916979], [-71.748405727816532, -4.59398284263301], [-70.928843349883564, -4.401591485210367], [-70.79476884630229, -4.251264743673302], [-69.893635219996611, -4.298186944194326], [-69.444101935489599, -1.556287123219817], [-69.420485805932216, -1.122618503426409], [-69.577065395776586, -0.549991957200163], [-70.02065589057004, -0.185156345219539], [-70.015565761989293, 0.541414292804205], [-69.452396002872447, 0.706158758950693], [-69.252434048119042, 0.602650865070075], [-69.218637661400166, 0.985676581217433], [-69.804596727157701, 1.089081122233466], [-69.816973232691609, 1.714805202639624], [-67.868565029558823, 1.692455145673392], [-67.537810024674684, 2.037162787276329], [-67.25999752467358, 1.719998684084956], [-67.065048183852483, 1.130112209473225], [-66.876325853122566, 1.253360500489336], [-66.325765143484944, 0.724452215982012], [-65.548267381437554, 0.78925446207603], [-65.354713304288353, 1.0952822941085], [-64.611011928959854, 1.328730576987041], [-64.199305792890499, 1.49285492594602], [-64.083085496666072, 1.91636912679408], [-63.368788011311644, 2.200899562993129], [-63.422867397705105, 2.411067613124174], [-64.269999152265783, 2.497005520025566], [-64.408827887617903, 3.126786200366623], [-64.368494432214092, 3.797210394705246], [-64.816064012294007, 4.056445217297422], [-64.628659430587533, 4.14848094320925], [-63.888342861574145, 4.020530096854571], [-63.093197597899092, 3.770571193858784], [-62.804533047116692, 4.006965033377951], [-62.085429653559125, 4.162123521334308], [-60.966893276601517, 4.536467596856638], [-60.601179165271922, 4.918098049332129], [-60.733574184803707, 5.2002772078619], [-60.213683437731319, 5.2444863956876], [-59.980958624904865, 5.014061184098138], [-60.111002366767373, 4.574966538914082], [-59.767405768458701, 4.423502915866606], [-59.538039923731219, 3.958802598481937], [-59.815413174057852, 3.606498521332085], [-59.974524909084543, 2.755232652188055], [-59.718545701726732, 2.249630438644359], [-59.646043667221242, 1.786893825686789], [-59.030861579002639, 1.317697658692722], [-58.540012986878288, 1.26808828369252], [-58.429477098205957, 1.46394196207872], [-58.113449876525003, 1.507195135907025], [-57.660971035377358, 1.682584947105638], [-57.33582292339689, 1.948537705895759], [-56.782704230360814, 1.863710842288653], [-56.53938574891454, 1.89952260986692], [-55.995698004771739, 1.817667141116601], [-55.905600145070871, 2.021995754398659], [-56.073341844290283, 2.220794989425499], [-55.973322109589361, 2.510363877773016], [-55.569755011605984, 2.42150625244713], [-55.097587449755125, 2.523748073736612], [-54.524754197799709, 2.311848863123785], [-54.088062506717243, 2.105556545414629], [-53.778520677288903, 2.376702785650081], [-53.554839240113537, 2.33489655192595], [-53.4184651352953, 2.05338918701598], [-52.939657151894949, 2.124857692875636], [-52.556424730018414, 2.504705308437053], [-52.249337531123942, 3.241094468596244], [-51.657797410678882, 4.156232408053028], [-51.317146369010842, 4.203490505383953], [-51.069771287629649, 3.65039765056403], [-50.508875291533641, 1.901563828942456], [-49.974075893745045, 1.736483465986069], [-49.947100796088705, 1.046189683431223], [-50.699251268096901, 0.222984117021681], [-50.388210822132123, -0.078444512536819], [-48.620566779156313, -0.235489190271821], [-48.584496629416577, -1.237805271005001], [-47.824956427590621, -0.5816179337628], [-46.566583624851219, -0.941027520352776], [-44.9057030909904, -1.551739597178134], [-44.417619187993658, -2.137750339367975], [-44.581588507655773, -2.691308282078523], [-43.418791266440188, -2.383110039889793], [-41.47265682632824, -2.912018324397116], [-39.97866533055403, -2.87305429444904], [-38.50038347019656, -3.700652357603394], [-37.223252122535193, -4.820945733258915], [-36.45293738457638, -5.109403578312153], [-35.597795783010454, -5.149504489770648], [-35.235388963347553, -5.464937432480245], [-34.896029832486825, -6.738193047719709], [-34.729993455533027, -7.343220716992965], [-35.128212042774216, -8.996401462442284], [-35.636966518687707, -9.649281508017811], [-37.046518724096991, -11.040721123908799], [-37.683611619607355, -12.17119475672582], [-38.423876512188436, -13.038118584854285], [-38.673887091616507, -13.057652276260615], [-38.953275722802537, -13.79336964280002], [-38.882298143049645, -15.667053724838764], [-39.161092495264306, -17.208406670808468], [-39.267339240056394, -17.867746270420479], [-39.583521491034219, -18.262295830968934], [-39.76082333022763, -19.599113457927402], [-40.774740770010332, -20.90451181405242], [-40.944756232250597, -21.937316989837807], [-41.75416419123821, -22.370675551037454], [-41.988284267736546, -22.970070489190888], [-43.074703742024738, -22.967693373305462], [-44.647811855637798, -23.351959323827838], [-45.35213578955991, -23.796841729428579], [-46.472093268405523, -24.088968601174539], [-47.648972337420645, -24.885199069927715], [-48.495458136577689, -25.877024834905647], [-48.641004808127725, -26.623697605090928], [-48.474735887228647, -27.175911960561887], [-48.661520351747612, -28.186134535435713], [-48.888457404157393, -28.674115085567877], [-49.587329474472668, -29.224469089476333], [-50.696874152211478, -30.984465020472953], [-51.576226162306149, -31.777698256153204], [-52.256081305538032, -32.245369968394662], [-52.71209998229768, -33.196578057591175], [-53.373661668498229, -33.768377780900757], [-53.650543992718084, -33.202004082981823], [-53.209588995971529, -32.727666110974717], [-53.787951626182185, -32.047242526987617], [-54.572451544805105, -31.494511407193745], [-55.601510179249331, -30.853878676071385], [-55.97324459494093, -30.883075860316296], [-56.976025763564721, -30.109686374636119], [-57.625133429582945, -30.216294854454258]]] } },
+            { "type": "Feature", "properties": { "admin": "Brunei", "name": "Brunei", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[114.204016554828343, 4.525873928236805], [114.599961379048707, 4.900011298029965], [115.450710483869798, 5.447729803891532], [115.405700311343566, 4.955227565933837], [115.347460972150643, 4.316636053887009], [114.869557326315373, 4.348313706881924], [114.659595981913498, 4.007636826997753], [114.204016554828343, 4.525873928236805]]] } },
+            { "type": "Feature", "properties": { "admin": "Bhutan", "name": "Bhutan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[91.69665652869665, 27.771741848251661], [92.10371178585973, 27.4526140406332], [92.033483514375078, 26.838310451763554], [91.217512648486405, 26.808648179628019], [90.37327477413406, 26.875724188742872], [89.744527622438838, 26.71940298105995], [88.835642531289366, 27.098966376243755], [88.814248488320544, 27.299315904239361], [89.475810174521101, 28.04275889740639], [90.015828891971154, 28.296438503527209], [90.730513950567769, 28.064953925075748], [91.258853794319904, 28.040614325466287], [91.69665652869665, 27.771741848251661]]] } },
+            { "type": "Feature", "properties": { "admin": "Botswana", "name": "Botswana", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[25.649163445750155, -18.536025892818987], [25.850391473094724, -18.714412937090533], [26.164790887158478, -19.293085625894935], [27.296504754350501, -20.391519870690995], [27.724747348753247, -20.499058526290387], [27.727227817503252, -20.851801853114711], [28.02137007010861, -21.485975030200578], [28.794656202924209, -21.639454034107445], [29.432188348109033, -22.091312758067584], [28.017235955525244, -22.827753594659072], [27.119409620886238, -23.574323011979772], [26.78640669119741, -24.240690606383478], [26.485753208123292, -24.616326592713097], [25.941652052522151, -24.696373386333214], [25.765848829865206, -25.174845472923671], [25.664666375437712, -25.486816094669706], [25.025170525825782, -25.719670098576891], [24.211266717228792, -25.670215752873567], [23.733569777122703, -25.39012948985161], [23.312096795350179, -25.268689873965712], [22.824271274514896, -25.500458672794768], [22.579531691180584, -25.979447523708142], [22.105968865657864, -26.28025603607913], [21.60589603036939, -26.726533705351748], [20.889609002371731, -26.828542982695907], [20.666470167735437, -26.477453301704916], [20.758609246511831, -25.868136488551446], [20.165725538827186, -24.917961928000768], [19.895767856534427, -24.767790215760588], [19.895457797940672, -21.849156996347865], [20.881134067475866, -21.814327080983144], [20.910641310314531, -18.252218926672018], [21.655040317478971, -18.219146010005222], [23.196858351339298, -17.869038181227783], [23.579005568137713, -18.281261081620055], [24.217364536239209, -17.889347019118485], [24.520705193792534, -17.887124932529932], [25.084443393664564, -17.661815687737366], [25.264225701608005, -17.736539808831413], [25.649163445750155, -18.536025892818987]]] } },
+            { "type": "Feature", "properties": { "admin": "Central African Republic", "name": "Central African Rep.", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[15.279460483469107, 7.421924546737968], [16.106231723706767, 7.497087917506504], [16.290561557691884, 7.754307359239304], [16.456184523187343, 7.734773667832966], [16.705988396886251, 7.508327541529978], [17.964929640380884, 7.890914008002865], [18.389554884523218, 8.281303615751822], [18.911021762780504, 8.630894680206351], [18.81200971850927, 8.982914536978596], [19.094008009526018, 9.074846910025837], [20.059685499764267, 9.01270600019485], [21.00086836109616, 9.475985215691507], [21.723821648859452, 10.567055568885973], [22.231129184668784, 10.971888739460507], [22.864165480244218, 11.142395127807543], [22.977543572692603, 10.714462591998538], [23.554304233502187, 10.089255275915306], [23.557249790142826, 9.681218166538683], [23.394779087017181, 9.26506785729222], [23.459012892355979, 8.954285793488891], [23.805813429466745, 8.666318874542425], [24.567369012152078, 8.229187933785466], [25.114932488716786, 7.825104071479172], [25.12413089366472, 7.500085150579436], [25.796647983511171, 6.979315904158069], [26.21341840994511, 6.546603298362071], [26.465909458123232, 5.94671743410187], [27.213409051225163, 5.550953477394557], [27.374226108517483, 5.233944403500059], [27.044065382604703, 5.127852688004835], [26.402760857862535, 5.150874538590869], [25.650455356557465, 5.256087754737123], [25.278798455514302, 5.170408229997191], [25.128833449003274, 4.927244777847789], [24.805028924262409, 4.897246608902349], [24.41053104014625, 5.108784084489129], [23.297213982850135, 4.609693101414221], [22.841479526468103, 4.710126247573483], [22.704123569436284, 4.633050848810156], [22.405123732195531, 4.02916006104732], [21.659122755630019, 4.224341945813719], [20.927591180106273, 4.322785549329736], [20.290679152108932, 4.691677761245287], [19.467783644293146, 5.031527818212779], [18.932312452884755, 4.709506130385973], [18.542982211997778, 4.201785183118317], [18.453065219809925, 3.504385891123348], [17.809900343505259, 3.560196437998569], [17.133042433346297, 3.728196519379451], [16.537058139724135, 3.198254706226278], [16.01285241055535, 2.267639675298084], [15.907380812247649, 2.557389431158612], [15.862732374747479, 3.013537298998982], [15.405395948964379, 3.335300604664339], [15.036219516671249, 3.851367295747123], [14.950953403389658, 4.21038930909492], [14.478372430080466, 4.732605495620446], [14.558935988023501, 5.03059764243153], [14.459407179429345, 5.451760565610299], [14.536560092841111, 6.22695872642069], [14.776545444404572, 6.408498033062044], [15.279460483469107, 7.421924546737968]]] } },
+            { "type": "Feature", "properties": { "admin": "Canada", "name": "Canada", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-63.6645, 46.55001], [-62.9393, 46.41587], [-62.01208, 46.44314], [-62.50391, 46.03339], [-62.87433, 45.96818], [-64.1428, 46.39265], [-64.39261, 46.72747], [-64.01486, 47.03601], [-63.6645, 46.55001]]], [[[-61.806305, 49.10506], [-62.29318, 49.08717], [-63.58926, 49.40069], [-64.51912, 49.87304], [-64.17322, 49.95718], [-62.85829, 49.70641], [-61.835585, 49.28855], [-61.806305, 49.10506]]], [[[-123.510001587551116, 48.51001089130343], [-124.012890788399474, 48.370846259141402], [-125.655012777338342, 48.825004584338494], [-125.954994466792726, 49.179995835967638], [-126.850004435871853, 49.530000311880421], [-127.029993449544392, 49.814995835970073], [-128.059336304366212, 49.994959011426594], [-128.444584107102145, 50.53913768167611], [-128.358413656255408, 50.770648098343678], [-127.308581096029883, 50.552573554071948], [-126.695000977212302, 50.40090322529538], [-125.755006673823161, 50.295018215529367], [-125.415001587558791, 49.950000515332604], [-124.920768189119315, 49.47527497008339], [-123.92250870832099, 49.062483628935794], [-123.510001587551116, 48.51001089130343]]], [[[-56.134035814017111, 50.687009792679298], [-56.795881720595261, 49.812308661490945], [-56.143105027884289, 50.15011749938283], [-55.471492275602934, 49.935815334668447], [-55.822401089080913, 49.587128607779093], [-54.93514258484565, 49.313010972686833], [-54.473775397343772, 49.556691189159167], [-53.47654944519131, 49.24913890237405], [-53.786013759971233, 48.516780503933617], [-53.086133999226249, 48.687803656603528], [-52.95864824076223, 48.157164211614472], [-52.648098720904173, 47.53554840757549], [-53.069158291218336, 46.655498765644936], [-53.521456264853029, 46.618291734394823], [-54.178935512902527, 46.807065741556997], [-53.961868659060471, 47.625207017601909], [-54.240482143762122, 47.752279364607617], [-55.400773078011483, 46.88499380145312], [-55.997480841685835, 46.919720363953289], [-55.291219041552765, 47.389562486350982], [-56.250798712780508, 47.632545070987383], [-57.325229254777085, 47.572807115257987], [-59.26601518414676, 47.603347886742498], [-59.41949418805369, 47.89945384377485], [-58.796586473207398, 48.251525376979473], [-59.23162451845652, 48.523188381537793], [-58.391804979065213, 49.125580552764163], [-57.358689744686025, 50.718274034215845], [-56.738650071831998, 51.287438259478527], [-55.87097693543528, 51.632094224649187], [-55.406974249886602, 51.588272610065722], [-55.600218268442077, 51.317074693397913], [-56.134035814017111, 50.687009792679298]]], [[[-133.180004041711669, 54.169975490935308], [-132.710007884431292, 54.040009315423518], [-131.749989584003259, 54.120004380909208], [-132.049480347350965, 52.984621487024519], [-131.179042521826574, 52.18043284769827], [-131.577829549822894, 52.182370713909236], [-132.180428426778519, 52.639707139692391], [-132.549992432313843, 53.100014960332132], [-133.054611178755493, 53.411468817755363], [-133.239664482792676, 53.851080227262386], [-133.180004041711669, 54.169975490935308]]], [[[-79.26582, 62.158675], [-79.65752, 61.63308], [-80.09956, 61.7181], [-80.36215, 62.01649], [-80.315395, 62.085565], [-79.92939, 62.3856], [-79.52002, 62.36371], [-79.26582, 62.158675]]], [[[-81.89825, 62.7108], [-83.06857, 62.15922], [-83.77462, 62.18231], [-83.99367, 62.4528], [-83.25048, 62.91409], [-81.87699, 62.90458], [-81.89825, 62.7108]]], [[[-85.161307949549851, 65.657284654392797], [-84.975763719405933, 65.217518215588981], [-84.464012010419495, 65.371772365980163], [-83.88262630891974, 65.109617824963536], [-82.78757687043877, 64.766693020274673], [-81.642013719392509, 64.455135809986942], [-81.553440314444245, 63.979609280037131], [-80.817361212878851, 64.057485663500998], [-80.103451300766594, 63.725981350348597], [-80.991019863595653, 63.41124603947496], [-82.547178107416997, 63.651722317145229], [-83.108797573565042, 64.101875718839707], [-84.100416632813847, 63.569711819098004], [-85.523404710618991, 63.052379055424076], [-85.866768764982339, 63.637252916103542], [-87.221983201836721, 63.541238104905212], [-86.352759772471259, 64.035833238370699], [-86.224886440765133, 64.822916978608262], [-85.883847825854858, 65.738778388117041], [-85.161307949549851, 65.657284654392797]]], [[[-75.86588, 67.14886], [-76.98687, 67.09873], [-77.2364, 67.58809], [-76.81166, 68.14856], [-75.89521, 68.28721], [-75.1145, 68.01036], [-75.10333, 67.58202], [-75.21597, 67.44425], [-75.86588, 67.14886]]], [[[-95.647681203800488, 69.107690358321761], [-96.269521203800579, 68.757040358321731], [-97.61740120380054, 69.060030358321782], [-98.431801203800504, 68.950700358321768], [-99.797401203800504, 69.400030358321786], [-98.917401203800523, 69.710030358321788], [-98.218261203800466, 70.143540358321744], [-97.157401203800532, 69.860030358321794], [-96.557401203800524, 69.680030358321758], [-96.257401203800498, 69.490030358321761], [-95.647681203800488, 69.107690358321761]]], [[[-90.5471, 69.49766], [-90.55151, 68.47499], [-89.21515, 69.25873], [-88.01966, 68.61508], [-88.31749, 67.87338], [-87.35017, 67.19872], [-86.30607, 67.92146], [-85.57664, 68.78456], [-85.52197, 69.88211], [-84.10081, 69.80539], [-82.62258, 69.65826], [-81.28043, 69.16202], [-81.2202, 68.66567], [-81.96436, 68.13253], [-81.25928, 67.59716], [-81.38653, 67.11078], [-83.34456, 66.41154], [-84.73542, 66.2573], [-85.76943, 66.55833], [-86.0676, 66.05625], [-87.03143, 65.21297], [-87.32324, 64.77563], [-88.48296, 64.09897], [-89.91444, 64.03273], [-90.70398, 63.61017], [-90.77004, 62.96021], [-91.93342, 62.83508], [-93.15698, 62.02469], [-94.24153, 60.89865], [-94.62931, 60.11021], [-94.6846, 58.94882], [-93.21502, 58.78212], [-92.76462, 57.84571], [-92.297029999999893, 57.08709], [-90.89769, 57.28468], [-89.03953, 56.85172], [-88.03978, 56.47162], [-87.32421, 55.99914], [-86.07121, 55.72383], [-85.01181, 55.3026], [-83.36055, 55.24489], [-82.27285, 55.14832], [-82.4362, 54.28227], [-82.12502, 53.27703], [-81.40075, 52.15788], [-79.91289, 51.20842], [-79.14301, 51.53393], [-78.60191, 52.56208], [-79.12421, 54.14145], [-79.82958, 54.66772], [-78.22874, 55.13645], [-77.0956, 55.83741], [-76.54137, 56.53423], [-76.62319, 57.20263], [-77.30226, 58.05209], [-78.51688, 58.80458], [-77.33676, 59.85261], [-77.77272, 60.75788], [-78.10687, 62.31964], [-77.41067, 62.55053], [-75.69621, 62.2784], [-74.6682, 62.18111], [-73.83988, 62.4438], [-72.90853, 62.10507], [-71.67708, 61.52535], [-71.37369, 61.13717], [-69.59042, 61.06141], [-69.62033, 60.22125], [-69.2879, 58.95736], [-68.37455, 58.80106], [-67.64976, 58.21206], [-66.20178, 58.76731], [-65.24517, 59.87071], [-64.58352, 60.33558], [-63.80475, 59.4426], [-62.50236, 58.16708], [-61.39655, 56.96745], [-61.79866, 56.33945], [-60.46853, 55.77548], [-59.56962, 55.20407], [-57.97508, 54.94549], [-57.3332, 54.6265], [-56.93689, 53.78032], [-56.15811, 53.64749], [-55.75632, 53.27036], [-55.68338, 52.14664], [-56.40916, 51.7707], [-57.12691, 51.41972], [-58.77482, 51.0643], [-60.03309, 50.24277], [-61.72366, 50.08046], [-63.86251, 50.29099], [-65.36331, 50.2982], [-66.39905, 50.22897], [-67.23631, 49.51156], [-68.51114, 49.06836], [-69.95362, 47.74488], [-71.10458, 46.82171], [-70.25522, 46.98606], [-68.65, 48.3], [-66.55243, 49.1331], [-65.05626, 49.23278], [-64.17099, 48.74248], [-65.11545, 48.07085], [-64.79854, 46.99297], [-64.47219, 46.23849], [-63.17329, 45.73902], [-61.52072, 45.88377], [-60.51815, 47.00793], [-60.4486, 46.28264], [-59.80287, 45.9204], [-61.03988, 45.26525], [-63.25471, 44.67014], [-64.24656, 44.26553], [-65.36406, 43.54523], [-66.1234, 43.61867], [-66.16173, 44.46512], [-64.42549, 45.29204], [-66.02605, 45.25931], [-67.13741, 45.13753], [-67.79134, 45.70281], [-67.79046, 47.06636], [-68.23444, 47.35486], [-68.905, 47.185], [-69.237216, 47.447781], [-69.99997, 46.69307], [-70.305, 45.915], [-70.66, 45.46], [-71.08482, 45.30524], [-71.405, 45.255], [-71.50506, 45.0082], [-73.34783, 45.00738], [-74.867, 45.00048], [-75.31821, 44.81645], [-76.375, 44.09631], [-76.5, 44.018458893758712], [-76.820034145805565, 43.628784288093748], [-77.737885097957687, 43.62905558936329], [-78.720279914042365, 43.625089423184868], [-79.171673550111862, 43.466339423184216], [-79.01, 43.27], [-78.92, 42.965], [-78.939362148743683, 42.863611355148031], [-80.247447679347928, 42.366199856122584], [-81.277746548167144, 42.209025987306845], [-82.439277716791608, 41.675105088867149], [-82.690089280920162, 41.675105088867149], [-83.029810146806909, 41.832795722005834], [-83.141999681312555, 41.975681057292825], [-83.12, 42.08], [-82.9, 42.43], [-82.43, 42.98], [-82.137642381503881, 43.571087551439909], [-82.337763125431053, 44.44], [-82.550924648758169, 45.347516587905368], [-83.592850714843067, 45.816893622412373], [-83.469550747394621, 45.994686387712584], [-83.616130947590563, 46.116926988299056], [-83.890765347005726, 46.116926988299056], [-84.091851264161463, 46.27541860613816], [-84.14211951367335, 46.512225857115723], [-84.3367, 46.40877], [-84.6049, 46.4396], [-84.543748745445853, 46.538684190449132], [-84.779238247399888, 46.637101955749038], [-84.876079881514855, 46.900083319682366], [-85.652363247403414, 47.220218817730498], [-86.461990831228249, 47.553338019392037], [-87.439792623300207, 47.94], [-88.378114183286698, 48.302917588893727], [-89.272917446636654, 48.019808254582657], [-89.6, 48.01], [-90.83, 48.27], [-91.64, 48.14], [-92.61, 48.45], [-93.63087, 48.60926], [-94.32914, 48.67074], [-94.64, 48.84], [-94.81758, 49.38905], [-95.15609, 49.38425], [-95.159069509172014, 49.0], [-97.228720000004799, 49.0007], [-100.65, 49.0], [-104.04826, 48.99986], [-107.05, 49.0], [-110.05, 49.0], [-113.0, 49.0], [-116.04818, 49.0], [-117.03121, 49.0], [-120.0, 49.0], [-122.84, 49.0], [-122.97421, 49.002537777777789], [-124.91024, 49.98456], [-125.62461, 50.41656], [-127.43561, 50.83061], [-127.99276, 51.71583], [-127.85032, 52.32961], [-129.12979, 52.75538], [-129.30523, 53.56159], [-130.51497, 54.28757], [-130.53611, 54.80278], [-129.98, 55.285], [-130.00778, 55.91583], [-131.70781, 56.55212], [-132.73042, 57.69289], [-133.35556, 58.41028], [-134.27111, 58.86111], [-134.945, 59.27056], [-135.47583, 59.78778], [-136.47972, 59.46389], [-137.4525, 58.905], [-138.34089, 59.56211], [-139.039, 60.0], [-140.013, 60.27682], [-140.99778, 60.30639], [-140.9925, 66.00003], [-140.986, 69.712], [-139.12052, 69.47102], [-137.54636, 68.99002], [-136.50358, 68.89804], [-135.62576, 69.31512], [-134.41464, 69.62743], [-132.92925, 69.50534], [-131.43136, 69.94451], [-129.79471, 70.19369], [-129.10773, 69.77927], [-128.36156, 70.01286], [-128.13817, 70.48384], [-127.44712, 70.37721], [-125.75632, 69.48058], [-124.42483, 70.1584], [-124.28968, 69.39969], [-123.06108, 69.56372], [-122.6835, 69.85553], [-121.47226, 69.79778], [-119.94288, 69.37786], [-117.60268, 69.01128], [-116.22643, 68.84151], [-115.2469, 68.90591], [-113.89794, 68.3989], [-115.30489, 67.90261], [-113.49727, 67.68815], [-110.798, 67.80612], [-109.94619, 67.98104], [-108.8802, 67.38144], [-107.79239, 67.88736], [-108.81299, 68.31164], [-108.16721, 68.65392], [-106.95, 68.7], [-106.15, 68.8], [-105.34282, 68.56122], [-104.33791, 68.018], [-103.22115, 68.09775], [-101.45433, 67.64689], [-99.90195, 67.80566], [-98.4432, 67.78165], [-98.5586, 68.40394], [-97.66948, 68.57864], [-96.11991, 68.23939], [-96.12588, 67.29338], [-95.48943, 68.0907], [-94.685, 68.06383], [-94.23282, 69.06903], [-95.30408, 69.68571], [-96.47131, 70.08976], [-96.39115, 71.19482], [-95.2088, 71.92053], [-93.88997, 71.76015], [-92.87818, 71.31869], [-91.51964, 70.19129], [-92.40692, 69.69997], [-90.5471, 69.49766]]], [[[-114.167169999999871, 73.12145], [-114.66634, 72.65277], [-112.441019999999867, 72.9554], [-111.05039, 72.4504], [-109.920349999999857, 72.96113], [-109.00654, 72.63335], [-108.188349999999886, 71.65089], [-107.68599, 72.06548], [-108.39639, 73.08953], [-107.51645, 73.23598], [-106.522589999999866, 73.07601], [-105.402459999999877, 72.67259], [-104.77484, 71.6984], [-104.464759999999814, 70.99297], [-102.78537, 70.49776], [-100.980779999999868, 70.02432], [-101.089289999999892, 69.58447000000011], [-102.731159999999875, 69.50402], [-102.09329, 69.11962], [-102.43024, 68.75282], [-104.24, 68.91], [-105.96, 69.180000000000135], [-107.12254, 69.11922], [-108.999999999999872, 68.78], [-111.534148875200117, 68.630059156817921], [-113.3132, 68.53554], [-113.854959999999807, 69.007440000000102], [-115.22, 69.28], [-116.10794, 69.16821], [-117.34, 69.960000000000107], [-116.674729999999869, 70.06655], [-115.13112, 70.2373], [-113.72141, 70.19237], [-112.4161, 70.36638], [-114.35, 70.6], [-116.48684, 70.52045], [-117.9048, 70.540560000000127], [-118.43238, 70.9092], [-116.11311, 71.30918], [-117.65568, 71.2952], [-119.40199, 71.55859], [-118.56267, 72.30785], [-117.866419999999877, 72.70594], [-115.18909, 73.314590000000109], [-114.167169999999871, 73.12145]]], [[[-104.5, 73.42], [-105.38, 72.76], [-106.94, 73.46], [-106.6, 73.6], [-105.26, 73.64], [-104.5, 73.42]]], [[[-76.34, 73.102684989953005], [-76.251403808593736, 72.826385498046861], [-77.314437866210895, 72.85554504394527], [-78.391670227050795, 72.876655578613253], [-79.486251831054645, 72.742202758789062], [-79.775833129882827, 72.80290222167973], [-80.876098632812514, 73.333183288574205], [-80.833885192871051, 73.693183898925767], [-80.353057861328111, 73.75971984863277], [-78.064437866210923, 73.651931762695327], [-76.34, 73.102684989953005]]], [[[-86.562178514334107, 73.157447007938444], [-85.774371304044521, 72.534125881633798], [-84.850112474288224, 73.34027822538711], [-82.315590176100969, 73.750950832810574], [-80.600087653307611, 72.716543687624181], [-80.748941616524391, 72.061906643350753], [-78.770638597310764, 72.352173163534147], [-77.824623989559569, 72.749616604291035], [-75.605844692675717, 72.243678493937381], [-74.228616095664975, 71.767144273557889], [-74.099140794557698, 71.330840155717638], [-72.242225714797641, 71.556924546994495], [-71.200015428335192, 70.920012518997211], [-68.78605424668487, 70.525023708774242], [-67.914970465756923, 70.121947536897594], [-66.969033372654152, 69.18608734809186], [-68.805122850200533, 68.720198472764409], [-66.449866095633851, 68.067163397892003], [-64.862314419195215, 67.847538560651614], [-63.424934454996745, 66.928473212340649], [-61.851981370680569, 66.862120673277829], [-62.163176845942296, 66.160251369889593], [-63.91844438338417, 64.998668524832837], [-65.148860236253611, 65.426032619886669], [-66.72121904159853, 66.388041083432185], [-68.015016038673949, 66.262725735124391], [-68.141287400979152, 65.689789130304362], [-67.089646165623392, 65.108455105236985], [-65.732080451099748, 64.64840566675862], [-65.320167609301265, 64.382737128346051], [-64.669406297449669, 63.392926744227474], [-65.013803880458894, 62.674185085695974], [-66.275044725190455, 62.945098781986069], [-68.783186204692711, 63.745670071051805], [-67.369680752213029, 62.883965562584869], [-66.328297288667201, 62.28007477482204], [-66.165568203380147, 61.930897121825879], [-68.877366502544632, 62.330149237712803], [-71.023437059193824, 62.910708116295829], [-72.23537858751898, 63.397836005295154], [-71.886278449171286, 63.679989325608837], [-73.37830624051837, 64.193963121183813], [-74.834418911422588, 64.679075629323776], [-74.818502570276706, 64.389093329517962], [-77.709979824520019, 64.229542344816778], [-78.55594885935416, 64.572906399180127], [-77.897281053361908, 65.309192206474776], [-76.018274298797181, 65.326968899183143], [-73.95979529488271, 65.454764716240888], [-74.293883429649625, 65.81177134872938], [-73.94491248238262, 66.310578111426722], [-72.65116716173938, 67.284575507263853], [-72.926059943316076, 67.726925767682374], [-73.311617804645721, 68.069437160912898], [-74.8433072577768, 68.554627183701271], [-76.869100918266739, 68.894735622830254], [-76.228649054657339, 69.147769273547411], [-77.28736996123709, 69.769540106883269], [-78.168633999326588, 69.826487535268896], [-78.95724219431672, 70.166880194775402], [-79.492455003563649, 69.871807766388898], [-81.305470954091732, 69.743185126414332], [-84.944706183598456, 69.966634019644388], [-87.060003424817864, 70.260001125765356], [-88.681713223001495, 70.410741278760796], [-89.513419562523012, 70.762037665480975], [-88.467721116880753, 71.218185533321318], [-89.888151211287465, 71.222552191849942], [-90.205160285181989, 72.235074367960792], [-89.43657670770493, 73.129464219852352], [-88.408241543312784, 73.537888902471209], [-85.826151089200906, 73.803815823045213], [-86.562178514334107, 73.157447007938444]]], [[[-100.35642, 73.84389], [-99.16387, 73.63339], [-97.38, 73.76], [-97.12, 73.47], [-98.05359, 72.99052], [-96.54, 72.56], [-96.72, 71.66], [-98.35966, 71.27285], [-99.32286, 71.35639], [-100.01482, 71.73827], [-102.5, 72.51], [-102.48, 72.83], [-100.43836, 72.70588], [-101.54, 73.36], [-100.35642, 73.84389]]], [[[-93.196295539100205, 72.771992499473342], [-94.26904659704725, 72.024596259235949], [-95.409855516322637, 72.061880805134578], [-96.033745083382428, 72.940276801231789], [-96.01826799191096, 73.437429918095788], [-95.495793423224001, 73.862416897264154], [-94.503657599652328, 74.134906724739196], [-92.420012173211745, 74.100025132942179], [-90.509792853542578, 73.85673248971203], [-92.003965216829869, 72.966244208458477], [-93.196295539100205, 72.771992499473342]]], [[[-120.46, 71.383601793087578], [-123.09219, 70.90164], [-123.62, 71.34], [-125.92894873747332, 71.868688463011395], [-125.499999999999872, 72.292260811795003], [-124.80729, 73.02256], [-123.94, 73.680000000000135], [-124.917749999999899, 74.292750000000112], [-121.53788, 74.44893], [-120.10978, 74.24135], [-117.55564, 74.18577], [-116.58442, 73.89607], [-115.51081, 73.47519], [-116.767939999999882, 73.22292], [-119.22, 72.52], [-120.46, 71.82], [-120.46, 71.383601793087578]]], [[[-93.612755906940464, 74.979997260224437], [-94.156908738973812, 74.59234650338685], [-95.60868058956558, 74.666863918751758], [-96.820932176484561, 74.927623196096576], [-96.288587409229791, 75.377828274223333], [-94.850819871789113, 75.647217515760886], [-93.977746548217908, 75.296489569795952], [-93.612755906940464, 74.979997260224437]]], [[[-98.5, 76.72], [-97.735585, 76.25656], [-97.704415, 75.74344], [-98.16, 75.0], [-99.80874, 74.89744], [-100.88366, 75.05736], [-100.86292, 75.64075], [-102.50209, 75.5638], [-102.56552, 76.3366], [-101.48973, 76.30537], [-99.98349, 76.64634], [-98.57699, 76.58859], [-98.5, 76.72]]], [[[-108.21141, 76.20168], [-107.81943, 75.84552], [-106.92893, 76.01282], [-105.881, 75.9694], [-105.70498, 75.47951], [-106.31347, 75.00527], [-109.7, 74.85], [-112.22307, 74.41696], [-113.74381, 74.39427], [-113.87135, 74.72029], [-111.79421, 75.1625], [-116.31221, 75.04343], [-117.7104, 75.2222], [-116.34602, 76.19903], [-115.40487, 76.47887], [-112.59056, 76.14134], [-110.81422, 75.54919], [-109.0671, 75.47321], [-110.49726, 76.42982], [-109.5811, 76.79417], [-108.54859, 76.67832], [-108.21141, 76.20168]]], [[[-94.684085862999439, 77.097878323058367], [-93.573921068073105, 76.776295884906062], [-91.605023159536586, 76.778517971494594], [-90.741845872749209, 76.449597479956807], [-90.969661424507976, 76.074013170059445], [-89.822237921899244, 75.847773749485626], [-89.187082892599776, 75.610165513807615], [-87.838276333349611, 75.566188869927217], [-86.379192267588664, 75.482421373182163], [-84.789625210290595, 75.699204006646497], [-82.753444586910049, 75.784315090631225], [-81.12853084992436, 75.713983466282016], [-80.05751095245914, 75.336848863415867], [-79.833932868148324, 74.923127346487192], [-80.457770758775823, 74.657303778777774], [-81.948842536125511, 74.442459011524321], [-83.2288936022114, 74.564027818490928], [-86.097452358733292, 74.410032050261137], [-88.150350307960196, 74.392307033984977], [-89.764722052758358, 74.515555325001117], [-92.422440965529418, 74.837757880340973], [-92.768285488642789, 75.38681997344213], [-92.889905972041717, 75.882655341282629], [-93.893824022175977, 76.319243679500516], [-95.962457445035795, 76.44138092722244], [-97.121378953829463, 76.751077785947587], [-96.745122850312342, 77.161388658345132], [-94.684085862999439, 77.097878323058367]]], [[[-116.198586595507322, 77.645286770326194], [-116.335813361458349, 76.876961575010554], [-117.106050584768766, 76.530031846819114], [-118.040412157038119, 76.481171780087081], [-119.899317586885687, 76.053213406061971], [-121.499995077126471, 75.900018622532784], [-122.85492448615895, 76.116542873835684], [-122.854925293603188, 76.116542873835684], [-121.157535360328239, 76.864507554828336], [-119.103938971821023, 77.512219957174608], [-117.570130784965954, 77.498318996888102], [-116.198586595507322, 77.645286770326194]]], [[[-93.840003017943971, 77.51999726023449], [-94.295608283245244, 77.491342678528682], [-96.169654100310055, 77.55511139597688], [-96.436304490936109, 77.83462921824362], [-94.422577277386353, 77.820004787904978], [-93.720656297565867, 77.634331366680314], [-93.840003017943971, 77.51999726023449]]], [[[-110.186938035912945, 77.697014879050286], [-112.051191169058455, 77.409228827616843], [-113.534278937619035, 77.732206529441143], [-112.724586758253835, 78.051050116681935], [-111.264443325630822, 78.152956041161545], [-109.854451870547067, 77.996324774884812], [-110.186938035912945, 77.697014879050286]]], [[[-109.663145718202557, 78.601972561345676], [-110.88131425661885, 78.406919867659994], [-112.542091437615142, 78.407901719873493], [-112.525890876091566, 78.550554511215225], [-111.500010342233367, 78.849993598130538], [-110.96366065147599, 78.804440823065207], [-109.663145718202557, 78.601972561345676]]], [[[-95.830294969449312, 78.056941229963243], [-97.309842902397975, 77.85059723582178], [-98.124289313533964, 78.082856960757567], [-98.55286780474664, 78.458105373845086], [-98.631984422585504, 78.871930243638374], [-97.337231411512604, 78.831984361476756], [-96.754398769908761, 78.765812689926989], [-95.559277920294562, 78.41831452098026], [-95.830294969449312, 78.056941229963243]]], [[[-100.060191820052111, 78.324754340315891], [-99.670939093813601, 77.907544664207393], [-101.303940192452984, 78.018984890444798], [-102.949808722733025, 78.343228664860206], [-105.176132778731514, 78.38033234324574], [-104.210429450277147, 78.677420152491777], [-105.419580451258511, 78.918335679836431], [-105.492289191493128, 79.301593939929177], [-103.529282396237917, 79.16534902619162], [-100.8251580472688, 78.80046173777869], [-100.060191820052111, 78.324754340315891]]], [[[-87.02, 79.66], [-85.81435, 79.3369], [-87.18756, 79.0393], [-89.03535, 78.28723], [-90.80436, 78.21533], [-92.87669, 78.34333], [-93.95116, 78.75099], [-93.93574, 79.11373], [-93.14524, 79.3801], [-94.974, 79.37248], [-96.07614, 79.70502], [-96.70972, 80.15777], [-96.01644, 80.60233], [-95.32345, 80.90729], [-94.29843, 80.97727], [-94.73542, 81.20646], [-92.40984, 81.25739], [-91.13289, 80.72345], [-89.45, 80.509322033898258], [-87.81, 80.32], [-87.02, 79.66]]], [[[-68.5, 83.106321516765732], [-65.82735, 83.02801], [-63.68, 82.9], [-61.85, 82.6286], [-61.89388, 82.36165], [-64.334, 81.92775], [-66.75342, 81.72527], [-67.65755, 81.50141], [-65.48031, 81.50657], [-67.84, 80.9], [-69.4697, 80.61683], [-71.18, 79.8], [-73.2428, 79.63415], [-73.88, 79.430162204802073], [-76.90773, 79.32309], [-75.52924, 79.19766], [-76.22046, 79.01907], [-75.39345, 78.52581], [-76.34354, 78.18296], [-77.88851, 77.89991], [-78.36269, 77.50859], [-79.75951, 77.20968], [-79.61965, 76.98336], [-77.91089, 77.022045], [-77.88911, 76.777955], [-80.56125, 76.17812], [-83.17439, 76.45403], [-86.11184, 76.29901], [-87.6, 76.42], [-89.49068, 76.47239], [-89.6161, 76.95213], [-87.76739, 77.17833], [-88.26, 77.9], [-87.65, 77.970222222222205], [-84.97634, 77.53873], [-86.34, 78.18], [-87.96192, 78.37181], [-87.15198, 78.75867], [-85.37868, 78.9969], [-85.09495, 79.34543], [-86.50734, 79.73624], [-86.93179, 80.25145], [-84.19844, 80.20836], [-83.408695652173819, 80.1], [-81.84823, 80.46442], [-84.1, 80.58], [-87.59895, 80.51627], [-89.36663, 80.85569], [-90.2, 81.26], [-91.36786, 81.5531], [-91.58702, 81.89429], [-90.1, 82.085], [-88.93227, 82.11751], [-86.97024, 82.27961], [-85.5, 82.652273458057024], [-84.260005, 82.6], [-83.18, 82.32], [-82.42, 82.86], [-81.1, 83.02], [-79.30664, 83.13056], [-76.25, 83.172058823529369], [-75.71878, 83.06404], [-72.83153, 83.23324], [-70.665765, 83.169780758382828], [-68.5, 83.106321516765732]]]] } },
+            { "type": "Feature", "properties": { "admin": "Switzerland", "name": "Switzerland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[9.594226108446346, 47.525058091820256], [9.632931756232974, 47.347601223329974], [9.479969516649019, 47.102809963563367], [9.932448357796657, 46.920728054382948], [10.442701450246627, 46.893546250997424], [10.36337812667861, 46.483571275409851], [9.922836541390378, 46.314899400409182], [9.182881707403054, 46.440214748716976], [8.966305779667804, 46.036931871111186], [8.489952426801322, 46.005150865251672], [8.316629672894377, 46.163642483090847], [7.755992058959832, 45.824490057959302], [7.273850945676655, 45.776947740250769], [6.843592970414504, 45.991146552100595], [6.500099724970424, 46.429672756529428], [6.022609490593537, 46.272989813820466], [6.037388950229, 46.725778713561859], [6.768713820023605, 47.287708238303686], [6.736571079138058, 47.541801255882838], [7.192202182655505, 47.449765529971003], [7.466759067422228, 47.620581976911794], [8.31730146651415, 47.613579820336255], [8.522611932009765, 47.830827541691285], [9.594226108446346, 47.525058091820256]]] } },
+            { "type": "Feature", "properties": { "admin": "Chile", "name": "Chile", "continent": "South America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-68.634010227583147, -52.636370458874353], [-68.633349999999879, -54.8695], [-67.56244, -54.87001], [-66.95992, -54.89681], [-67.291029999999878, -55.30124], [-68.148629999999841, -55.61183], [-68.639990810811796, -55.580017999086877], [-69.2321, -55.49906], [-69.95809, -55.19843], [-71.00568, -55.05383], [-72.2639, -54.49514], [-73.2852, -53.957519999999874], [-74.66253, -52.83749], [-73.8381, -53.04743], [-72.43418, -53.7154], [-71.10773, -54.07433], [-70.591779999999787, -53.61583], [-70.26748, -52.93123], [-69.345649999999878, -52.5183], [-68.634010227583147, -52.636370458874353]]], [[[-68.219913092711224, -21.49434661223183], [-67.828179897722634, -22.872918796482178], [-67.106673550063604, -22.735924574476392], [-66.985233934177629, -22.986348565362825], [-67.328442959244128, -24.025303236590908], [-68.417652960876111, -24.518554782816874], [-68.386001146097342, -26.185016371365229], [-68.594799770772667, -26.50690886811126], [-68.295541551370391, -26.899339694935787], [-69.001234910748266, -27.521213881136127], [-69.656130337183143, -28.459141127233686], [-70.013550381129861, -29.367922865518544], [-69.919008348251921, -30.336339206668306], [-70.535068935819439, -31.365010267870279], [-70.074399380153622, -33.09120981214803], [-69.814776984319209, -33.273886000299839], [-69.817309129501453, -34.193571465798279], [-70.388049485949082, -35.169687595359441], [-70.364769253201658, -36.005088799789931], [-71.121880662709771, -36.65812387466233], [-71.118625047475419, -37.576827487947192], [-70.814664272734703, -38.552995293940732], [-71.413516608349042, -38.916022230791107], [-71.680761277946445, -39.808164157878061], [-71.915734015577542, -40.832339369470716], [-71.746803758415453, -42.051386407235988], [-72.148898078078517, -42.254888197601375], [-71.915423956983901, -43.408564548517404], [-71.464056159130493, -43.787611179378324], [-71.793622606071935, -44.207172133156099], [-71.329800788036195, -44.407521661151677], [-71.222778896759721, -44.784242852559409], [-71.659315558545316, -44.973688653341434], [-71.552009446891233, -45.560732924177117], [-71.917258470330196, -46.884838148791786], [-72.44735531278026, -47.738532810253517], [-72.331160854771937, -48.244238376661819], [-72.648247443314929, -48.878618259476774], [-73.415435757120022, -49.318436374712952], [-73.328050910114456, -50.378785088909865], [-72.975746832964617, -50.741450290734299], [-72.309973517532342, -50.677009779666342], [-72.329403856074023, -51.425956312872394], [-71.914803839796321, -52.009022305865912], [-69.498362189396076, -52.142760912637236], [-68.571545376241332, -52.299443855346247], [-69.461284349226617, -52.291950772663924], [-69.94277950710611, -52.537930590373243], [-70.8451016913545, -52.899200528525711], [-71.006332160105217, -53.833252042201345], [-71.429794684520928, -53.856454760300373], [-72.557942877884855, -53.531410001184447], [-73.702756720662862, -52.835069268607249], [-73.702756720662862, -52.835070076051487], [-74.946763475225154, -52.262753588419017], [-75.260026007778507, -51.62935475037321], [-74.976632453089806, -51.043395684615675], [-75.47975419788348, -50.378371677451547], [-75.608015102831942, -48.673772881871784], [-75.182769741502128, -47.711919447623153], [-74.126580980104677, -46.939253431995084], [-75.644395311165439, -46.647643324572016], [-74.69215369332305, -45.76397633238097], [-74.351709357384252, -44.10304412208788], [-73.240356004515192, -44.454960625995611], [-72.717803921179765, -42.383355808278985], [-73.388899909138232, -42.117532240569567], [-73.701335618774834, -43.365776462579738], [-74.33194312203257, -43.224958184584395], [-74.017957119427152, -41.794812920906828], [-73.677099372029943, -39.942212823243111], [-73.217592536090663, -39.258688653318508], [-73.505559455037044, -38.282882582351064], [-73.588060879191076, -37.156284681956016], [-73.166717088499283, -37.123780206044351], [-72.553136969681717, -35.508840020491022], [-71.861732143832555, -33.909092706031522], [-71.438450486929895, -32.418899428030819], [-71.668720669222424, -30.920644626592516], [-71.370082567007714, -30.095682061484997], [-71.48989437527645, -28.861442152625909], [-70.905123867461569, -27.640379734001193], [-70.724953986275963, -25.705924167587209], [-70.403965827095035, -23.628996677344542], [-70.091245897080668, -21.393319187101223], [-70.164419725205974, -19.756468194256183], [-70.372572394477714, -18.347975355708879], [-69.858443569605797, -18.092693780187027], [-69.590423753523979, -17.580011895419286], [-69.100246955019401, -18.260125420812653], [-68.966818406841824, -18.981683444904089], [-68.442225104430918, -19.405068454671419], [-68.757167121033703, -20.37265797290447], [-68.219913092711224, -21.49434661223183]]]] } },
+            { "type": "Feature", "properties": { "admin": "China", "name": "China", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[110.339187860151526, 18.678395087147603], [109.475209588663702, 18.19770091396861], [108.655207961056135, 18.507681993071397], [108.626217482540426, 19.367887885001974], [109.119055617308007, 19.821038519769385], [110.211598748822837, 20.101253973872073], [110.786550734502228, 20.077534491450077], [111.01005130416462, 19.695929877190732], [110.570646600386794, 19.255879218009305], [110.339187860151526, 18.678395087147603]]], [[[127.657407261262378, 49.760270494172929], [129.397817824420429, 49.440600084015429], [130.58229332898236, 48.729687404976112], [130.987281528853828, 47.790132351261391], [132.506671991099495, 47.788969631534876], [133.373595819228001, 48.183441677434914], [135.026311476786702, 48.478229885443902], [134.500813836810607, 47.578439846377833], [134.112362095272601, 47.212467352886719], [133.76964399631288, 46.116926988299056], [133.097126906466428, 45.14406647397216], [131.883454217659562, 45.32116160743643], [131.025212030156069, 44.967953192721573], [131.288555129115537, 44.111519680348252], [131.144687941614848, 42.929989732426932], [130.633866408409801, 42.903014634770543], [130.640015903852429, 42.39500946712527], [129.994267205933227, 42.985386867843793], [129.596668735879462, 42.424981797854592], [128.05221520397231, 41.994284572917984], [128.208433058790717, 41.466771552082534], [127.343782993683021, 41.503151760415953], [126.869083286649854, 41.816569322266155], [126.18204511932943, 41.107336127276362], [125.079941847840587, 40.569823716792449], [124.265624627785314, 39.928493353834135], [122.86757042856101, 39.637787583976255], [122.131387974130917, 39.170451768544623], [121.054554478032856, 38.89747101496291], [121.585994907722466, 39.360853583324136], [121.376757033372641, 39.750261338859524], [122.168595005381007, 40.422442531896046], [121.640358514493528, 40.946389878903304], [120.768628778161954, 40.593388169917596], [119.639602085449056, 39.898055935214209], [119.023463983233015, 39.252333075511096], [118.042748651197897, 39.204273993479674], [117.532702264477052, 38.73763580988409], [118.05969852098967, 38.061475531561051], [118.878149855628351, 37.897325344385898], [118.911636183753501, 37.448463853498723], [119.702802362142037, 37.156388658185072], [120.823457472823648, 37.870427761377968], [121.711258579597938, 37.481123358707165], [122.357937453298462, 37.454484157860684], [122.519994744965814, 36.930614325501828], [121.104163853033029, 36.651329047180432], [120.63700890511457, 36.111439520811125], [119.66456180224607, 35.609790554337728], [119.151208123858567, 34.909859117160458], [120.227524855633717, 34.360331936168613], [120.620369093916565, 33.37672272392512], [121.229014113450219, 32.460318711877186], [121.908145786630044, 31.692174384074683], [121.891919386890336, 30.949351508095098], [121.264257440273298, 30.676267401648712], [121.503519321784722, 30.14291494396425], [122.092113885589086, 29.832520453403156], [121.93842817595305, 29.018022365834803], [121.684438511238469, 28.225512600206677], [121.125661248866436, 28.135673122667178], [120.395473260582307, 27.053206895449385], [119.585496860839555, 25.740780544532605], [118.656871372554519, 24.547390855400234], [117.281606479970833, 23.624501451099714], [115.890735304835118, 22.782873236578094], [114.763827345846209, 22.668074042241663], [114.152546828265656, 22.223760077396204], [113.806779819800752, 22.548339748621423], [113.241077915501592, 22.051367499270462], [111.843592157032447, 21.550493679281512], [110.78546552942413, 21.39714386645533], [110.444039341271662, 20.34103261970639], [109.88986128137357, 20.282457383703441], [109.627655063924635, 21.008227037026725], [109.864488153118316, 21.395050970947516], [108.522812941524421, 21.715212307211821], [108.050180291782979, 21.552379869060101], [107.043420037872636, 21.8118989120299], [106.567273390735352, 22.21820486092474], [106.725403273548466, 22.794267889898375], [105.811247186305209, 22.976892401617899], [105.329209425886631, 23.352063300056976], [104.476858351664475, 22.819150092046918], [103.504514601660503, 22.703756618739217], [102.706992222100155, 22.708795070887696], [102.170435825613552, 22.464753119389336], [101.652017856861576, 22.318198757409554], [101.803119744882906, 21.174366766845051], [101.27002566936001, 21.201651923095167], [101.180005324307558, 21.436572984294052], [101.150032993578236, 21.849984442629015], [100.416537713627349, 21.558839423096654], [99.983489211021549, 21.742936713136451], [99.240898878987196, 22.118314317304559], [99.53199222208741, 22.949038804612591], [98.898749220782804, 23.142722072842581], [98.66026248575578, 24.063286037690002], [97.604719679762027, 23.897404690033049], [97.724609002679131, 25.083637193293036], [98.671838006589212, 25.91870250091349], [98.712093947344556, 26.743535874940243], [98.682690057370507, 27.508812160750658], [98.246230910233351, 27.747221381129172], [97.91198774616943, 28.335945136014367], [97.327113885490007, 28.261582749946339], [96.248833449287829, 28.411030992134467], [96.586590610747521, 28.830979519154361], [96.117678664131006, 29.452802028922513], [95.404802280664626, 29.031716620392157], [94.565990431702929, 29.27743805593996], [93.413347609432662, 28.640629380807233], [92.503118931043616, 27.896876329046442], [91.696656528696693, 27.771741848251615], [91.258853794319876, 28.040614325466343], [90.730513950567797, 28.064953925075738], [90.015828891971182, 28.296438503527177], [89.475810174521158, 28.042758897406365], [88.814248488320573, 27.299315904239389], [88.730325962278528, 28.086864732367552], [88.120440708369941, 27.876541652939572], [86.954517043000635, 27.974261786403524], [85.823319940131526, 28.203575954698742], [85.011638218123053, 28.642773952747369], [84.23457970575015, 28.839893703724691], [83.89899295444674, 29.320226141877633], [83.337115106137176, 29.463731594352193], [82.327512648450877, 30.115268052688204], [81.525804477874786, 30.422716986608659], [81.111256138029276, 30.183480943313402], [79.721366815107118, 30.882714748654728], [78.738894484374001, 31.515906073527045], [78.458446486326025, 32.61816437431272], [79.176128777995544, 32.483779812137747], [79.208891636068543, 32.994394639613738], [78.811086460285722, 33.506198025032397], [78.912268914713209, 34.321936346975768], [77.83745079947461, 35.494009507787794], [76.192848341785705, 35.89840342868785], [75.896897414050173, 36.666806138651872], [75.158027785140987, 37.133030910789152], [74.980002475895404, 37.419990139305888], [74.829985792952144, 37.990007025701445], [74.864815708316783, 38.378846340481587], [74.25751427602269, 38.606506862943476], [73.928852166646394, 38.505815334622717], [73.675379266254836, 39.431236884105566], [73.960013055318427, 39.660008449861714], [73.822243686828315, 39.893973497063136], [74.776862420556043, 40.366425279291619], [75.467827996730719, 40.56207225194867], [76.526368035797432, 40.427946071935132], [76.90448449087711, 41.066485907549648], [78.187196893226044, 41.185315863604799], [78.543660923175253, 41.582242540038713], [80.119430373051401, 42.12394074153822], [80.259990268885318, 42.34999929459908], [80.180150180994374, 42.920067857426844], [80.866206496101213, 43.180362046881008], [79.966106398441426, 44.917516994804622], [81.947070753918084, 45.317027492853143], [82.458925815769035, 45.539649563166499], [83.180483839860543, 47.330031236350735], [85.164290399113213, 47.000955715516099], [85.720483839870667, 47.452969468773077], [85.76823286330837, 48.455750637396896], [86.59877648310335, 48.549181626980605], [87.359970330762692, 49.214980780629148], [87.751264276076668, 49.297197984405464], [88.013832228551678, 48.599462795600594], [88.854297723346747, 48.069081732773007], [90.280825636763893, 47.693549099307901], [90.970809360724957, 46.88814606382293], [90.585768263718307, 45.719716091487491], [90.945539585334316, 45.286073309910243], [92.133890822318222, 45.115075995456429], [93.480733677141316, 44.97547211362], [94.688928664125356, 44.352331854828456], [95.306875441471504, 44.241330878265458], [95.762454868556688, 43.319449164394619], [96.349395786527808, 42.725635280928643], [97.451757440177971, 42.74888967546007], [99.515817498779995, 42.524691473961688], [100.845865513108279, 42.663804429691417], [101.833040399179936, 42.51487295182627], [103.312278273534787, 41.907468166667613], [104.522281935649005, 41.90834666601662], [104.964993931093431, 41.597409572916334], [106.129315627061658, 42.134327704428891], [107.744772576937976, 42.481515814781908], [109.243595819131428, 42.519446316084149], [110.412103306115299, 42.871233628911014], [111.129682244920218, 43.406834011400171], [111.82958784388137, 43.743118394539486], [111.667737257943202, 44.073175767587706], [111.348376906379428, 44.457441718110047], [111.87330610560025, 45.102079372735112], [112.436062453258842, 45.01164561622425], [113.463906691544196, 44.808893134127111], [114.46033165899604, 45.339816799493875], [115.985096470200133, 45.727235012386004], [116.717868280098855, 46.38820241961524], [117.421701287914246, 46.67273285581421], [118.874325799638711, 46.805412095723646], [119.663269891438745, 46.692679958678944], [119.772823927897562, 47.048058783550132], [118.866574334794947, 47.747060044946195], [118.064142694166719, 48.06673045510373], [117.295507440257438, 47.697709052107385], [116.308952671373234, 47.853410142602812], [115.742837355615734, 47.726544501326273], [115.485282017073018, 48.135382595403442], [116.191802199367601, 49.134598090199056], [116.67880089728618, 49.888531399121398], [117.879244419426371, 49.510983384796944], [119.288460728025839, 50.142882798862033], [119.279365675942358, 50.582907619827282], [120.182049595216924, 51.64356639261802], [120.738191359541972, 51.964115302124547], [120.725789015791975, 52.516226304730814], [120.177088657716865, 52.753886216841195], [121.003084751470226, 53.251401068731226], [122.245747918792858, 53.431725979213681], [123.571506789240843, 53.458804429734627], [125.068211297710434, 53.161044826868832], [125.946348911646169, 52.792798570356936], [126.564399041856959, 51.784255479532689], [126.939156528837657, 51.353894151405896], [127.287455682484904, 50.739797268265434], [127.657407261262378, 49.760270494172929]]]] } },
+            { "type": "Feature", "properties": { "admin": "Ivory Coast", "name": "C�te d'Ivoire", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-2.856125047202397, 4.994475816259508], [-3.311084357100071, 4.984295559098014], [-4.008819545904941, 5.179813340674314], [-4.64991736491791, 5.168263658057084], [-5.834496222344525, 4.993700669775135], [-6.528769090185845, 4.705087795425015], [-7.518941209330434, 4.338288479017307], [-7.712159389669749, 4.364565944837721], [-7.63536821128403, 5.188159084489455], [-7.53971513511176, 5.313345241716517], [-7.570152553731686, 5.707352199725903], [-7.993692592795879, 6.126189683451541], [-8.311347622094017, 6.193033148621081], [-8.602880214868618, 6.467564195171659], [-8.385451626000572, 6.911800645368742], [-8.485445522485348, 7.395207831243068], [-8.439298468448696, 7.686042792181736], [-8.280703497744936, 7.687179673692156], [-8.221792364932197, 8.123328762235571], [-8.299048631208562, 8.316443589710302], [-8.203498907900878, 8.455453192575446], [-7.832100389019186, 8.575704250518625], [-8.079113735374348, 9.376223863152033], [-8.309616461612249, 9.789531968622439], [-8.22933712404682, 10.129020290563897], [-8.029943610048617, 10.206534939001711], [-7.89958980959237, 10.297382106970824], [-7.622759161804808, 10.147236232946792], [-6.850506557635057, 10.138993841996237], [-6.666460944027547, 10.430810655148447], [-6.493965013037267, 10.411302801958268], [-6.205222947606429, 10.524060777219132], [-6.050452032892266, 10.096360785355442], [-5.816926235365286, 10.222554633012191], [-5.404341599946973, 10.370736802609144], [-4.954653286143098, 10.152713934769732], [-4.779883592131966, 9.821984768101741], [-4.330246954760383, 9.610834865757139], [-3.980449184576684, 9.862344061721698], [-3.511898972986272, 9.900326239456216], [-2.827496303712706, 9.642460842319775], [-2.56218950032624, 8.219627793811481], [-2.983584967450326, 7.379704901555511], [-3.244370083011261, 6.2504715031135], [-2.810701463217839, 5.389051215024109], [-2.856125047202397, 4.994475816259508]]] } },
+            { "type": "Feature", "properties": { "admin": "Cameroon", "name": "Cameroon", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[13.07582238124675, 2.267097072759014], [12.951333855855605, 2.321615708826939], [12.359380323952218, 2.19281220133945], [11.751665480199787, 2.326757513839993], [11.276449008843711, 2.261050930180871], [9.649158155972627, 2.283866075037735], [9.795195753629455, 3.073404445809117], [9.404366896205998, 3.734526882335202], [8.948115675501068, 3.904128933117135], [8.744923943729416, 4.352215277519959], [8.488815545290889, 4.495617377129917], [8.500287713259693, 4.771982937026847], [8.757532993208626, 5.47966583904791], [9.233162876023043, 6.444490668153334], [9.522705926154398, 6.453482367372116], [10.118276808318255, 7.038769639509879], [10.497375115611417, 7.055357774275562], [11.058787876030349, 6.644426784690593], [11.745774366918509, 6.981382961449753], [11.839308709366801, 7.397042344589434], [12.063946160539556, 7.799808457872301], [12.218872104550597, 8.305824082874322], [12.753671502339214, 8.717762762888993], [12.955467970438971, 9.417771714714702], [13.1675997249971, 9.64062632897341], [13.308676385153914, 10.160362046748926], [13.572949659894558, 10.798565985553564], [14.415378859116682, 11.572368882692071], [14.468192172918974, 11.90475169519341], [14.57717776862253, 12.085360826053501], [14.181336297266792, 12.483656927943112], [14.213530714584634, 12.802035427293344], [14.495787387762842, 12.859396267137326], [14.893385857816522, 12.219047756392582], [14.960151808337598, 11.555574042197222], [14.923564894274955, 10.891325181517471], [15.467872755605269, 9.982336737503429], [14.909353875394713, 9.99212942142273], [14.627200555081057, 9.920919297724536], [14.171466098699025, 10.021378282099928], [13.954218377344002, 9.549494940626685], [14.544466586981766, 8.965861314322266], [14.979995558337688, 8.796104234243471], [15.120865512765331, 8.382150173369423], [15.436091749745765, 7.692812404811971], [15.279460483469107, 7.421924546737968], [14.776545444404572, 6.408498033062044], [14.536560092841111, 6.22695872642069], [14.459407179429345, 5.451760565610299], [14.558935988023501, 5.03059764243153], [14.478372430080466, 4.732605495620446], [14.950953403389658, 4.21038930909492], [15.036219516671249, 3.851367295747123], [15.405395948964379, 3.335300604664339], [15.862732374747479, 3.013537298998982], [15.907380812247649, 2.557389431158612], [16.01285241055535, 2.267639675298084], [15.940918816805061, 1.727672634280295], [15.14634199388524, 1.964014797367184], [14.337812534246577, 2.22787466064949], [13.07582238124675, 2.267097072759014]]] } },
+            { "type": "Feature", "properties": { "admin": "Democratic Republic of the Congo", "name": "Dem. Rep. Congo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[30.833859897593801, 3.50916596111034], [30.773346795380036, 2.339883327642127], [31.174149204235807, 2.204465236821263], [30.852670118948048, 1.849396470543809], [30.468507521290292, 1.58380544677972], [30.086153598762703, 1.062312730306288], [29.875778842902488, 0.597379868976304], [29.819503208136634, -0.205310153813372], [29.587837762172164, -0.58740569417948], [29.579466180140876, -1.341313164885626], [29.29188683443661, -1.620055840667987], [29.254834832483336, -2.215109958508911], [29.117478875451546, -2.292211195488384], [29.02492638521678, -2.839257907730157], [29.276383904749046, -3.293907159034063], [29.339997592900342, -4.499983412294092], [29.519986606572925, -5.419978936386313], [29.41999271008816, -5.939998874539432], [29.620032179490003, -6.520015150583424], [30.199996779101692, -7.079980970898161], [30.740015496551781, -8.340007419470913], [30.34608605319081, -8.238256524288216], [29.002912225060467, -8.40703175215347], [28.734866570762495, -8.526559340044576], [28.449871046672818, -9.164918308146083], [28.673681674928922, -9.605924981324931], [28.496069777141763, -10.789883721564044], [28.372253045370421, -11.793646742401389], [28.642417433392346, -11.971568698782312], [29.341547885869087, -12.36074391037241], [29.616001417771223, -12.178894545137307], [29.699613885219485, -13.257226657771827], [28.934285922976834, -13.248958428605132], [28.52356163912102, -12.698604424696679], [28.15510867687998, -12.272480564017894], [27.38879886242378, -12.132747491100663], [27.164419793412456, -11.608748467661071], [26.55308759939961, -11.924439792532125], [25.752309604604726, -11.784965101776356], [25.418118116973197, -11.330935967659958], [24.783169793402948, -11.238693536018962], [24.314516228947948, -11.262826429899269], [24.257155389103982, -10.951992689663655], [23.912215203555714, -10.926826267137512], [23.456790805767433, -10.867863457892481], [22.837345411884733, -11.017621758674329], [22.402798292742371, -10.99307545333569], [22.155268182064304, -11.084801120653768], [22.208753289486388, -9.894796237836507], [21.87518191904234, -9.523707777548564], [21.801801385187897, -8.908706556842978], [21.949130893652036, -8.305900974158275], [21.746455926203303, -7.920084730667147], [21.728110792739695, -7.2908724910813], [20.514748162526498, -7.299605808138629], [20.601822950938292, -6.93931772219968], [20.091621534920645, -6.943090101756993], [20.037723016040214, -7.116361179231644], [19.417502475673157, -7.155428562044297], [19.166613396896107, -7.738183688999753], [19.016751743249664, -7.988245944860132], [18.464175652752683, -7.847014255406442], [18.134221632569048, -7.98767750410492], [17.472970004962232, -8.068551120641699], [17.089995965247166, -7.545688978712525], [16.860190870845198, -7.222297865429984], [16.573179965896141, -6.622644545115087], [16.326528354567042, -5.877470391466267], [13.375597364971892, -5.864241224799548], [13.02486941900696, -5.984388929878157], [12.735171339578695, -5.965682061388497], [12.322431674863507, -6.100092461779658], [12.182336866920249, -5.789930515163837], [12.436688266660866, -5.684303887559245], [12.468004184629734, -5.248361504745003], [12.631611769265788, -4.991271254092935], [12.995517205465173, -4.781103203961883], [13.258240187237044, -4.882957452009165], [13.600234816144676, -4.500138441590969], [14.144956088933295, -4.510008640158715], [14.209034864975219, -4.793092136253597], [14.582603794013179, -4.970238946150139], [15.170991652088441, -4.3435071753143], [15.753540073314749, -3.855164890156096], [16.006289503654298, -3.535132744972528], [15.972803175529149, -2.712392266453612], [16.407091912510051, -1.740927015798682], [16.86530683764212, -1.225816338713287], [17.523716261472853, -0.743830254726987], [17.638644646889983, -0.424831638189246], [17.663552687254676, -0.058083998213817], [17.826540154703245, 0.288923244626105], [17.774191928791563, 0.855658677571085], [17.89883548347958, 1.741831976728278], [18.09427575040743, 2.365721543788055], [18.39379235197114, 2.90044342692822], [18.453065219809925, 3.504385891123348], [18.542982211997778, 4.201785183118317], [18.932312452884755, 4.709506130385973], [19.467783644293146, 5.031527818212779], [20.290679152108932, 4.691677761245287], [20.927591180106273, 4.322785549329736], [21.659122755630019, 4.224341945813719], [22.405123732195531, 4.02916006104732], [22.704123569436284, 4.633050848810156], [22.841479526468103, 4.710126247573483], [23.297213982850135, 4.609693101414221], [24.41053104014625, 5.108784084489129], [24.805028924262409, 4.897246608902349], [25.128833449003274, 4.927244777847789], [25.278798455514302, 5.170408229997191], [25.650455356557465, 5.256087754737123], [26.402760857862535, 5.150874538590869], [27.044065382604703, 5.127852688004835], [27.374226108517483, 5.233944403500059], [27.979977247842807, 4.408413397637373], [28.428993768026906, 4.287154649264493], [28.696677687298795, 4.455077215996936], [29.159078403446497, 4.38926727947323], [29.715995314256013, 4.600804755060024], [29.953500197069467, 4.173699042167683], [30.833859897593801, 3.50916596111034]]] } },
+            { "type": "Feature", "properties": { "admin": "Republic of Congo", "name": "Congo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[12.995517205465173, -4.781103203961883], [12.620759718484491, -4.438023369976135], [12.318607618873923, -4.606230157086187], [11.914963006242086, -5.037986748884789], [11.093772820691923, -3.978826592630546], [11.855121697648114, -3.42687061932105], [11.478038771214299, -2.765618991714241], [11.820963575903189, -2.514161472181982], [12.495702752338159, -2.391688327650242], [12.575284458067639, -1.948511244315134], [13.109618767965626, -2.428740329603513], [13.992407260807706, -2.470804945489099], [14.299210239324564, -1.998275648612213], [14.425455763413593, -1.333406670744971], [14.316418491277741, -0.552627455247048], [13.843320753645653, 0.038757635901149], [14.276265903386953, 1.196929836426619], [14.026668735417214, 1.395677395021153], [13.282631463278816, 1.31418366129688], [13.003113641012074, 1.830896307783319], [13.07582238124675, 2.267097072759014], [14.337812534246577, 2.22787466064949], [15.14634199388524, 1.964014797367184], [15.940918816805061, 1.727672634280295], [16.01285241055535, 2.267639675298084], [16.537058139724135, 3.198254706226278], [17.133042433346297, 3.728196519379451], [17.809900343505259, 3.560196437998569], [18.453065219809925, 3.504385891123348], [18.39379235197114, 2.90044342692822], [18.09427575040743, 2.365721543788055], [17.89883548347958, 1.741831976728278], [17.774191928791563, 0.855658677571085], [17.826540154703245, 0.288923244626105], [17.663552687254676, -0.058083998213817], [17.638644646889983, -0.424831638189246], [17.523716261472853, -0.743830254726987], [16.86530683764212, -1.225816338713287], [16.407091912510051, -1.740927015798682], [15.972803175529149, -2.712392266453612], [16.006289503654298, -3.535132744972528], [15.753540073314749, -3.855164890156096], [15.170991652088441, -4.3435071753143], [14.582603794013179, -4.970238946150139], [14.209034864975219, -4.793092136253597], [14.144956088933295, -4.510008640158715], [13.600234816144676, -4.500138441590969], [13.258240187237044, -4.882957452009165], [12.995517205465173, -4.781103203961883]]] } },
+            { "type": "Feature", "properties": { "admin": "Colombia", "name": "Colombia", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-75.373223232713841, -0.15203175212045], [-75.801465827116587, 0.084801337073202], [-76.292314419240938, 0.416047268064119], [-76.576379767549383, 0.256935533037435], [-77.424984300430367, 0.395686753741117], [-77.668612840470416, 0.825893052570961], [-77.855061408179509, 0.809925034992773], [-78.855258755188686, 1.380923773601822], [-78.990935228171026, 1.691369940595251], [-78.617831387023699, 1.766404120283056], [-78.662118089497838, 2.267355454920476], [-78.427610439757302, 2.629555568854215], [-77.931542527971473, 2.696605739752925], [-77.510431281224996, 3.325016994638246], [-77.127689785455246, 3.849636135265356], [-77.496271938776999, 4.087606105969427], [-77.307601284479375, 4.667984117039452], [-77.533220587865713, 5.582811997902496], [-77.318815070286718, 5.845354112161359], [-77.476660732722266, 6.691116441266301], [-77.881571417945239, 7.223771267114783], [-77.75341386586139, 7.709839789252141], [-77.431107957656977, 7.638061224798733], [-77.242566494440069, 7.935278225125442], [-77.474722866511314, 8.524286200388216], [-77.353360765273848, 8.670504665558068], [-76.836673957003541, 8.638749497914715], [-76.086383836557843, 9.336820583529486], [-75.674600185840035, 9.443248195834597], [-75.664704149056149, 9.774003200718736], [-75.480425991503338, 10.618990383339305], [-74.906895107711975, 11.08304474532032], [-74.276752692344871, 11.102035834187586], [-74.197222663047683, 11.310472723836865], [-73.414763963500278, 11.227015285685479], [-72.62783525255962, 11.731971543825519], [-72.238194953078903, 11.955549628136325], [-71.754090135368628, 12.437303168177305], [-71.399822353791691, 12.376040757695289], [-71.137461107045866, 12.112981879113503], [-71.331583624950284, 11.776284084515805], [-71.973921678338272, 11.608671576377116], [-72.227575446242923, 11.108702093953237], [-72.614657762325194, 10.821975409381777], [-72.905286017534692, 10.45034434655477], [-73.027604132769554, 9.736770331252441], [-73.304951544880026, 9.151999823437604], [-72.788729824500379, 9.085027167187331], [-72.660494757768092, 8.62528778730268], [-72.439862230097944, 8.405275376820027], [-72.360900641555958, 8.002638454617893], [-72.479678921178831, 7.632506008327352], [-72.444487270788059, 7.42378489830048], [-72.19835242378187, 7.340430813013682], [-71.960175747348629, 6.991614895043538], [-70.674233567981503, 7.087784735538717], [-70.093312954372408, 6.960376491723109], [-69.389479946557103, 6.099860541198835], [-68.985318569602327, 6.206804917826856], [-68.265052456318216, 6.153268133972473], [-67.695087246355001, 6.267318020040645], [-67.34143958196556, 6.095468044454021], [-67.521531948502741, 5.556870428891968], [-67.744696621355203, 5.221128648291667], [-67.823012254493534, 4.503937282728898], [-67.621835903581271, 3.839481716319994], [-67.33756384954367, 3.542342230641721], [-67.303173183853417, 3.31845408773718], [-67.809938117123693, 2.820655015469569], [-67.447092047786299, 2.600280869960869], [-67.181294318293041, 2.250638129074062], [-66.876325853122566, 1.253360500489336], [-67.065048183852483, 1.130112209473225], [-67.25999752467358, 1.719998684084956], [-67.537810024674684, 2.037162787276329], [-67.868565029558823, 1.692455145673392], [-69.816973232691609, 1.714805202639624], [-69.804596727157701, 1.089081122233466], [-69.218637661400166, 0.985676581217433], [-69.252434048119042, 0.602650865070075], [-69.452396002872447, 0.706158758950693], [-70.015565761989293, 0.541414292804205], [-70.02065589057004, -0.185156345219539], [-69.577065395776586, -0.549991957200163], [-69.420485805932216, -1.122618503426409], [-69.444101935489599, -1.556287123219817], [-69.893635219996611, -4.298186944194326], [-70.394043952094975, -3.766591485207825], [-70.692682054309699, -3.742872002785858], [-70.047708502874841, -2.725156345229699], [-70.813475714791949, -2.256864515800742], [-71.413645799429773, -2.342802422702128], [-71.774760708285385, -2.169789727388937], [-72.325786505813639, -2.434218031426453], [-73.070392218707212, -2.308954359550952], [-73.659503546834586, -1.260491224781134], [-74.122395189089048, -1.002832533373848], [-74.441600511355958, -0.530820000819887], [-75.106624518520064, -0.05720549886486], [-75.373223232713841, -0.15203175212045]]] } },
+            { "type": "Feature", "properties": { "admin": "Costa Rica", "name": "Costa Rica", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-82.965783047197348, 8.225027980985983], [-83.508437262694287, 8.446926581247281], [-83.711473965169063, 8.656836249216864], [-83.596313035806631, 8.830443223501417], [-83.632641567707822, 9.051385809765319], [-83.909885626953724, 9.290802720573579], [-84.303401658856345, 9.487354030795712], [-84.64764421256865, 9.615537421095707], [-84.713350796227743, 9.908051866083849], [-84.975660366541319, 10.086723130733004], [-84.911374884770211, 9.795991522658921], [-85.110923428065291, 9.557039699741308], [-85.339488288092255, 9.834542141148658], [-85.660786505866966, 9.93334747969072], [-85.797444831062819, 10.134885565629032], [-85.791708747078417, 10.439337266476612], [-85.65931372754666, 10.754330959511718], [-85.941725430021748, 10.895278428587799], [-85.712540452807289, 11.088444932494822], [-85.561851976244171, 11.217119248901593], [-84.903003302738924, 10.952303371621895], [-84.673069017256239, 11.082657172078139], [-84.355930752281026, 10.999225572142901], [-84.190178595704822, 10.793450018756671], [-83.895054490885926, 10.726839097532444], [-83.655611741861563, 10.938764146361418], [-83.402319708982944, 10.39543813724465], [-83.015676642575158, 9.992982082555553], [-82.546196255203469, 9.566134751824674], [-82.932890998043561, 9.476812038608172], [-82.927154914059145, 9.074330145702914], [-82.719183112300513, 8.925708726431493], [-82.868657192704759, 8.807266343618521], [-82.829770677405151, 8.626295477732368], [-82.9131764391242, 8.423517157419068], [-82.965783047197348, 8.225027980985983]]] } },
+            { "type": "Feature", "properties": { "admin": "Cuba", "name": "Cuba", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-82.268151211257035, 23.188610744717703], [-81.404457160146819, 23.117271429938775], [-80.61876868358118, 23.105980129482994], [-79.679523688460222, 22.765303249598823], [-79.281485968732071, 22.399201565027049], [-78.347434455056472, 22.512166246017085], [-77.993295864560253, 22.277193508385928], [-77.146422492161037, 21.657851467367831], [-76.523824835908528, 21.20681956632437], [-76.194620123993175, 21.220565497314006], [-75.598222418912655, 21.01662445727413], [-75.671060350228032, 20.735091254147999], [-74.933896043584483, 20.693905137611381], [-74.178024868451246, 20.284627793859737], [-74.296648118777242, 20.050378526280678], [-74.961594611292924, 19.923435370355687], [-75.634680141894577, 19.873774318923193], [-76.323656175425981, 19.952890936762056], [-77.755480923153044, 19.855480861891873], [-77.085108405246729, 20.413353786698789], [-77.492654588516601, 20.673105373613886], [-78.137292243141573, 20.739948838783427], [-78.482826707661161, 21.028613389565848], [-78.719866502583997, 21.598113511638431], [-79.284999966127913, 21.559175319906497], [-80.217475348618635, 21.827324327069032], [-80.517534552721401, 22.037078965741756], [-81.820943366203167, 22.192056586185068], [-82.169991828118611, 22.387109279870746], [-81.79500179719264, 22.636964830001951], [-82.775897996740838, 22.688150336187057], [-83.494458787759328, 22.168517971276124], [-83.908800421875611, 22.154565334557329], [-84.052150845053248, 21.910575059491251], [-84.547030198896351, 21.801227728761639], [-84.974911058273079, 21.896028143801082], [-84.44706214062775, 22.204949856041903], [-84.23035702181177, 22.56575470630376], [-83.778239915690165, 22.78811839445569], [-83.267547573565736, 22.983041897060641], [-82.510436164057495, 23.078746649665181], [-82.268151211257035, 23.188610744717703]]] } },
+            { "type": "Feature", "properties": { "admin": "Northern Cyprus", "name": "N. Cyprus", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[32.731780226377445, 35.14002594658843], [32.802473585752743, 35.145503648411363], [32.946960890440799, 35.38670339613369], [33.667227003724939, 35.373215847305509], [34.576473829900458, 35.671595567358786], [33.900804477684197, 35.245755927057608], [33.973616570783456, 35.058506374647997], [33.866439650210104, 35.093594672174177], [33.675391880027057, 35.017862860650446], [33.525685255677494, 35.038688462864066], [33.475817498515845, 35.000344550103499], [33.45592207208346, 35.101423651666401], [33.383833449036295, 35.162711900364563], [33.190977003723042, 35.173124701471373], [32.919572381326127, 35.087832749973636], [32.731780226377445, 35.14002594658843]]] } },
+            { "type": "Feature", "properties": { "admin": "Cyprus", "name": "Cyprus", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[33.973616570783456, 35.058506374647997], [34.004880812320032, 34.978097846001852], [32.97982710137844, 34.571869411755436], [32.490296258277532, 34.701654771456468], [32.256667107885953, 35.103232326796622], [32.731780226377445, 35.14002594658843], [32.919572381326127, 35.087832749973636], [33.190977003723042, 35.173124701471373], [33.383833449036295, 35.162711900364563], [33.45592207208346, 35.101423651666401], [33.475817498515845, 35.000344550103499], [33.525685255677494, 35.038688462864066], [33.675391880027057, 35.017862860650446], [33.866439650210104, 35.093594672174177], [33.973616570783456, 35.058506374647997]]] } },
+            { "type": "Feature", "properties": { "admin": "Czech Republic", "name": "Czech Rep.", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.960288120194573, 48.596982326850593], [16.49928266771877, 48.785808010445095], [16.029647251050218, 48.733899034207916], [15.253415561593979, 49.039074205107575], [14.901447381254055, 48.964401760445817], [14.33889773932472, 48.555305284207193], [13.595945672264433, 48.877171942737135], [13.031328973043427, 49.307068182973232], [12.52102420416119, 49.54741526956272], [12.415190870827441, 49.96912079528056], [12.240111118222556, 50.266337795607271], [12.96683678554319, 50.484076443069071], [13.338131951560282, 50.733234361364346], [14.05622765468817, 50.926917629594286], [14.307013380600633, 51.117267767941399], [14.570718214586062, 51.002339382524262], [15.016995883858666, 51.106674099321566], [15.490972120839725, 50.7847299261432], [16.238626743238566, 50.697732652379827], [16.176253289462263, 50.4226073268579], [16.719475945714429, 50.215746568393527], [16.868769158605655, 50.473973700556016], [17.554567091551117, 50.36214590107641], [17.649445021238986, 50.049038397819942], [18.392913852622168, 49.988628648470737], [18.85314415861361, 49.496229763377634], [18.554971144289478, 49.495015367218777], [18.399993523846174, 49.315000515330034], [18.170498488037961, 49.271514797556421], [18.104972771891848, 49.043983466175298], [17.913511590250462, 48.996492824899072], [17.886484816161808, 48.903475246773695], [17.545006951577101, 48.800019029325362], [17.101984897538895, 48.8169688991171], [16.960288120194573, 48.596982326850593]]] } },
+            { "type": "Feature", "properties": { "admin": "Germany", "name": "Germany", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[9.92190636560923, 54.983104153048025], [9.939579705452898, 54.596641954153242], [10.950112338920517, 54.363607082733147], [10.939466993868447, 54.008693345752583], [11.95625247564328, 54.196485500701144], [12.518440382546711, 54.470370591847988], [13.647467075259495, 54.075510972705885], [14.119686313542555, 53.757029120491026], [14.353315463934164, 53.248171291713092], [14.074521111719431, 52.981262518925334], [14.437599725002197, 52.62485016540829], [14.685026482815713, 52.089947414755208], [14.607098422919645, 51.745188096719964], [15.016995883858781, 51.106674099321701], [14.570718214586119, 51.002339382524369], [14.307013380600662, 51.117267767941364], [14.05622765468831, 50.92691762959435], [13.338131951560397, 50.733234361364268], [12.966836785543249, 50.484076443069164], [12.240111118222668, 50.266337795607214], [12.41519087082747, 49.969120795280602], [12.521024204161332, 49.547415269562741], [13.031328973043513, 49.307068182973232], [13.595945672264575, 48.877171942737156], [13.243357374737112, 48.416114813829026], [12.884102817443873, 48.289145819687846], [13.025851271220514, 47.637583523135945], [12.93262698736606, 47.467645575543983], [12.620759718484519, 47.672387600284409], [12.141357456112869, 47.703083401065768], [11.426414015354847, 47.523766181013045], [10.544504021861597, 47.566399237653783], [10.402083774465321, 47.302487697939164], [9.896068149463188, 47.58019684507569], [9.594226108446376, 47.525058091820185], [8.522611932009793, 47.830827541691342], [8.317301466514092, 47.613579820336263], [7.466759067422286, 47.620581976911907], [7.59367638513106, 48.333019110703724], [8.099278598674855, 49.017783515003423], [6.658229607783709, 49.201958319691627], [6.186320428094176, 49.4638028021145], [6.242751092156992, 49.90222565367872], [6.043073357781109, 50.128051662794221], [6.156658155958779, 50.803721015010574], [5.988658074577812, 51.85161570902504], [6.589396599970825, 51.85202912048338], [6.842869500362381, 52.228440253297542], [7.092053256873895, 53.14404328064488], [6.905139601274128, 53.482162177130633], [7.100424838905268, 53.693932196662658], [7.936239454793961, 53.748295803433777], [8.121706170289483, 53.527792466844275], [8.800734490604667, 54.02078563090889], [8.572117954145368, 54.395646470754045], [8.526229282270206, 54.962743638725144], [9.282048780971136, 54.830865383516297], [9.92190636560923, 54.983104153048025]]] } },
+            { "type": "Feature", "properties": { "admin": "Djibouti", "name": "Djibouti", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[43.081226027200152, 12.699638576707112], [43.317852410664663, 12.390148423711022], [43.286381463398911, 11.974928290245883], [42.715873650896519, 11.735640570518338], [43.145304803242126, 11.462039699748853], [42.776851841000948, 10.926878566934416], [42.55493000000012, 11.105110000000193], [42.314140000000116, 11.0342], [41.755570000000191, 11.05091], [41.739590000000177, 11.355110000000137], [41.661760000000122, 11.6312], [42.000000000000107, 12.100000000000133], [42.351560000000106, 12.54223000000013], [42.779642368344739, 12.455415757695672], [43.081226027200152, 12.699638576707112]]] } },
+            { "type": "Feature", "properties": { "admin": "Denmark", "name": "Denmark", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[12.690006137755629, 55.60999095318077], [12.089991082414738, 54.800014553437919], [11.043543328504226, 55.36486379660424], [10.90391360845163, 55.779954738988735], [12.370904168353288, 56.111407375708822], [12.690006137755629, 55.60999095318077]]], [[[10.912181837618359, 56.4586213242779], [10.667803989309986, 56.081383368547208], [10.369992710011983, 56.190007229224719], [9.649984978889306, 55.469999498102041], [9.921906365609173, 54.983104153048046], [9.282048780971136, 54.830865383516155], [8.526229282270235, 54.962743638724973], [8.120310906617588, 55.517722683323612], [8.089976840862247, 56.540011705137587], [8.256581658571262, 56.809969387430286], [8.543437534223385, 57.110002753316891], [9.424469028367609, 57.172066148499468], [9.775558709358561, 57.447940782289649], [10.580005730846151, 57.730016587954843], [10.54610599126269, 57.21573273378614], [10.250000034230222, 56.890016181050456], [10.369992710011983, 56.60998159446082], [10.912181837618359, 56.4586213242779]]]] } },
+            { "type": "Feature", "properties": { "admin": "Dominican Republic", "name": "Dominican Rep.", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-71.71236141629295, 19.714455878167353], [-71.587304450146604, 19.884910590082093], [-70.806706102161726, 19.880285549391981], [-70.214364997016119, 19.622885240146157], [-69.950815192327568, 19.647999986240002], [-69.769250047470067, 19.293267116772437], [-69.222125820579862, 19.313214219637096], [-69.254346076113819, 19.015196234609871], [-68.809411994080818, 18.979074408437846], [-68.317943284768958, 18.612197577381689], [-68.689315965434503, 18.205142320218609], [-69.164945848248905, 18.422648423735108], [-69.623987596297624, 18.380712998930246], [-69.952933926051529, 18.428306993071057], [-70.133232998317879, 18.245915025296892], [-70.517137213814195, 18.184290879788829], [-70.669298468697619, 18.42688589118303], [-70.999950120717173, 18.283328762276206], [-71.400209927033885, 17.598564357976596], [-71.657661912712001, 17.757572740138695], [-71.708304816358037, 18.044997056546091], [-71.687737596305865, 18.316660061104468], [-71.945112067335543, 18.616900132720257], [-71.701302659782485, 18.785416978424049], [-71.624873216422813, 19.169837958243303], [-71.71236141629295, 19.714455878167353]]] } },
+            { "type": "Feature", "properties": { "admin": "Algeria", "name": "Algeria", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[11.99950564947161, 23.471668402596443], [8.572893100629782, 21.565660712159136], [5.677565952180684, 19.601206976799713], [4.267419467800038, 19.155265204336995], [3.158133172222704, 19.057364203360034], [3.146661004253899, 19.693578599521441], [2.683588494486428, 19.856230170160114], [2.060990838233919, 20.142233384679482], [1.823227573259032, 20.61080943448604], [-1.550054897457613, 22.792665920497377], [-4.92333736817423, 24.974574082940993], [-8.684399786809051, 27.395744126895998], [-8.66512447756419, 27.58947907155822], [-8.665589565454805, 27.656425889592349], [-8.674116176782972, 28.841288967396572], [-7.059227667661928, 29.579228420524522], [-6.060632290053772, 29.731699734001687], [-5.242129278982786, 30.000443020135581], [-4.859646165374469, 30.501187649043839], [-3.690441046554695, 30.896951605751152], [-3.647497931320145, 31.637294012980668], [-3.068980271812647, 31.724497992473207], [-2.616604783529567, 32.094346218386143], [-1.30789913573787, 32.262888902306095], [-1.124551153966308, 32.651521511357124], [-1.388049282222567, 32.864015000941301], [-1.733454555661467, 33.91971283623198], [-1.792985805661686, 34.527918606091198], [-2.169913702798624, 35.168396307916673], [-1.208602871089056, 35.71484874118709], [-0.127454392894606, 35.888662421200799], [0.503876580415209, 36.301272894835272], [1.466918572606545, 36.605647081034398], [3.161698846050824, 36.783904934225205], [4.815758090849129, 36.865036932923452], [5.320120070017792, 36.716518866516616], [6.261819695672611, 37.110655015606731], [7.330384962603969, 37.118380642234364], [7.737078484741003, 36.885707505840209], [8.420964389691674, 36.946427313783154], [8.217824334352313, 36.433176988260271], [8.376367628623766, 35.479876003555937], [8.140981479534302, 34.655145982393783], [7.524481642292242, 34.097376410451453], [7.612641635782181, 33.344114895148955], [8.430472853233367, 32.748337307255944], [8.439102817426116, 32.506284898400814], [9.055602654668148, 32.102691962201284], [9.482139926805273, 30.307556057246181], [9.805634392952411, 29.424638373323383], [9.859997999723443, 28.959989732371007], [9.683884718472765, 28.144173895779193], [9.756128370816779, 27.688258571884141], [9.629056023811073, 27.140953477480913], [9.716285841519747, 26.512206325785691], [9.319410841518161, 26.094324856057447], [9.910692579801774, 25.365454616796733], [9.948261346077969, 24.93695364023251], [10.30384687667836, 24.37931325937091], [10.771363559622925, 24.562532050061744], [11.560669386449002, 24.097909247325511], [11.99950564947161, 23.471668402596443]]] } },
+            { "type": "Feature", "properties": { "admin": "Ecuador", "name": "Ecuador", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-80.302560594387188, -3.404856459164712], [-79.770293341780913, -2.65751189535964], [-79.986559210922394, -2.220794366061014], [-80.368783942369234, -2.685158786635788], [-80.967765469064332, -2.246942640800703], [-80.764806281238023, -1.965047702648532], [-80.933659023751702, -1.057454522306358], [-80.583370327461239, -0.906662692878683], [-80.39932471385373, -0.283703301600141], [-80.020898200180355, 0.360340074053468], [-80.090609707342097, 0.768428859862396], [-79.542762010399784, 0.982937730305963], [-78.855258755188686, 1.380923773601822], [-77.855061408179509, 0.809925034992773], [-77.668612840470416, 0.825893052570961], [-77.424984300430367, 0.395686753741117], [-76.576379767549383, 0.256935533037435], [-76.292314419240938, 0.416047268064119], [-75.801465827116587, 0.084801337073202], [-75.373223232713841, -0.15203175212045], [-75.233722703741932, -0.911416924649529], [-75.544995693652027, -1.56160979574588], [-76.635394253226707, -2.608677666843817], [-77.83790483265858, -3.003020521663103], [-78.450683966775628, -3.873096612161375], [-78.639897223612323, -4.547784112164072], [-79.205289069317715, -4.959128513207388], [-79.62497921417615, -4.454198093283494], [-80.028908047185581, -4.346090996928893], [-80.442241990872134, -4.425724379090673], [-80.46929460317692, -4.059286797708999], [-80.184014858709645, -3.821161797708043], [-80.302560594387188, -3.404856459164712]]] } },
+            { "type": "Feature", "properties": { "admin": "Egypt", "name": "Egypt", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.9226, 29.50133], [34.64174, 29.09942], [34.42655, 28.34399], [34.15451, 27.8233], [33.92136, 27.6487], [33.58811, 27.97136], [33.13676, 28.41765], [32.42323, 29.85108], [32.32046, 29.76043], [32.73482, 28.70523], [33.34876, 27.69989], [34.10455, 26.14227], [34.47387, 25.59856], [34.79507, 25.03375], [35.69241, 23.92671], [35.49372, 23.75237], [35.52598, 23.10244], [36.69069, 22.20485], [36.86623, 22.0], [32.9, 22.0], [29.02, 22.0], [25.0, 22.0], [25.0, 25.682499996360992], [25.0, 29.238654529533452], [24.70007, 30.04419], [24.95762, 30.6616], [24.80287, 31.08929], [25.16482, 31.56915], [26.49533, 31.58568], [27.45762, 31.32126], [28.45048, 31.02577], [28.91353, 30.87005], [29.68342, 31.18686], [30.09503, 31.4734], [30.97693, 31.55586], [31.68796, 31.4296], [31.96041, 30.9336], [32.19247, 31.26034], [32.99392, 31.02407], [33.7734, 30.96746], [34.26544, 31.21936], [34.9226, 29.50133]]] } },
+            { "type": "Feature", "properties": { "admin": "Eritrea", "name": "Eritrea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[42.351560000000106, 12.54223000000013], [42.00975, 12.86582], [41.59856, 13.452090000000108], [41.15519371924983, 13.773319810435224], [40.8966, 14.118640000000138], [40.026218702969167, 14.519579169162281], [39.34061, 14.53155], [39.0994, 14.74064], [38.51295, 14.50547], [37.90607, 14.959430000000165], [37.59377, 14.2131], [36.42951, 14.42211], [36.323188917798113, 14.822480577041057], [36.753860304518575, 16.291874091044289], [36.852530000000108, 16.95655], [37.16747, 17.263140000000128], [37.904000000000103, 17.42754], [38.410089959473218, 17.998307399970312], [38.990622999839999, 16.84062612555169], [39.266110060388016, 15.922723496967246], [39.814293654140208, 15.435647284400314], [41.179274936697645, 14.491079616753209], [41.734951613132345, 13.921036892141554], [42.276830682144848, 13.34399201095442], [42.589576450375255, 13.000421250861901], [43.081226027200152, 12.699638576707112], [42.779642368344739, 12.455415757695672], [42.351560000000106, 12.54223000000013]]] } },
+            { "type": "Feature", "properties": { "admin": "Spain", "name": "Spain", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-9.034817674180244, 41.880570583659669], [-8.98443315269567, 42.592775173506261], [-9.392883673530644, 43.026624660812686], [-7.978189663108308, 43.748337714200979], [-6.754491746436754, 43.567909450853918], [-5.411886359061596, 43.574239813809669], [-4.347842779955783, 43.403449205085025], [-3.51753170410609, 43.455900783861296], [-1.901351284177764, 43.422802028978332], [-1.502770961910528, 43.034014390630425], [0.338046909190581, 42.579546006839543], [0.701590610363894, 42.795734361332599], [1.826793247087153, 42.343384711265678], [2.985998976258457, 42.473015041669854], [3.039484083680548, 41.892120266276891], [2.091841668312184, 41.226088568683082], [0.810524529635188, 41.014731960609332], [0.721331007499401, 40.678318386389229], [0.106691521819869, 40.123933620762003], [-0.278711310212941, 39.309978135732713], [0.111290724293838, 38.738514309233032], [-0.467123582349103, 38.292365831041138], [-0.683389451490598, 37.642353827457811], [-1.438382127274849, 37.443063666324214], [-2.146452602538119, 36.674144192037282], [-3.415780808923386, 36.658899644511173], [-4.368900926114718, 36.677839056946141], [-4.995219285492211, 36.32470815687963], [-5.377159796561457, 35.946850083961458], [-5.866432257500902, 36.02981659600605], [-6.236693894872174, 36.367677110330327], [-6.520190802425402, 36.942913316387312], [-7.45372555177809, 37.097787583966053], [-7.537105475281022, 37.428904323876232], [-7.166507941099863, 37.803894354802217], [-7.029281175148794, 38.075764065089757], [-7.374092169616317, 38.373058580064914], [-7.098036668313126, 39.03007274022378], [-7.498632371439724, 39.629571031241802], [-7.066591559263527, 39.711891587882768], [-7.026413133156593, 40.184524237624238], [-6.864019944679383, 40.330871893874821], [-6.851126674822551, 41.111082668617513], [-6.389087693700914, 41.381815497394641], [-6.668605515967655, 41.883386949219577], [-7.251308966490822, 41.91834605566504], [-7.422512986673794, 41.792074693359822], [-8.01317460776991, 41.790886135417118], [-8.26385698081779, 42.280468654950326], [-8.671945766626719, 42.134689439454952], [-9.034817674180244, 41.880570583659669]]] } },
+            { "type": "Feature", "properties": { "admin": "Estonia", "name": "Estonia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[24.312862583114615, 57.793423570376966], [24.428927850042154, 58.383413397853275], [24.061198357853179, 58.257374579493394], [23.426560092876681, 58.612753404364618], [23.339795363058641, 59.187240302153363], [24.604214308376182, 59.465853786855007], [25.864189080516631, 59.611090399811324], [26.949135776484518, 59.445803331125767], [27.981114129353237, 59.47538808861286], [28.131699253051742, 59.300825100330904], [27.420166456824941, 58.724581203844224], [27.716685825315714, 57.791899115624354], [27.288184848751509, 57.474528306703817], [26.46353234223778, 57.476388658266316], [25.602809685984365, 57.847528794986559], [25.164593540149262, 57.970156968815175], [24.312862583114615, 57.793423570376966]]] } },
+            { "type": "Feature", "properties": { "admin": "Ethiopia", "name": "Ethiopia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[37.90607, 14.959430000000165], [38.51295, 14.50547], [39.0994, 14.74064], [39.34061, 14.53155], [40.026250000000111, 14.51959], [40.8966, 14.118640000000138], [41.1552, 13.77333], [41.59856, 13.452090000000108], [42.00975, 12.86582], [42.351560000000106, 12.54223000000013], [42.000000000000107, 12.100000000000133], [41.661760000000122, 11.6312], [41.739590000000177, 11.355110000000137], [41.755570000000191, 11.05091], [42.314140000000116, 11.0342], [42.55493000000012, 11.105110000000193], [42.776851841000948, 10.926878566934416], [42.55876, 10.572580000000126], [42.92812, 10.021940000000139], [43.29699, 9.540480000000169], [43.67875, 9.183580000000116], [46.94834, 7.99688], [47.78942, 8.003], [44.9636, 5.001620000000115], [43.66087, 4.95755], [42.769670000000119, 4.252590000000223], [42.12861, 4.234130000000163], [41.855083092644108, 3.918911920483764], [41.171800000000125, 3.91909], [40.768480000000118, 4.257020000000124], [39.854940000000106, 3.83879000000013], [39.559384258765917, 3.422060000000215], [38.89251, 3.50074], [38.67114, 3.61607], [38.436970000000137, 3.58851], [38.120915000000132, 3.598605], [36.85509323800823, 4.447864127672857], [36.159078632855646, 4.447864127672857], [35.817447662353622, 4.776965663462021], [35.817447662353622, 5.338232082790852], [35.298007118233095, 5.506], [34.70702, 6.59422000000012], [34.25032, 6.82607], [34.075100000000184, 7.22595], [33.56829, 7.71334], [32.954180000000228, 7.7849700000001], [33.294800000000116, 8.35458], [33.82550000000014, 8.37916], [33.97498, 8.684560000000145], [33.96162, 9.58358], [34.25745, 10.63009], [34.73115000000012, 10.910170000000106], [34.831630000000125, 11.318960000000116], [35.26049, 12.08286], [35.863630000000164, 12.57828], [36.27022, 13.563330000000118], [36.42951, 14.42211], [37.59377, 14.2131], [37.90607, 14.959430000000165]]] } },
+            { "type": "Feature", "properties": { "admin": "Finland", "name": "Finland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[28.591929559043187, 69.064776923286644], [28.445943637818651, 68.36461294216403], [29.9774263852206, 67.698297024192641], [29.054588657352319, 66.944286200621917], [30.21765, 65.80598], [29.544429559046982, 64.948671576590471], [30.444684686003704, 64.204453436939076], [30.035872430142714, 63.552813625738544], [31.516092156711117, 62.867687486412869], [31.139991082490891, 62.357692776124395], [30.211107212044443, 61.780027777749673], [28.06999759289527, 60.503516547275829], [26.25517296723697, 60.423960679762487], [24.496623976344516, 60.057316392651636], [22.869694858499454, 59.846373196036211], [22.290763787533589, 60.391921291741525], [21.322244093519313, 60.720169989659503], [21.544866163832687, 61.705329494871783], [21.059211053153682, 62.607393296958726], [21.536029493910799, 63.189735012455863], [22.442744174903986, 63.817810370531276], [24.730511508897528, 64.902343655040823], [25.398067661243939, 65.111426500093728], [25.2940430030404, 65.53434642197044], [23.903378533633795, 66.006927395279604], [23.565879754335576, 66.396050930437411], [23.539473097434435, 67.936008612735236], [21.978534783626113, 68.616845608180682], [20.645592889089521, 69.106247260200846], [21.244936150810666, 69.370443020293067], [22.356237827247405, 68.841741441514898], [23.662049594830751, 68.891247463650529], [24.735679152126721, 68.649556789821446], [25.689212680776361, 69.092113755969024], [26.179622023226241, 69.825298977326113], [27.732292107867856, 70.164193020296239], [29.015572950971968, 69.766491197377974], [28.591929559043187, 69.064776923286644]]] } },
+            { "type": "Feature", "properties": { "admin": "Fiji", "name": "Fiji", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[178.3736, -17.33992], [178.71806, -17.62846], [178.55271, -18.15059], [177.93266, -18.28799], [177.38146, -18.16432], [177.28504, -17.72465], [177.67087, -17.38114], [178.12557, -17.50481], [178.3736, -17.33992]]], [[[179.364142661964223, -16.801354076946847], [178.725059362997058, -17.012041674368017], [178.596838595117021, -16.63915], [179.096609362997128, -16.43398427754742], [179.413509362997075, -16.379054277547393], [180.000000000000114, -16.067132663642436], [180.000000000000114, -16.555216566639157], [179.364142661964223, -16.801354076946847]]], [[[-179.917369384765237, -16.501783135649358], [-180.0, -16.555216566639157], [-180.0, -16.067132663642436], [-179.793320109048551, -16.020882256741228], [-179.917369384765237, -16.501783135649358]]]] } },
+            { "type": "Feature", "properties": { "admin": "Falkland Islands", "name": "Falkland Is.", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-61.2, -51.85], [-60.0, -51.25], [-59.15, -51.5], [-58.55, -51.1], [-57.75, -51.55], [-58.05, -51.9], [-59.4, -52.2], [-59.85, -51.85], [-60.7, -52.3], [-61.2, -51.85]]] } },
+            { "type": "Feature", "properties": { "admin": "France", "name": "France", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-52.556424730018378, 2.504705308437053], [-52.939657151894963, 2.124857692875622], [-53.41846513529525, 2.053389187016037], [-53.554839240113481, 2.334896551925964], [-53.778520677288881, 2.376702785650053], [-54.088062506717264, 2.105556545414629], [-54.524754197799737, 2.311848863123785], [-54.271229620975781, 2.738747870286942], [-54.184284023644743, 3.194172268075234], [-54.011503872276812, 3.622569891774857], [-54.3995422023565, 4.212611395683481], [-54.478632981979203, 4.896755682795642], [-53.958044603070917, 5.756548163267808], [-53.618452928264837, 5.646529038918401], [-52.882141282754063, 5.409850979021598], [-51.823342861525916, 4.565768133966144], [-51.657797410678874, 4.156232408053028], [-52.249337531123977, 3.241094468596287], [-52.556424730018378, 2.504705308437053]]], [[[9.560016310269132, 42.152491970379558], [9.229752231491771, 41.380006822264441], [8.77572309737536, 41.583611965494427], [8.544212680707828, 42.256516628583078], [8.746009148807586, 42.628121853193946], [9.390000848028901, 43.009984849614725], [9.560016310269132, 42.152491970379558]]], [[[3.588184441755714, 50.378992418003563], [4.28602298342514, 49.90749664977254], [4.799221632515752, 49.985373033236314], [5.674051954784885, 49.529483547557433], [5.897759230176375, 49.442667141307155], [6.186320428094204, 49.463802802114444], [6.658229607783538, 49.201958319691549], [8.09927859867477, 49.017783515003366], [7.59367638513106, 48.333019110703724], [7.466759067422228, 47.620581976911851], [7.192202182655533, 47.449765529970982], [6.736571079138086, 47.541801255882874], [6.768713820023634, 47.287708238303672], [6.037388950228971, 46.725778713561894], [6.022609490593566, 46.272989813820502], [6.500099724970453, 46.429672756529428], [6.84359297041456, 45.991146552100659], [6.80235517744566, 45.708579820328673], [7.096652459347835, 45.333098863295859], [6.749955275101711, 45.028517971367584], [7.007562290076661, 44.254766750661382], [7.549596388386161, 44.127901109384808], [7.435184767291841, 43.693844916349164], [6.529245232783068, 43.12889232031835], [4.556962517931395, 43.399650987311581], [3.100410597352719, 43.075200507167118], [2.985998976258486, 42.473015041669882], [1.826793247087181, 42.343384711265649], [0.701590610363922, 42.795734361332642], [0.338046909190581, 42.57954600683955], [-1.502770961910471, 43.034014390630482], [-1.901351284177735, 43.422802028978332], [-1.384225226232956, 44.022610378590166], [-1.193797573237361, 46.014917710954862], [-2.225724249673788, 47.064362697938201], [-2.963276129559573, 47.570326646507958], [-4.491554938159481, 47.95495433205641], [-4.592349819344746, 48.68416046812694], [-3.295813971357745, 48.901692409859628], [-1.616510789384932, 48.644421291694577], [-1.933494025063254, 49.776341864615759], [-0.98946895995536, 49.347375800160869], [1.338761020522753, 50.127173163445256], [1.6390010921385, 50.9466063502975], [2.51357303224617, 51.14850617126185], [2.65842207196033, 50.796848049515646], [3.123251580425716, 50.780363267614504], [3.588184441755714, 50.378992418003563]]]] } },
+            { "type": "Feature", "properties": { "admin": "Gabon", "name": "Gabon", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[11.093772820691923, -3.978826592630546], [10.066135288135738, -2.969482517105681], [9.405245395554969, -2.144313246269042], [8.797995639693168, -1.111301364754496], [8.830086704146423, -0.779073581550037], [9.048419630579586, -0.459351494960217], [9.291350538783687, 0.268666083167687], [9.492888624721981, 1.010119533691494], [9.83028405115564, 1.067893784993799], [11.285078973036461, 1.057661851400013], [11.276449008843711, 2.261050930180871], [11.751665480199787, 2.326757513839993], [12.359380323952218, 2.19281220133945], [12.951333855855605, 2.321615708826939], [13.07582238124675, 2.267097072759014], [13.003113641012074, 1.830896307783319], [13.282631463278816, 1.31418366129688], [14.026668735417214, 1.395677395021153], [14.276265903386953, 1.196929836426619], [13.843320753645653, 0.038757635901149], [14.316418491277741, -0.552627455247048], [14.425455763413593, -1.333406670744971], [14.299210239324564, -1.998275648612213], [13.992407260807706, -2.470804945489099], [13.109618767965626, -2.428740329603513], [12.575284458067639, -1.948511244315134], [12.495702752338159, -2.391688327650242], [11.820963575903189, -2.514161472181982], [11.478038771214299, -2.765618991714241], [11.855121697648114, -3.42687061932105], [11.093772820691923, -3.978826592630546]]] } },
+            { "type": "Feature", "properties": { "admin": "United Kingdom", "name": "United Kingdom", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-5.661948614921896, 54.554603176483838], [-6.197884894220976, 53.867565009163329], [-6.953730231137994, 54.073702297575622], [-7.572167934591078, 54.059956366585979], [-7.366030646178785, 54.595840969452688], [-7.572167934591078, 55.131622219454883], [-6.733847011736144, 55.172860012423783], [-5.661948614921896, 54.554603176483838]]], [[[-3.00500484863528, 58.635000108466322], [-4.073828497728015, 57.55302480735525], [-3.055001796877661, 57.690019029360933], [-1.959280564776918, 57.684799709699512], [-2.219988165689301, 56.870017401753515], [-3.119003058271118, 55.97379303651546], [-2.085009324543023, 55.909998480851264], [-2.005675679673856, 55.804902850350217], [-1.11499101399221, 54.624986477265388], [-0.4304849918542, 54.464376125702145], [0.184981316742039, 53.325014146531018], [0.469976840831777, 52.929999498091959], [1.681530795914739, 52.739520168663987], [1.559987827164377, 52.099998480836], [1.050561557630914, 51.806760565795678], [1.4498653499503, 51.289427802121949], [0.550333693045502, 50.765738837275862], [-0.787517462558639, 50.774988918656206], [-2.489997524414377, 50.500018622431227], [-2.956273972984035, 50.696879991247002], [-3.617448085942327, 50.228355617872708], [-4.542507900399243, 50.341837063185658], [-5.245023159191134, 49.959999904981082], [-5.776566941745299, 50.159677639356815], [-4.309989793301837, 51.210001125689146], [-3.414850633142122, 51.426008612669236], [-3.422719467108322, 51.426848167406078], [-4.984367234710873, 51.593466091510962], [-5.267295701508885, 51.991400458374571], [-4.222346564134852, 52.30135569926135], [-4.770013393564112, 52.840004991255611], [-4.579999152026914, 53.495003770555165], [-3.093830673788658, 53.404547400669671], [-3.092079637047106, 53.404440822963544], [-2.945008510744343, 53.98499970154667], [-3.614700825433033, 54.60093677329256], [-3.63000545898933, 54.615012925833], [-4.844169073903003, 54.790971177786837], [-5.082526617849224, 55.061600653699358], [-4.719112107756643, 55.508472601943467], [-5.047980922862108, 55.783985500707516], [-5.586397670911139, 55.311146145236805], [-5.64499874513018, 56.275014960344791], [-6.149980841486352, 56.785009670633528], [-5.78682471355529, 57.818848375064633], [-5.009998745127574, 58.630013332750039], [-4.211494513353555, 58.550845038479153], [-3.00500484863528, 58.635000108466322]]]] } },
+            { "type": "Feature", "properties": { "admin": "Georgia", "name": "Georgia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[41.55408410011065, 41.535656236327561], [41.703170607272703, 41.962942816732912], [41.453470086438379, 42.645123399417926], [40.875469191253785, 43.013628038091277], [40.321394484220313, 43.128633938156831], [39.955008579270917, 43.434997666999216], [40.07696495947976, 43.553104153002309], [40.922184686045618, 43.38215851498078], [42.394394565608806, 43.220307929042619], [43.756016880067378, 42.74082815202248], [43.931199985536828, 42.554973863284758], [44.537622918481979, 42.71199270280362], [45.470279168485703, 42.502780666669963], [45.776410353382758, 42.09244395605635], [46.404950799348818, 41.860675157227298], [46.145431756379004, 41.722802435872573], [46.637908156120574, 41.181672675128219], [46.501637404166921, 41.064444688474104], [45.962600538930381, 41.123872585609767], [45.217426385281577, 41.411451931314041], [44.972480096218071, 41.248128567055588], [43.582745802592726, 41.09214325618256], [42.619548781104484, 41.583172715819934], [41.55408410011065, 41.535656236327561]]] } },
+            { "type": "Feature", "properties": { "admin": "Ghana", "name": "Ghana", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[1.060121697604927, 5.928837388528875], [-0.507637905265938, 5.343472601742675], [-1.063624640294193, 5.000547797053811], [-1.964706590167594, 4.71046214438337], [-2.856125047202397, 4.994475816259508], [-2.810701463217839, 5.389051215024109], [-3.244370083011261, 6.2504715031135], [-2.983584967450326, 7.379704901555511], [-2.56218950032624, 8.219627793811481], [-2.827496303712706, 9.642460842319775], [-2.963896246747111, 10.395334784380081], [-2.94040930827046, 10.962690334512557], [-1.203357713211431, 11.009819240762736], [-0.761575893548183, 10.936929633015053], [-0.438701544588582, 11.09834096927872], [0.023802524423701, 11.018681748900802], [-0.049784715159944, 10.706917832883928], [0.367579990245389, 10.191212876827176], [0.365900506195885, 9.46500397382948], [0.461191847342121, 8.677222601756013], [0.712029249686878, 8.312464504423827], [0.490957472342245, 7.411744289576474], [0.570384148774849, 6.914358628767188], [0.836931186536333, 6.279978745952147], [1.060121697604927, 5.928837388528875]]] } },
+            { "type": "Feature", "properties": { "admin": "Guinea", "name": "Guinea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-8.439298468448696, 7.686042792181736], [-8.722123582382123, 7.711674302598509], [-8.926064622422002, 7.309037380396375], [-9.208786383490844, 7.313920803247952], [-9.403348151069748, 7.526905218938906], [-9.33727983238458, 7.928534450711351], [-9.755342169625832, 8.541055202666923], [-10.016566534861253, 8.42850393313523], [-10.230093553091276, 8.406205552601291], [-10.505477260774667, 8.348896389189603], [-10.494315151399629, 8.715540676300433], [-10.65477047366589, 8.977178452994194], [-10.622395188835037, 9.267910061068276], [-10.839151984083299, 9.688246161330367], [-11.117481248407328, 10.045872911006283], [-11.917277390988655, 10.046983954300556], [-12.150338100625003, 9.858571682164378], [-12.425928514037562, 9.835834051955953], [-12.596719122762206, 9.620188300001969], [-12.711957566773076, 9.342711696810765], [-13.246550258832512, 8.903048610871506], [-13.685153977909788, 9.494743760613458], [-14.074044969122278, 9.886166897008248], [-14.330075852912367, 10.015719712763966], [-14.579698859098254, 10.214467271358513], [-14.693231980843501, 10.65630076745404], [-14.83955379887794, 10.876571560098139], [-15.130311245168167, 11.040411688679525], [-14.685687221728896, 11.527823798056485], [-14.382191534878727, 11.509271958863691], [-14.121406419317776, 11.677117010947693], [-13.900799729863772, 11.678718980348744], [-13.743160773157411, 11.811269029177408], [-13.828271857142122, 12.142644151249041], [-13.718743658899511, 12.247185573775507], [-13.700476040084322, 12.586182969610192], [-13.217818162478235, 12.575873521367964], [-12.499050665730561, 12.332089952031053], [-12.278599005573438, 12.354440008997285], [-12.20356482588563, 12.465647691289401], [-11.658300950557928, 12.386582749882834], [-11.513942836950587, 12.442987575729415], [-11.456168585648269, 12.076834214725336], [-11.297573614944508, 12.077971096235768], [-11.036555955438256, 12.211244615116513], [-10.870829637078211, 12.177887478072106], [-10.593223842806278, 11.923975328005977], [-10.165213792348835, 11.844083563682743], [-9.890992804392011, 12.060478623904968], [-9.567911749703212, 12.194243068892472], [-9.327616339546008, 12.334286200403451], [-9.127473517279581, 12.308060411015331], [-8.905264858424529, 12.088358059126433], [-8.786099005559462, 11.812560939984705], [-8.376304897484911, 11.393645941610627], [-8.581305304386772, 11.136245632364801], [-8.620321010767126, 10.810890814655181], [-8.407310756860026, 10.90925690352276], [-8.282357143578279, 10.792597357623842], [-8.335377163109738, 10.494811916541932], [-8.029943610048617, 10.206534939001711], [-8.22933712404682, 10.129020290563897], [-8.309616461612249, 9.789531968622439], [-8.079113735374348, 9.376223863152033], [-7.832100389019186, 8.575704250518625], [-8.203498907900878, 8.455453192575446], [-8.299048631208562, 8.316443589710302], [-8.221792364932197, 8.123328762235571], [-8.280703497744936, 7.687179673692156], [-8.439298468448696, 7.686042792181736]]] } },
+            { "type": "Feature", "properties": { "admin": "Gambia", "name": "Gambia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-16.84152462408127, 13.151393947802557], [-16.713728807023468, 13.594958604379853], [-15.624596320039936, 13.623587347869556], [-15.398770310924457, 13.860368760630916], [-15.081735398813816, 13.876491807505982], [-14.687030808968483, 13.63035696049978], [-14.376713833055785, 13.625680243377371], [-14.046992356817478, 13.794067898000446], [-13.844963344772404, 13.505041612191999], [-14.277701788784553, 13.28058502853224], [-14.712197231494626, 13.298206691943774], [-15.141163295949463, 13.509511623585235], [-15.511812506562931, 13.278569647672864], [-15.691000535534991, 13.270353094938455], [-15.931295945692208, 13.130284125211331], [-16.84152462408127, 13.151393947802557]]] } },
+            { "type": "Feature", "properties": { "admin": "Guinea Bissau", "name": "Guinea-Bissau", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-15.130311245168167, 11.040411688679525], [-15.664180467175523, 11.458474025920792], [-16.085214199273562, 11.524594021038236], [-16.314786749730199, 11.806514797406548], [-16.308947312881227, 11.958701890506116], [-16.613838263403277, 12.170911159712698], [-16.67745195155457, 12.38485158940105], [-16.147716844130581, 12.547761542201185], [-15.816574266004251, 12.515567124883345], [-15.548476935274005, 12.628170070847343], [-13.700476040084322, 12.586182969610192], [-13.718743658899511, 12.247185573775507], [-13.828271857142122, 12.142644151249041], [-13.743160773157411, 11.811269029177408], [-13.900799729863772, 11.678718980348744], [-14.121406419317776, 11.677117010947693], [-14.382191534878727, 11.509271958863691], [-14.685687221728896, 11.527823798056485], [-15.130311245168167, 11.040411688679525]]] } },
+            { "type": "Feature", "properties": { "admin": "Equatorial Guinea", "name": "Eq. Guinea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[9.492888624721981, 1.010119533691494], [9.305613234096255, 1.160911363119183], [9.649158155972627, 2.283866075037735], [11.276449008843711, 2.261050930180871], [11.285078973036461, 1.057661851400013], [9.83028405115564, 1.067893784993799], [9.492888624721981, 1.010119533691494]]] } },
+            { "type": "Feature", "properties": { "admin": "Greece", "name": "Greece", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[23.699980096133, 35.705004380835526], [24.246665073348673, 35.368022365860149], [25.025015496528873, 35.424995632461979], [25.769207797964182, 35.354018052709073], [25.745023227651579, 35.179997666966209], [26.290002882601719, 35.299990342747911], [26.164997592887651, 35.004995429009789], [24.724982130642299, 34.919987697889603], [24.735007358506941, 35.084990546197581], [23.514978468528106, 35.27999156345097], [23.699980096133, 35.705004380835526]]], [[[26.604195590936282, 41.562114569661098], [26.294602085075777, 40.936261298174244], [26.056942172965499, 40.824123440100827], [25.44767703624418, 40.852545477861455], [24.925848422960932, 40.947061672523226], [23.714811232200809, 40.687129218095116], [24.407998894964063, 40.124992987624083], [23.89996788910258, 39.962005520175573], [23.342999301860797, 39.960997829745786], [22.813987664488959, 40.476005153966547], [22.626298862404777, 40.256561184239175], [22.849747755634805, 39.659310818025759], [23.350027296652595, 39.190011298167256], [22.97309939951554, 38.97090322524965], [23.53001631032495, 38.51000112563846], [24.025024855248937, 38.219992987616443], [24.040011020613601, 37.655014553369419], [23.115002882589145, 37.920011298162215], [23.409971958111065, 37.409990749657389], [22.77497195810863, 37.305010077456551], [23.154225294698612, 36.422505804992042], [22.4900281104511, 36.410000108377446], [21.670026482843692, 36.84498647719419], [21.295010613701574, 37.644989325504689], [21.120034213961329, 38.31032339126272], [20.730032179454579, 38.769985256498778], [20.217712029712853, 39.340234686839629], [20.150015903410516, 39.624997666984022], [20.615000441172779, 40.110006822259422], [20.67499677906363, 40.434999904943048], [20.999989861747274, 40.580003973953964], [21.020040317476422, 40.842726955725873], [21.674160597426969, 40.931274522457976], [22.055377638444266, 41.149865831052686], [22.597308383889008, 41.130487168943198], [22.76177, 41.3048], [22.952377150166562, 41.337993882811212], [23.692073601992455, 41.309080918943849], [24.492644891058031, 41.583896185872035], [25.19720136892553, 41.234485988930651], [26.106138136507177, 41.328898830727823], [26.11704186372091, 41.826904608724725], [26.604195590936282, 41.562114569661098]]]] } },
+            { "type": "Feature", "properties": { "admin": "Greenland", "name": "Greenland", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-46.76379, 82.62796], [-43.40644, 83.22516], [-39.89753, 83.18018], [-38.62214, 83.54905], [-35.08787, 83.64513], [-27.10046, 83.51966], [-20.84539, 82.72669], [-22.69182, 82.34165], [-26.51753, 82.29765], [-31.9, 82.2], [-31.39646, 82.02154], [-27.85666, 82.13178], [-24.84448, 81.78697], [-22.90328, 82.09317], [-22.07175, 81.73449], [-23.16961, 81.15271], [-20.62363, 81.52462], [-15.76818, 81.91245], [-12.77018, 81.71885], [-12.20855, 81.29154], [-16.28533, 80.58004], [-16.85, 80.35], [-20.04624, 80.17708], [-17.73035, 80.12912], [-18.9, 79.4], [-19.70499, 78.75128], [-19.67353, 77.63859], [-18.47285, 76.98565], [-20.03503, 76.94434], [-21.67944, 76.62795], [-19.83407, 76.09808], [-19.59896, 75.24838], [-20.66818, 75.15585], [-19.37281, 74.29561], [-21.59422, 74.22382], [-20.43454, 73.81713], [-20.76234, 73.46436], [-22.17221, 73.30955], [-23.56593, 73.30663], [-22.31311, 72.62928], [-22.29954, 72.18409], [-24.27834, 72.59788], [-24.79296, 72.3302], [-23.44296, 72.08016], [-22.13281, 71.46898], [-21.75356, 70.66369], [-23.53603, 70.471], [-24.30702, 70.85649], [-25.54341, 71.43094], [-25.20135, 70.75226], [-26.36276, 70.22646], [-23.72742, 70.18401], [-22.34902, 70.12946], [-25.02927, 69.2588], [-27.74737, 68.47046], [-30.67371, 68.12503], [-31.77665, 68.12078], [-32.81105, 67.73547], [-34.20196, 66.67974], [-36.35284, 65.9789], [-37.04378, 65.93768], [-38.37505, 65.69213], [-39.81222, 65.45848], [-40.66899, 64.83997], [-40.68281, 64.13902], [-41.1887, 63.48246], [-42.81938, 62.68233], [-42.41666, 61.90093], [-42.86619, 61.07404], [-43.3784, 60.09772], [-44.7875, 60.03676], [-46.26364, 60.85328], [-48.26294, 60.85843], [-49.23308, 61.40681], [-49.90039, 62.38336], [-51.63325, 63.62691], [-52.14014, 64.27842], [-52.27659, 65.1767], [-53.66166, 66.09957], [-53.30161, 66.8365], [-53.96911, 67.18899], [-52.9804, 68.35759], [-51.47536, 68.72958], [-51.08041, 69.14781], [-50.87122, 69.9291], [-52.013585, 69.574925], [-52.55792, 69.42616], [-53.45629, 69.283625], [-54.68336, 69.61003], [-54.75001, 70.28932], [-54.35884, 70.821315], [-53.431315, 70.835755], [-51.39014, 70.56978], [-53.10937, 71.20485], [-54.00422, 71.54719], [-55.0, 71.406536967272558], [-55.83468, 71.65444], [-54.71819, 72.58625], [-55.32634, 72.95861], [-56.12003, 73.64977], [-57.32363, 74.71026], [-58.59679, 75.09861], [-58.58516, 75.51727], [-61.26861, 76.10238], [-63.39165, 76.1752], [-66.06427, 76.13486], [-68.50438, 76.06141], [-69.66485, 76.37975], [-71.40257, 77.00857], [-68.77671, 77.32312], [-66.76397, 77.37595], [-71.04293, 77.63595], [-73.297, 78.04419], [-73.15938, 78.43271], [-69.37345, 78.91388], [-65.7107, 79.39436], [-65.3239, 79.75814], [-68.02298, 80.11721], [-67.15129, 80.51582], [-63.68925, 81.21396], [-62.23444, 81.3211], [-62.65116, 81.77042], [-60.28249, 82.03363], [-57.20744, 82.19074], [-54.13442, 82.19962], [-53.04328, 81.88833], [-50.39061, 82.43883], [-48.00386, 82.06481], [-46.59984, 81.985945], [-44.523, 81.6607], [-46.9007, 82.19979], [-46.76379, 82.62796]]] } },
+            { "type": "Feature", "properties": { "admin": "Guatemala", "name": "Guatemala", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-90.095554572290951, 13.73533763270073], [-90.608624030300817, 13.909771429901948], [-91.232410244496037, 13.927832342987953], [-91.689746670279106, 14.126218166556452], [-92.227750006869812, 14.538828640190925], [-92.203229539747298, 14.830102850804066], [-92.087215949252041, 15.064584662328436], [-92.229248623406249, 15.251446641495857], [-91.747960171255912, 16.066564846251719], [-90.464472622422647, 16.069562079324651], [-90.438866950222021, 16.410109768128091], [-90.600846727240906, 16.470777899638758], [-90.711821865587694, 16.687483018454724], [-91.081670091500641, 16.918476670799404], [-91.453921271515128, 17.252177232324168], [-91.002269253284197, 17.254657701074176], [-91.001519945015943, 17.817594916245707], [-90.067933519230948, 17.819326076727474], [-89.143080410503302, 17.808318996649316], [-89.15080603713092, 17.015576687075832], [-89.229121670269265, 15.886937567605166], [-88.930612759135244, 15.887273464415072], [-88.604586147805833, 15.706380113177358], [-88.518364020526846, 15.855389105690971], [-88.22502275262201, 15.727722479713901], [-88.680679694355618, 15.346247056535301], [-89.15481096063354, 15.066419175674806], [-89.225220099631244, 14.874286200413618], [-89.145535041037149, 14.67801911056908], [-89.353325975282772, 14.424132798719112], [-89.587342698916544, 14.362586167859485], [-89.5342193265205, 14.244815578666302], [-89.7219339668207, 14.134228013561694], [-90.064677903996568, 13.881969509328924], [-90.095554572290951, 13.73533763270073]]] } },
+            { "type": "Feature", "properties": { "admin": "Guyana", "name": "Guyana", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-59.758284878159181, 8.367034816924045], [-59.10168412945864, 7.99920197187049], [-58.482962205628041, 7.347691351750696], [-58.454876064677414, 6.832787380394463], [-58.078103196837361, 6.809093736188641], [-57.542218593970631, 6.321268215353355], [-57.147436489476874, 5.973149929219161], [-57.307245856339492, 5.073566595882225], [-57.914288906472123, 4.812626451024413], [-57.860209520078691, 4.576801052260449], [-58.044694383360664, 4.060863552258382], [-57.601568976457848, 3.334654649260684], [-57.281433478409703, 3.333491929534119], [-57.150097825739898, 2.768926906745406], [-56.53938574891454, 1.89952260986692], [-56.782704230360814, 1.863710842288653], [-57.33582292339689, 1.948537705895759], [-57.660971035377358, 1.682584947105638], [-58.113449876525003, 1.507195135907025], [-58.429477098205957, 1.46394196207872], [-58.540012986878288, 1.26808828369252], [-59.030861579002639, 1.317697658692722], [-59.646043667221242, 1.786893825686789], [-59.718545701726732, 2.249630438644359], [-59.974524909084543, 2.755232652188055], [-59.815413174057852, 3.606498521332085], [-59.538039923731219, 3.958802598481937], [-59.767405768458701, 4.423502915866606], [-60.111002366767373, 4.574966538914082], [-59.980958624904865, 5.014061184098138], [-60.213683437731319, 5.2444863956876], [-60.733574184803707, 5.2002772078619], [-61.410302903881941, 5.959068101419616], [-61.139415045807937, 6.234296779806142], [-61.159336310456467, 6.696077378766317], [-60.543999192940966, 6.856584377464881], [-60.295668097562377, 7.043911444522918], [-60.637972785063752, 7.414999904810853], [-60.550587938058186, 7.779602972846178], [-59.758284878159181, 8.367034816924045]]] } },
+            { "type": "Feature", "properties": { "admin": "Honduras", "name": "Honduras", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-87.316654425795463, 12.984685777229], [-87.48940873894712, 13.29753489832393], [-87.793111131526501, 13.384480495655165], [-87.723502977229288, 13.785050360565602], [-87.859515347021599, 13.893312486217097], [-88.065342576840109, 13.964625962779788], [-88.503997972349609, 13.845485948130939], [-88.541230841815931, 13.98015473068352], [-88.843072882832743, 14.140506700085208], [-89.058511929057644, 14.340029405164213], [-89.353325975282786, 14.424132798719084], [-89.145535041037164, 14.678019110569149], [-89.22522009963123, 14.874286200413675], [-89.154810960633526, 15.066419175674863], [-88.680679694355575, 15.346247056535386], [-88.225022752621925, 15.727722479714027], [-88.121153123715359, 15.688655096901355], [-87.901812506852394, 15.864458319558194], [-87.615680101252309, 15.878798529519198], [-87.522920905288444, 15.797278957578779], [-87.367762417332116, 15.846940009011286], [-86.903191291028165, 15.756712958229565], [-86.440945604177372, 15.782835394753189], [-86.119233974944322, 15.893448798073958], [-86.00195431185783, 16.005405788634388], [-85.68331743034625, 15.953651841693949], [-85.444003872402547, 15.885749009662444], [-85.182443610357183, 15.909158433490628], [-84.98372188997881, 15.995923163308698], [-84.526979743167118, 15.857223619037423], [-84.36825558138257, 15.835157782448729], [-84.063054572266807, 15.648244126849132], [-83.773976610026111, 15.42407176356687], [-83.410381232420363, 15.27090281825377], [-83.147219000974104, 14.995829169164207], [-83.489988776366005, 15.01626719813566], [-83.628584967772866, 14.880073960830368], [-83.975721401693576, 14.749435939996483], [-84.228341640952394, 14.748764146376626], [-84.449335903648588, 14.62161428472251], [-84.64958207877963, 14.666805324761865], [-84.820036790694289, 14.819586696832628], [-84.924500698572302, 14.790492865452332], [-85.052787441736868, 14.551541042534719], [-85.148750576502877, 14.560196844943615], [-85.165364549484806, 14.354369615125048], [-85.514413011400265, 14.079011745657905], [-85.698665330736944, 13.960078436737998], [-85.801294725268505, 13.8360549992376], [-86.096263800790595, 14.03818736414723], [-86.312142096689826, 13.771356106008223], [-86.520708177419891, 13.778487453664464], [-86.755086636079596, 13.754845485890936], [-86.733821784191463, 13.263092556201398], [-86.880557013684353, 13.254204209847213], [-87.005769009127434, 13.025794379117254], [-87.316654425795463, 12.984685777229]]] } },
+            { "type": "Feature", "properties": { "admin": "Croatia", "name": "Croatia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[18.829838087650039, 45.908877671891837], [19.072768995854172, 45.521511135432078], [19.390475701584588, 45.236515611342369], [19.005486281010118, 44.860233669609144], [18.553214145591646, 45.08158966733145], [17.861783481526398, 45.067740383477137], [17.00214603035101, 45.233776760430935], [16.534939406000202, 45.211607570977705], [16.318156772535868, 45.004126695325901], [15.959367303133373, 45.233776760430935], [15.750026075918978, 44.81871165626255], [16.239660271884528, 44.351143296885695], [16.456442905348862, 44.041239732431265], [16.916156447017325, 43.667722479825663], [17.297373488034449, 43.446340643887353], [17.674921502358981, 43.028562527023603], [18.56, 42.65], [18.450016310304814, 42.47999136002931], [17.509970330483323, 42.84999461523914], [16.930005730871638, 43.209998480800373], [16.015384555737679, 43.507215481127204], [15.174453973052094, 44.243191229827907], [15.376250441151793, 44.317915350922064], [14.920309279040504, 44.73848399512945], [14.901602410550874, 45.076060289076104], [14.258747592839992, 45.233776760430935], [13.952254672917032, 44.802123521496853], [13.65697553880119, 45.136935126315947], [13.679403110415816, 45.484149074884996], [13.715059848697248, 45.500323798192419], [14.411968214585496, 45.466165676447403], [14.595109490627916, 45.63494090431282], [14.935243767972961, 45.471695054702757], [15.327674594797424, 45.452316392593325], [15.323953891672428, 45.731782538427687], [15.671529575267638, 45.8341535507979], [15.768732944408608, 46.23810822202352], [16.564808383864939, 46.503750922219794], [16.882515089595412, 46.380631822284428], [17.630066359129554, 45.951769110694087], [18.456062452882858, 45.759481106136143], [18.829838087650039, 45.908877671891837]]] } },
+            { "type": "Feature", "properties": { "admin": "Haiti", "name": "Haiti", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-73.189790615517595, 19.915683905511909], [-72.579672817663607, 19.871500555902351], [-71.71236141629295, 19.714455878167353], [-71.624873216422813, 19.169837958243303], [-71.701302659782485, 18.785416978424049], [-71.945112067335543, 18.616900132720257], [-71.687737596305865, 18.316660061104468], [-71.708304816358037, 18.044997056546091], [-72.372476162389333, 18.214960842354053], [-72.844411180294856, 18.145611070218362], [-73.454554816365018, 18.217906398994696], [-73.922433234335642, 18.030992743395], [-74.458033616824764, 18.342549953682703], [-74.369925299767118, 18.664907538319408], [-73.449542202432696, 18.526052964751141], [-72.694937099890623, 18.445799465401858], [-72.334881557896992, 18.66842153571525], [-72.791649542924873, 19.101625067618027], [-72.784104783810264, 19.483591416903405], [-73.41502234566174, 19.639550889560276], [-73.189790615517595, 19.915683905511909]]] } },
+            { "type": "Feature", "properties": { "admin": "Hungary", "name": "Hungary", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.202298211337361, 46.852385972676949], [16.534267612380372, 47.496170966169103], [16.340584344150411, 47.712901923201215], [16.903754103267257, 47.714865627628321], [16.979666782304033, 48.123497015976298], [17.488472934649813, 47.867466132186209], [17.857132602620023, 47.758428860050365], [18.696512892336923, 47.88095368101439], [18.777024773847668, 48.081768296900627], [19.174364861739885, 48.111378892603859], [19.66136355965849, 48.266614895208647], [19.769470656013109, 48.2026911484636], [20.239054396249344, 48.327567247096916], [20.473562045989862, 48.562850043321809], [20.801293979584919, 48.62385407164237], [21.872236362401729, 48.319970811550007], [22.085608351334848, 48.422264309271782], [22.640819939878746, 48.150239569687351], [22.710531447040488, 47.882193915389394], [22.09976769378283, 47.672439276716695], [21.626514926853869, 46.994237779318148], [21.021952345471245, 46.316087958351886], [20.220192498462833, 46.127468980486547], [19.596044549241579, 46.171729844744533], [18.829838087649957, 45.908877671891915], [18.456062452882858, 45.759481106136121], [17.630066359129554, 45.95176911069418], [16.882515089595298, 46.380631822284428], [16.564808383864854, 46.503750922219822], [16.370504998447412, 46.841327216166498], [16.202298211337361, 46.852385972676949]]] } },
+            { "type": "Feature", "properties": { "admin": "Indonesia", "name": "Indonesia", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[120.715608758630438, -10.239581394087862], [120.295014276206871, -10.258649997603525], [118.967808465654684, -9.55796925215803], [119.900309686361609, -9.361340427287514], [120.425755649905398, -9.665921319215796], [120.775501743656719, -9.969675388227456], [120.715608758630438, -10.239581394087862]]], [[[124.435950148619384, -10.14000090906144], [123.579981724136701, -10.359987481327961], [123.459989048354998, -10.239994805546171], [123.55000939340745, -9.900015557497978], [123.980008986508096, -9.290026950724693], [124.96868248911619, -8.892790215697046], [125.070019972840612, -9.089987481322835], [125.088520135601073, -9.393173109579321], [124.435950148619384, -10.14000090906144]]], [[[117.900018345207741, -8.095681247594923], [118.260616489740471, -8.362383314653327], [118.87845991422212, -8.280682875199828], [119.126506789223086, -8.705824883665072], [117.97040164598927, -8.906639499551257], [117.277730747549015, -9.040894870645557], [116.74014082241662, -9.032936700072637], [117.083737420725313, -8.457157891476539], [117.632024367342126, -8.44930307376819], [117.900018345207741, -8.095681247594923]]], [[[122.903537225436082, -8.094234307490735], [122.756982863456287, -8.649807631060638], [121.2544905945701, -8.933666273639941], [119.924390903809567, -8.810417982623873], [119.920928582846102, -8.44485890059107], [120.715091994307542, -8.236964613480863], [121.341668735846554, -8.53673959720602], [122.007364536630405, -8.46062021244016], [122.903537225436082, -8.094234307490735]]], [[[108.623478631628927, -6.777673841990675], [110.539227329553285, -6.877357679881682], [110.759575636845909, -6.465186455921751], [112.614811232556349, -6.946035658397589], [112.978768345188087, -7.594213148634578], [114.478935174621142, -7.776527601760277], [115.705526971501058, -8.370806573116864], [114.564511346496488, -8.75181690840483], [113.464733514460875, -8.348947442257424], [112.559672479301028, -8.376180922075163], [111.522061395312448, -8.302128594600957], [110.586149530074294, -8.122604668819021], [109.427667270955183, -7.740664157749761], [108.693655226681301, -7.641600437046219], [108.277763299596302, -7.766657403192579], [106.454102004016136, -7.354899590690947], [106.280624220812285, -6.924899997590201], [105.365486281355516, -6.851416110871169], [106.051645949327053, -5.895918877794499], [107.265008579540165, -5.954985039904058], [108.072091099074683, -6.345762220895237], [108.486846144649235, -6.421984958525768], [108.623478631628927, -6.777673841990675]]], [[[134.724624465066654, -6.214400730009286], [134.210133905168902, -6.895237725454704], [134.112775506730998, -6.142467136259014], [134.290335728085779, -5.783057549669038], [134.499625278867882, -5.445042006047898], [134.727001580952106, -5.737582289252158], [134.724624465066654, -6.214400730009286]]], [[[127.249215122588893, -3.459065036638889], [126.874922723498855, -3.790982761249579], [126.183802118027302, -3.607376397316556], [125.989033644719257, -3.177273451351325], [127.00065148326496, -3.12931772218441], [127.249215122588893, -3.459065036638889]]], [[[130.471344028851775, -3.09376433676762], [130.834836053592767, -3.858472181822761], [129.990546502808115, -3.446300957862817], [129.155248651242403, -3.362636813982248], [128.590683628453633, -3.428679294451256], [127.898891229362334, -3.393435967628192], [128.135879347852779, -2.843650404474914], [129.370997756060888, -2.802154229344551], [130.471344028851775, -3.09376433676762]]], [[[134.143367954647772, -1.151867364103594], [134.422627394753022, -2.769184665542383], [135.457602980694674, -3.367752780779113], [136.293314243718754, -2.30704233155609], [137.4407377463275, -1.703513278819372], [138.329727411044757, -1.70268645590265], [139.18492068904294, -2.051295668143637], [139.926684198160387, -2.409051608900284], [141.000210402591847, -2.600151055515624], [141.017056919519007, -5.85902190513802], [141.033851760013874, -9.117892754760417], [140.143415155192542, -8.297167657100955], [139.127766554928087, -8.096042982620942], [138.881476678624949, -8.380935153846094], [137.614473911692812, -8.41168263105976], [138.039099155835174, -7.597882175327354], [138.668621454014783, -7.320224704623072], [138.407913853102343, -6.232849216337483], [137.927839797110835, -5.393365573755998], [135.989250116113453, -4.546543877789047], [135.164597609599667, -4.462931410340771], [133.662880487197867, -3.538853448097526], [133.367704705946778, -4.024818617370314], [132.983955519747326, -4.112978610860281], [132.75694095268895, -3.746282647317129], [132.753788690319197, -3.311787204607071], [131.989804315316178, -2.820551039240455], [133.066844517143466, -2.460417982598443], [133.780030959203486, -2.479848321140209], [133.69621178602614, -2.214541517753687], [132.232373488494204, -2.212526136894325], [131.836221958544684, -1.617161960459597], [130.942839797082797, -1.432522067880796], [130.519558140180038, -0.937720228686075], [131.867537876513609, -0.695461114101818], [132.380116408416768, -0.369537855636977], [133.985548130428384, -0.780210463060442], [134.143367954647772, -1.151867364103594]]], [[[125.240500522971573, 1.419836127117605], [124.43703535369734, 0.427881171058971], [123.685504998876695, 0.235593166500877], [122.723083123872854, 0.431136786293337], [121.056724888189081, 0.381217352699451], [120.18308312386273, 0.23724681233422], [120.040869582195455, -0.519657891444851], [120.935905389490699, -1.408905938323372], [121.475820754076167, -0.955962009285116], [123.34056481332847, -0.615672702643081], [123.258399285984481, -1.076213067228337], [122.822715285331597, -0.930950616055881], [122.388529901215364, -1.516858005381124], [121.508273553555455, -1.904482924002422], [122.454572381684272, -3.186058444840881], [122.271896193532541, -3.529500013852696], [123.170962762546537, -4.683693129091707], [123.162332798353759, -5.34060393638596], [122.628515252778683, -5.634591159694494], [122.236394484548057, -5.282933037948281], [122.71956912647704, -4.46417164471579], [121.738233677254357, -4.851331475446499], [121.48946333220124, -4.574552504091215], [121.619171177253861, -4.188477878438674], [120.898181593917684, -3.602105401222828], [120.972388950688767, -2.627642917494909], [120.305452915529884, -2.931603692235725], [120.39004723519173, -4.097579034037223], [120.430716587405371, -5.528241062037778], [119.796543410319487, -5.67340016034565], [119.36690555224493, -5.379878024927804], [119.653606398600104, -4.459417412944958], [119.498835483885969, -3.49441171632651], [119.078344354326987, -3.487021986508764], [118.767768996252869, -2.801999200047688], [119.180973748858662, -2.147103773612798], [119.323393996255049, -1.35314706788047], [119.825998976725828, 0.154254462073496], [120.035701938966341, 0.566477362465804], [120.885779250167687, 1.309222723796835], [121.666816847826965, 1.013943589681076], [122.927566766451818, 0.875192368977465], [124.077522414242836, 0.917101955566139], [125.065989211121803, 1.643259182131558], [125.240500522971573, 1.419836127117605]]], [[[128.688248732620707, 1.132385972494106], [128.635952183141342, 0.258485826006179], [128.120169712436166, 0.356412665199286], [127.968034295768845, -0.252077325037533], [128.379998813999691, -0.780003757331286], [128.100015903842291, -0.899996433112974], [127.69647464407501, -0.266598402511505], [127.399490187693743, 1.011721503092573], [127.600511509309044, 1.81069082275718], [127.932377557487484, 2.174596258956555], [128.004156121940809, 1.628531398928331], [128.594559360875451, 1.540810655112864], [128.688248732620707, 1.132385972494106]]], [[[117.875627069166001, 1.827640692548911], [118.996747267738158, 0.902219143066048], [117.811858351717788, 0.784241848143722], [117.478338657706047, 0.102474676917026], [117.521643507966587, -0.803723239753211], [116.560048455879496, -1.487660821136231], [116.533796828275158, -2.483517347832901], [116.148083937648607, -4.012726332214014], [116.000857782049067, -3.657037448749008], [114.864803094544513, -4.106984144714416], [114.468651564595064, -3.49570362713382], [113.755671828264099, -3.439169610206519], [113.256994256647545, -3.118775729996854], [112.068126255340644, -3.478392022316071], [111.703290643359992, -2.994442233902631], [111.04824018762821, -3.049425957861188], [110.223846063275971, -2.934032484553483], [110.070935500124335, -1.592874037282414], [109.571947869914041, -1.314906507984489], [109.091873813922518, -0.459506524257051], [108.952657505328162, 0.415375474444346], [109.069136183714036, 1.341933905437642], [109.663260125773718, 2.006466986494984], [109.830226678508836, 1.338135687664191], [110.514060907027101, 0.773131415200993], [111.159137811326559, 0.976478176269509], [111.797548455860408, 0.904441229654651], [112.380251906383648, 1.410120957846757], [112.859809198052176, 1.497790025229946], [113.805849644019531, 1.217548732911041], [114.621355422017473, 1.430688177898886], [115.134037306785231, 2.821481838386219], [115.51907840379198, 3.169238389494395], [115.86551720587677, 4.306559149590156], [117.01521447150634, 4.306094061699468], [117.882034946770162, 4.137551377779487], [117.313232456533513, 3.234428208830578], [118.048329705885351, 2.287690131027361], [117.875627069166001, 1.827640692548911]]], [[[105.817655063909356, -5.852355645372411], [104.710384149191498, -5.873284600450644], [103.868213332130736, -5.037314955264974], [102.584260695406897, -4.220258884298203], [102.156173130300999, -3.614146009946765], [101.399113397225051, -2.799777113459171], [100.902502882900137, -2.05026213949786], [100.141980828860596, -0.650347588710957], [99.26373986206022, 0.183141587724663], [98.970011020913319, 1.042882391764536], [98.601351352943084, 1.823506577965616], [97.699597609449881, 2.453183905442116], [97.17694217324987, 3.30879059489861], [96.424016554757316, 3.86885976807791], [95.380876092513475, 4.970782172053673], [95.293026157617305, 5.479820868344816], [95.936862827541745, 5.439513251157108], [97.484882033277088, 5.24632090903401], [98.369169142655679, 4.268370266126366], [99.142558628335792, 3.590349636240915], [99.693997837322399, 3.174328518075156], [100.641433546961665, 2.099381211755798], [101.658012323007313, 2.083697414555189], [102.498271112073212, 1.398700466310217], [103.076840448013002, 0.561361395668854], [103.838396030698348, 0.104541734208666], [103.437645298274973, -0.711945896002845], [104.010788608824001, -1.059211521004229], [104.369991489684878, -1.084843031421016], [104.539490187602155, -1.782371514496716], [104.887892694113987, -2.340425306816655], [105.622111444116982, -2.42884368246807], [106.10859337771268, -3.06177662517895], [105.857445916774111, -4.305524997579723], [105.817655063909356, -5.852355645372411]]]] } },
+            { "type": "Feature", "properties": { "admin": "India", "name": "India", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[77.837450799474553, 35.494009507787759], [78.912268914713209, 34.321936346975782], [78.811086460285722, 33.506198025032404], [79.208891636068572, 32.994394639613709], [79.176128777995501, 32.483779812137705], [78.458446486325997, 32.61816437431272], [78.738894484374001, 31.515906073527056], [79.721366815107089, 30.882714748654724], [81.11125613802929, 30.183480943313398], [80.476721225917373, 29.729865220655334], [80.088424513676259, 28.794470119740136], [81.057202589851997, 28.416095282499036], [81.999987420584958, 27.925479234319987], [83.304248895199535, 27.364505723575554], [84.675017938173767, 27.234901231387528], [85.25177859898335, 26.726198431906337], [86.024392938179147, 26.630984605408567], [87.22747195836628, 26.39789805755607], [88.060237664749806, 26.414615383402484], [88.174804315140904, 26.810405178325944], [88.043132765661198, 27.445818589786818], [88.120440708369841, 27.876541652939586], [88.730325962278528, 28.086864732367509], [88.814248488320544, 27.299315904239361], [88.835642531289366, 27.098966376243755], [89.744527622438838, 26.71940298105995], [90.37327477413406, 26.875724188742872], [91.217512648486405, 26.808648179628019], [92.033483514375078, 26.838310451763554], [92.10371178585973, 27.4526140406332], [91.69665652869665, 27.771741848251661], [92.503118931043616, 27.896876329046442], [93.413347609432662, 28.640629380807219], [94.565990431702929, 29.277438055939978], [95.404802280664612, 29.031716620392125], [96.117678664131006, 29.452802028922459], [96.586590610747479, 28.830979519154337], [96.248833449287758, 28.411030992134435], [97.327113885490007, 28.261582749946331], [97.402561476636123, 27.88253611908544], [97.051988559968066, 27.699058946233144], [97.133999058015277, 27.08377350514996], [96.419365675850941, 27.264589341739221], [95.124767694074933, 26.573572089132295], [95.155153436262566, 26.001307277932078], [94.603249139385355, 25.162495428970399], [94.552657912171611, 24.675238348890328], [94.106741977925054, 23.850740871673477], [93.325187615942767, 24.078556423432197], [93.286326938859247, 23.043658352138998], [93.060294224014598, 22.703110663335565], [93.166127557348361, 22.278459580977099], [92.672720981825549, 22.041238918541247], [92.146034783906799, 23.62749868417259], [91.869927606171302, 23.62434642180278], [91.706475050832083, 22.985263983649183], [91.158963250699713, 23.503526923104381], [91.467729933643668, 24.072639471934789], [91.915092807994398, 24.130413723237108], [92.376201613334786, 24.976692816664961], [91.799595981822065, 25.14743174895731], [90.872210727912105, 25.13260061288954], [89.920692580121838, 25.269749864192171], [89.832480910199592, 25.965082098895476], [89.355094028687276, 26.014407253518065], [88.56304935094974, 26.446525580342716], [88.209789259802477, 25.768065700782707], [88.931553989623069, 25.238692328384769], [88.30637251175601, 24.866079413344199], [88.084422235062405, 24.501657212821918], [88.699940220090895, 24.233714911388557], [88.529769728553759, 23.631141872649163], [88.876311883503064, 22.879146429937826], [89.031961297566198, 22.055708319582973], [88.888765903685396, 21.690588487224741], [88.208497348995209, 21.703171698487804], [86.975704380240259, 21.495561631755201], [87.033168572948853, 20.743307806882406], [86.499351027373777, 20.151638495356604], [85.060265740909671, 19.478578802971096], [83.941005893899998, 18.302009792549722], [83.189217156917834, 17.671221421778977], [82.192792189465905, 17.016636053937813], [82.191241896497175, 16.556664130107844], [81.692719354177456, 16.3102192245079], [80.791999139330116, 15.951972357644488], [80.324895867843864, 15.899184882058346], [80.025069207686428, 15.136414903214144], [80.23327355339039, 13.835770778859978], [80.286293572921849, 13.006260687710832], [79.862546828128487, 12.056215318240886], [79.85799930208681, 10.357275091997108], [79.340511509115984, 10.308854274939618], [78.885345493489169, 9.54613597252772], [79.189719679688281, 9.216543687370146], [78.27794070833049, 8.933046779816932], [77.94116539908434, 8.25295909263974], [77.539897902337927, 7.965534776232331], [76.592978957021657, 8.899276231314188], [76.130061476551063, 10.299630031775518], [75.746467319648488, 11.308250637248303], [75.396101108709573, 11.781245022015822], [74.864815708316812, 12.741935736537895], [74.616717156883524, 13.992582912649677], [74.443859490867197, 14.617221787977693], [73.534199253233368, 15.990652167214957], [73.119909295549419, 17.928570054592495], [72.820909458308634, 19.208233547436162], [72.824475132136783, 20.41950328214153], [72.630533481745388, 21.356009426351001], [71.175273471973938, 20.757441311114228], [70.470458611945091, 20.877330634031381], [69.164130080038817, 22.089298000572697], [69.644927606082391, 22.450774644454334], [69.349596795534325, 22.843179633062686], [68.176645135373377, 23.691965033456704], [68.842599318318761, 24.359133612560932], [71.0432401874682, 24.356523952730193], [70.844699334602822, 25.215102037043511], [70.282873162725579, 25.722228705339823], [70.168926629522005, 26.491871649678835], [69.514392938113119, 26.940965684511365], [70.61649620960192, 27.989196275335861], [71.777665643200308, 27.913180243434521], [72.823751662084689, 28.961591701772047], [73.450638462217412, 29.976413479119863], [74.421380242820263, 30.97981476493117], [74.405928989564998, 31.692639471965272], [75.258641798813187, 32.271105455040491], [74.451559279278698, 32.764899603805489], [74.104293654277328, 33.441473293586846], [73.749948358051952, 34.317698879527846], [74.240202671204955, 34.748887030571247], [75.757060988268321, 34.504922593721311], [76.871721632804011, 34.653544012992732], [77.837450799474553, 35.494009507787759]]] } },
+            { "type": "Feature", "properties": { "admin": "Ireland", "name": "Ireland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-6.197884894220989, 53.86756500916335], [-6.032985398777609, 53.153164170944336], [-6.788856573910847, 52.260117906292322], [-8.561616583683557, 51.669301255899349], [-9.977085740590267, 51.820454820353071], [-9.16628251793078, 52.864628811242667], [-9.688524542672452, 53.881362616585285], [-8.327987433292007, 54.664518947968624], [-7.572167934591064, 55.131622219454854], [-7.366030646178785, 54.595840969452709], [-7.572167934591064, 54.059956366585986], [-6.953730231138065, 54.073702297575622], [-6.197884894220989, 53.86756500916335]]] } },
+            { "type": "Feature", "properties": { "admin": "Iran", "name": "Iran", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[53.921597934795543, 37.198918361961255], [54.800303989486558, 37.392420762678178], [55.511578403551894, 37.964117133123153], [56.180374790273319, 37.935126654607423], [56.619366082592805, 38.121394354803478], [57.330433790928964, 38.029229437810933], [58.436154412678192, 37.522309475243794], [59.234761997316795, 37.412987982730336], [60.377637973883864, 36.52738312432836], [61.123070509694131, 36.491597194966239], [61.21081709172573, 35.650072333309218], [60.80319339380744, 34.404101874319856], [60.528429803311575, 33.676446031217999], [60.963700392505991, 33.528832302376252], [60.536077915290761, 32.981268825811561], [60.863654819588952, 32.182919623334421], [60.941944614511115, 31.548074652628745], [61.699314406180811, 31.379506130492661], [61.78122155136343, 30.735850328081231], [60.874248488208778, 29.829238999952604], [61.369308709564926, 29.303276272085917], [61.771868117118615, 28.699333807890792], [62.727830438085974, 28.259644883735383], [62.755425652929851, 27.378923448184985], [63.23389773952028, 27.217047024030702], [63.316631707619578, 26.756532497661659], [61.874187453056535, 26.239974880472097], [61.497362908784183, 25.078237006118492], [59.616134067630831, 25.380156561783775], [58.525761346272297, 25.609961656185725], [57.39725141788238, 25.739902045183634], [56.97076582217754, 26.966106268821356], [56.492138706290199, 27.14330475515019], [55.723710158110059, 26.964633490501036], [54.715089552637252, 26.480657863871507], [53.493096958231334, 26.812368882753042], [52.483597853409599, 27.580849107365488], [51.520762566947404, 27.865689602158291], [50.852948032439528, 28.814520575469377], [50.115008579311571, 30.14777252859971], [49.576850213423988, 29.9857152369324], [48.941333449098536, 30.31709035900403], [48.567971225789748, 29.926778265903515], [48.014568312376085, 30.452456773392594], [48.00469811380831, 30.985137437457237], [47.685286085812258, 30.984853217079621], [47.849203729042095, 31.709175930298663], [47.334661492711895, 32.469155381799105], [46.109361606639304, 33.017287299118998], [45.416690708199035, 33.967797756479577], [45.648459507028079, 34.748137722303007], [46.15178795755093, 35.093258775364284], [46.076340366404786, 35.67738332777548], [45.420618117053202, 35.977545884742817], [44.77267, 37.17045], [44.225755649600522, 37.971584377589345], [44.421402622257538, 38.281281236314534], [44.109225294782334, 39.428136298168091], [44.793989699081934, 39.713002631177041], [44.9526880226503, 39.335764675446363], [45.457721795438765, 38.874139105783051], [46.143623081248812, 38.74120148371221], [46.505719842317966, 38.770605373686287], [47.685079380083081, 39.508363959301207], [48.060095249225235, 39.582235419262453], [48.355529412637871, 39.2887649602769], [48.010744256386474, 38.794014797514514], [48.634375441284803, 38.27037750910096], [48.883249139202483, 38.32024526626261], [49.199612257693332, 37.582874253889877], [50.147771437384606, 37.37456655532133], [50.842354363819695, 36.872814235983384], [52.26402469260141, 36.700421657857696], [53.825789829326411, 36.965030829408228], [53.921597934795543, 37.198918361961255]]] } },
+            { "type": "Feature", "properties": { "admin": "Iraq", "name": "Iraq", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[45.420618117053202, 35.977545884742817], [46.076340366404786, 35.67738332777548], [46.15178795755093, 35.093258775364284], [45.648459507028079, 34.748137722303007], [45.416690708199035, 33.967797756479577], [46.109361606639304, 33.017287299118998], [47.334661492711895, 32.469155381799105], [47.849203729042095, 31.709175930298663], [47.685286085812258, 30.984853217079621], [48.00469811380831, 30.985137437457237], [48.014568312376085, 30.452456773392594], [48.567971225789748, 29.926778265903515], [47.974519077349889, 29.975819200148493], [47.302622104690947, 30.059069932570711], [46.568713413281742, 29.099025173452283], [44.709498732284736, 29.178891099559376], [41.889980910007829, 31.190008653278362], [40.399994337736238, 31.889991766887931], [39.195468377444961, 32.16100881604266], [38.792340529136077, 33.378686428352218], [41.00615888851992, 34.419372260062111], [41.383965285005807, 35.628316555314349], [41.289707472505448, 36.358814602192261], [41.837064243340954, 36.605853786763568], [42.349591098811764, 37.22987254490409], [42.779125604021822, 37.385263576805741], [43.942258742047287, 37.256227525372942], [44.293451775902852, 37.001514390606289], [44.772699008977689, 37.170444647768427], [45.420618117053202, 35.977545884742817]]] } },
+            { "type": "Feature", "properties": { "admin": "Iceland", "name": "Iceland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-14.508695441129232, 66.455892239031414], [-14.739637417041605, 65.808748277440287], [-13.609732224979807, 65.126671047619851], [-14.9098337467949, 64.36408193628867], [-17.794438035543418, 63.67874909123384], [-18.656245896874989, 63.496382961675806], [-19.972754685942757, 63.643634955491514], [-22.762971971110154, 63.960178941495371], [-21.778484259517676, 64.402115790455497], [-23.955043911219104, 64.891129869233481], [-22.184402635170354, 65.084968166760291], [-22.227423265053329, 65.378593655042721], [-24.326184047939332, 65.611189276788451], [-23.650514695723082, 66.262519029395207], [-22.134922451250883, 66.410468655046856], [-20.576283738679543, 65.732112128351417], [-19.056841600001587, 66.276600857194751], [-17.798623826559048, 65.993853257909763], [-16.167818976292121, 66.526792304135853], [-14.508695441129232, 66.455892239031414]]] } },
+            { "type": "Feature", "properties": { "admin": "Israel", "name": "Israel", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.719918247222743, 32.709192409794859], [35.545665317534535, 32.393992011030569], [35.183930291491428, 32.532510687788935], [34.974640740709319, 31.866582343059715], [35.225891554512422, 31.754341132121759], [34.970506626125989, 31.616778469360803], [34.927408481594554, 31.35343537040141], [35.397560662586038, 31.489086005167572], [35.420918409981958, 31.100065822874349], [34.922602573391423, 29.501326198844517], [34.26543338393568, 31.219360866820146], [34.556371697738903, 31.548823960896989], [34.48810713068135, 31.605538845337314], [34.752587111151165, 32.07292633720116], [34.955417107896771, 32.827376410446369], [35.098457472480668, 33.080539252244257], [35.126052687324538, 33.090900376918775], [35.460709262846699, 33.089040025356276], [35.552796665190805, 33.264274807258012], [35.821100701650231, 33.277426459276292], [35.836396925608618, 32.868123277308506], [35.700797967274745, 32.716013698857374], [35.719918247222743, 32.709192409794859]]] } },
+            { "type": "Feature", "properties": { "admin": "Italy", "name": "Italy", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[15.52037601081383, 38.231155096991465], [15.160242954171732, 37.444045518537813], [15.309897902089002, 37.134219468731793], [15.099988234119445, 36.61998729099539], [14.335228712632013, 36.996630967754747], [13.826732618879927, 37.104531358380186], [12.431003859108809, 37.612949937483812], [12.570943637755132, 38.126381130519682], [13.741156447004581, 38.03496552179535], [14.761249220446157, 38.143873602850498], [15.52037601081383, 38.231155096991465]]], [[[9.210011834356264, 41.209991360024212], [9.809975213264973, 40.500008856766094], [9.669518670295671, 39.177376410471787], [9.214817742559486, 39.240473334300127], [8.806935662479729, 38.906617743478471], [8.428302443077113, 39.171847032216611], [8.388253208050939, 40.378310858718798], [8.159998406617659, 40.950007229163774], [8.709990675500107, 40.899984442705225], [9.210011834356264, 41.209991360024212]]], [[[12.376485223040842, 46.767559109069872], [13.806475457421552, 46.50930613869118], [13.698109978905475, 46.016778062517368], [13.937630242578335, 45.59101593686465], [13.141606479554294, 45.736691799495411], [12.328581170306304, 45.38177806251484], [12.383874952858601, 44.885374253919075], [12.261453484759157, 44.600482082694008], [12.589237094786482, 44.091365871754462], [13.526905958722491, 43.587727362637899], [14.029820997787024, 42.761007798832473], [15.142569614327952, 41.955139675456891], [15.926191033601892, 41.961315009115729], [16.169897088290409, 41.740294908203417], [15.889345737377793, 41.541082261718195], [16.785001661860573, 41.179605617836579], [17.519168735431204, 40.877143459632229], [18.376687452882575, 40.355624904942651], [18.4802470231954, 40.168866278639818], [18.293385044028096, 39.810774441073235], [17.738380161213279, 40.277671006830289], [16.869595981522334, 40.442234605463838], [16.448743116937319, 39.795400702466473], [17.171489698971495, 39.424699815420716], [17.052840610429339, 38.902871202137291], [16.635088331781841, 38.843572496082395], [16.100960727613053, 37.985898749334176], [15.684086948314498, 37.908849188787023], [15.687962680736318, 38.214592800441849], [15.891981235424705, 38.750942491199218], [16.109332309644312, 38.964547024077682], [15.718813510814638, 39.544072374014938], [15.413612501698818, 40.048356838535163], [14.998495721098234, 40.172948716790913], [14.703268263414767, 40.604550279292617], [14.06067182786526, 40.786347968095434], [13.627985060285393, 41.188287258461649], [12.888081902730418, 41.253089504555604], [12.106682570044907, 41.7045348170574], [11.191906365614184, 42.355425319989671], [10.511947869517794, 42.93146251074721], [10.200028924204046, 43.920006822274608], [9.702488234097812, 44.036278794931313], [8.888946160526869, 44.366336167979533], [8.428560825238575, 44.23122813575241], [7.8507666357832, 43.767147935555236], [7.435184767291841, 43.693844916349164], [7.549596388386161, 44.127901109384808], [7.007562290076661, 44.254766750661382], [6.749955275101711, 45.028517971367584], [7.096652459347835, 45.333098863295859], [6.80235517744566, 45.708579820328673], [6.84359297041456, 45.991146552100659], [7.273850945676683, 45.776947740250748], [7.755992058959832, 45.824490057959267], [8.316629672894377, 46.16364248309084], [8.489952426801294, 46.005150865251736], [8.966305779667833, 46.03693187111115], [9.18288170740311, 46.440214748716976], [9.92283654139035, 46.314899400409182], [10.363378126678665, 46.48357127540983], [10.4427014502466, 46.893546250997431], [11.048555942436504, 46.751358547546396], [11.164827915093325, 46.941579494812729], [12.153088006243079, 47.115393174826423], [12.376485223040842, 46.767559109069872]]]] } },
+            { "type": "Feature", "properties": { "admin": "Jamaica", "name": "Jamaica", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-77.569600796199197, 18.490525417550483], [-76.896618618462114, 18.400866807524078], [-76.365359056285527, 18.16070058844759], [-76.19965857614163, 17.886867173732963], [-76.902561408175671, 17.868237819891743], [-77.206341315403449, 17.701116237859818], [-77.766022915340599, 17.861597398342237], [-78.337719285785596, 18.225967922432226], [-78.217726610003865, 18.454532782459193], [-77.797364671525614, 18.524218451404774], [-77.569600796199197, 18.490525417550483]]] } },
+            { "type": "Feature", "properties": { "admin": "Jordan", "name": "Jordan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.545665317534535, 32.393992011030569], [35.719918247222743, 32.709192409794859], [36.834062127435537, 32.312937526980768], [38.792340529136077, 33.378686428352218], [39.195468377444961, 32.16100881604266], [39.004885695152545, 32.010216986614971], [37.002165561681004, 31.508412990844736], [37.998848911294367, 30.508499864213128], [37.668119744626374, 30.338665269485894], [37.503581984209028, 30.003776150018396], [36.740527784987243, 29.865283311476183], [36.501214227043583, 29.505253607698702], [36.068940870922049, 29.19749461518445], [34.956037225084252, 29.356554673778835], [34.922602573391423, 29.501326198844517], [35.420918409981958, 31.100065822874349], [35.397560662586038, 31.489086005167572], [35.545251906076196, 31.782504787720832], [35.545665317534535, 32.393992011030569]]] } },
+            { "type": "Feature", "properties": { "admin": "Japan", "name": "Japan", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[134.638428176003856, 34.149233710256418], [134.766379022358478, 33.806334743783673], [134.20341596897083, 33.201177883429622], [133.792950067276479, 33.521985175097583], [133.280268182508848, 33.289570420864941], [133.014858026257855, 32.704567369104772], [132.363114862192674, 32.989382025681373], [132.371176385630179, 33.463642483040068], [132.924372593314786, 34.060298570282036], [133.492968377822194, 33.944620876596694], [133.904106073136347, 34.364931138642611], [134.638428176003856, 34.149233710256418]]], [[[140.976387567305267, 37.142074286440156], [140.599769728762084, 36.343983466124534], [140.774074334882641, 35.842877102190229], [140.253279250245072, 35.138113918593653], [138.975527785396196, 34.667600002576101], [137.217598911691198, 34.606285915661843], [135.792983026268871, 33.46480520276662], [135.120982700745401, 33.849071153289053], [135.07943484918269, 34.596544908174813], [133.340316196831964, 34.375938218720755], [132.156770868051296, 33.904933376596503], [130.986144647343451, 33.885761420216276], [132.000036248910021, 33.149992377244608], [131.33279015515734, 31.450354519164836], [130.68631798718593, 31.029579169228235], [130.202419875204953, 31.418237616495411], [130.447676222862128, 32.319474595665717], [129.81469160371887, 32.610309556604385], [129.408463169472554, 33.296055813117583], [130.353935174684636, 33.604150702441693], [130.878450962447118, 34.232742824840031], [131.884229364143891, 34.749713853487911], [132.617672967662486, 35.433393052709413], [134.608300815977771, 35.731617743465812], [135.677537876528902, 35.527134100886819], [136.723830601142424, 37.304984239240376], [137.390611607004473, 36.827390651998819], [138.857602166906247, 37.827484646143454], [139.426404657142882, 38.215962225897634], [140.054790073812057, 39.438807481436378], [139.883379347899847, 40.563312486323682], [140.305782505453664, 41.195005194659551], [141.368973423426667, 41.378559882160282], [141.914263136970476, 39.991616115878678], [141.884600864834965, 39.18086456965149], [140.959489373945729, 38.174000962876583], [140.976387567305267, 37.142074286440156]]], [[[143.910161981379474, 44.174099839853724], [144.613426548439634, 43.960882880217511], [145.320825230083074, 44.384732977875437], [145.543137241802754, 43.262088324550596], [144.059661899999867, 42.988358262700551], [143.183849725517291, 41.995214748699183], [141.611490920172457, 42.678790595056071], [141.067286411706618, 41.58459381770799], [139.95510623592105, 41.56955597591103], [139.817543573159924, 42.563758856774392], [140.312087030193169, 43.333272610032644], [141.380548944259999, 43.388824774746489], [141.671952345953912, 44.772125352551477], [141.967644891527982, 45.551483466161343], [143.142870314709796, 44.510358384776957], [143.910161981379474, 44.174099839853724]]]] } },
+            { "type": "Feature", "properties": { "admin": "Kazakhstan", "name": "Kazakhstan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[70.962314894499272, 42.26615428320553], [70.388964878220776, 42.081307684897517], [69.070027296835221, 41.384244289712335], [68.632482944620037, 40.668680731766855], [68.259895867795635, 40.662324530594894], [67.985855747351806, 41.135990708982199], [66.714047072216587, 41.168443508461557], [66.510648634715707, 41.987644151368549], [66.023391554635609, 41.994646307944031], [66.098012322865188, 42.997660020513074], [64.90082441595932, 43.728080552742647], [63.18578698105658, 43.650074978197999], [62.013300408786264, 43.504476630215649], [61.05831994003249, 44.405816962250576], [60.239971958258472, 44.784036770194739], [58.689989048095796, 45.500013739598721], [58.503127068928428, 45.58680430763296], [55.928917270741167, 44.995858466159163], [55.968191359283011, 41.30864166926937], [55.455251092353805, 41.259859117185826], [54.755345493392653, 42.04397146256661], [54.079417759014959, 42.324109402020831], [52.944293247291725, 42.116034247397572], [52.502459751196277, 41.783315538086462], [52.446339145727208, 42.027150783855561], [52.692112257707251, 42.443895372073364], [52.501426222550315, 42.792297878585188], [51.342427199108201, 43.132974758469338], [50.891291945200223, 44.031033637053774], [50.339129266161358, 44.284015611338468], [50.305642938036257, 44.609835516938908], [51.278503452363211, 44.514854234386448], [51.316899041556034, 45.245998236667894], [52.167389764215713, 45.408391425145098], [53.040876499245194, 45.259046535821753], [53.220865512917712, 46.23464590105992], [53.042736850807771, 46.853006089864486], [52.042022739475598, 46.804636949239232], [51.191945428274252, 47.048704738953909], [50.034083286342465, 46.608989976582208], [49.10116, 46.39933000000012], [48.593241001180495, 46.561034247415471], [48.694733514201729, 47.075628160177921], [48.057253045449258, 47.743752753279516], [47.315231154170242, 47.715847479841948], [46.466445753776256, 48.394152330104923], [47.043671502476506, 49.1520388860976], [46.751596307162728, 49.35600576435376], [47.549480421749301, 50.454698391311119], [48.577841424357523, 49.874759629915658], [48.702381626181008, 50.605128485712825], [50.766648390512145, 51.692762356159889], [52.328723585830957, 51.71865224873811], [54.53287845237621, 51.026239732459302], [55.716940545479801, 50.62171662047853], [56.777961053296551, 51.043551337277037], [58.363290643146733, 51.063653469438563], [59.642282342370599, 50.545442206415707], [59.932807244715484, 50.842194118851857], [61.337424350840919, 50.799070136104248], [61.588003371024158, 51.2726587998432], [59.967533807215531, 51.960420437215696], [60.927268507740258, 52.447548326215028], [60.739993117114572, 52.719986477257734], [61.699986199800584, 52.979996446334255], [60.978066440683151, 53.664993394579128], [61.436591424409052, 54.006264553434775], [65.178533563095911, 54.354227810272093], [65.66687584825398, 54.601266994843449], [68.169100376258811, 54.970391750704309], [69.068166945272864, 55.385250149143516], [70.865266554655122, 55.169733588270091], [71.180131056609397, 54.133285224008247], [72.224150018202167, 54.376655381886728], [73.508516066384388, 54.035616766976588], [73.425678745420427, 53.489810289109741], [74.384845005190044, 53.546861070360066], [76.891100294913414, 54.490524400441913], [76.525179477854735, 54.177003485727127], [77.800915561844221, 53.404414984747561], [80.035559523441663, 50.864750881547238], [80.568446893235475, 51.388336493528456], [81.945985548839914, 50.812195949906354], [83.383003778012366, 51.069182847693909], [83.935114780618832, 50.889245510453563], [84.416377394553052, 50.311399644565817], [85.115559523462011, 50.117302964877631], [85.541269972682457, 49.69285858824815], [86.829356723989619, 49.826674709668154], [87.359970330762664, 49.214980780629148], [86.598776483103379, 48.549181626980605], [85.768232863308285, 48.455750637396974], [85.72048383987071, 47.452969468773112], [85.164290399113355, 47.000955715516099], [83.180483839860443, 47.330031236350848], [82.458925815769106, 45.539649563166499], [81.947070753918112, 45.317027492853235], [79.966106398441397, 44.917516994804643], [80.866206496101356, 43.180362046881037], [80.180150180994289, 42.920067857426936], [80.259990268885332, 42.349999294599101], [79.643645460940135, 42.496682847659649], [79.142177361979776, 42.856092434249589], [77.658391961583206, 42.960685533208327], [76.000353631498555, 42.988022365890622], [75.636964959622091, 42.877899888676765], [74.212865838522575, 43.298339341803505], [73.645303582660901, 43.091271877609863], [73.489757521462337, 42.500894476891276], [71.844638299450637, 42.845395412765178], [71.186280552052253, 42.704292914392219], [70.962314894499272, 42.26615428320553]]] } },
+            { "type": "Feature", "properties": { "admin": "Kenya", "name": "Kenya", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[40.993, -0.85829], [41.58513, -1.68325], [40.88477, -2.08255], [40.63785, -2.49979], [40.26304, -2.57309], [40.12119, -3.27768], [39.80006, -3.68116], [39.60489, -4.34653], [39.20222, -4.67677], [37.7669, -3.67712], [37.69869, -3.09699], [34.07262, -1.05982], [33.903711197104521, -0.95], [33.893568969666937, 0.109813537861896], [34.18, 0.515], [34.6721, 1.17694], [35.03599, 1.90584], [34.59607, 3.05374], [34.47913, 3.5556], [34.005, 4.249884947362047], [34.620196267853871, 4.847122742081987], [35.298007118232974, 5.506], [35.817447662353501, 5.338232082790795], [35.817447662353501, 4.776965663461889], [36.159078632855639, 4.447864127672768], [36.855093238008116, 4.447864127672768], [38.120915, 3.598605], [38.43697, 3.58851], [38.67114, 3.61607], [38.89251, 3.50074], [39.559384258765846, 3.42206], [39.85494, 3.83879], [40.76848, 4.25702], [41.1718, 3.91909], [41.855083092643966, 3.918911920483726], [40.98105, 2.78452], [40.993, -0.85829]]] } },
+            { "type": "Feature", "properties": { "admin": "Kyrgyzstan", "name": "Kyrgyzstan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[70.96231489449913, 42.266154283205481], [71.186280552052111, 42.704292914392127], [71.84463829945058, 42.845395412765093], [73.489757521462337, 42.500894476891311], [73.645303582660901, 43.09127187760982], [74.212865838522546, 43.298339341803363], [75.636964959622006, 42.877899888676673], [76.000353631498442, 42.988022365890664], [77.658391961583206, 42.960685533208256], [79.142177361979762, 42.856092434249511], [79.643645460940107, 42.496682847659514], [80.259990268885289, 42.349999294599044], [80.119430373051358, 42.123940741538235], [78.543660923175295, 41.582242540038685], [78.187196893225959, 41.185315863604792], [76.904484490877067, 41.066485907549634], [76.526368035797432, 40.427946071935111], [75.467827996730691, 40.562072251948663], [74.776862420556043, 40.366425279291619], [73.822243686828287, 39.893973497063179], [73.960013055318413, 39.660008449861721], [73.67537926625478, 39.431236884105594], [71.784693637991992, 39.279463202464363], [70.549161818325601, 39.604197902986492], [69.464886915977516, 39.526683254548693], [69.559609816368507, 40.103211371412968], [70.648018833299957, 39.935753892571157], [71.014198032520156, 40.244365546218226], [71.774875115856545, 40.145844428053763], [73.055417108049156, 40.86603302668945], [71.870114780570447, 41.392900092121259], [71.157858514291576, 41.143587144529107], [70.420022414028196, 41.519998277343134], [71.259247674448218, 42.167710679689456], [70.96231489449913, 42.266154283205481]]] } },
+            { "type": "Feature", "properties": { "admin": "Cambodia", "name": "Cambodia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[103.497279901139677, 10.632555446815926], [103.090689731867229, 11.153660590047162], [102.58493248902667, 12.186594956913279], [102.348099399833004, 13.39424734135822], [102.988422072361601, 14.225721136934464], [104.281418084736586, 14.416743068901363], [105.218776890078871, 14.27321177821069], [106.04394616091551, 13.881091009979952], [106.496373325630856, 14.57058380783428], [107.382727492301058, 14.202440904186968], [107.614547967562402, 13.535530707244202], [107.491403029410861, 12.337205918827944], [105.810523716253101, 11.567614650921225], [106.249670037869436, 10.961811835163585], [105.199914992292321, 10.889309800658094], [104.334334751403446, 10.486543687375228], [103.497279901139677, 10.632555446815926]]] } },
+            { "type": "Feature", "properties": { "admin": "South Korea", "name": "Korea", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[128.349716424676586, 38.612242946927843], [129.212919549680038, 37.432392483055942], [129.460449660358137, 36.784189154602821], [129.468304478066472, 35.632140611303939], [129.091376580929563, 35.08248423923142], [128.18585045787907, 34.890377102186385], [127.386519403188373, 34.475673733044111], [126.485747511908713, 34.390045884736473], [126.3739197124291, 34.934560451795939], [126.559231398627773, 35.684540513647896], [126.117397902532261, 36.725484727519252], [126.860143263863364, 36.893924058574612], [126.174758742376213, 37.749685777328033], [126.237338901881742, 37.840377916000271], [126.683719924018888, 37.804772854151174], [127.073308547067342, 38.256114813788393], [127.780035435090966, 38.304535630845884], [128.205745884311426, 38.370397243801882], [128.349716424676586, 38.612242946927843]]] } },
+            { "type": "Feature", "properties": { "admin": "Kosovo", "name": "Kosovo", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.76216, 42.05186], [20.717310000000108, 41.84711], [20.59023, 41.85541], [20.52295, 42.21787], [20.28374, 42.32025], [20.0707, 42.58863], [20.25758, 42.81275], [20.49679, 42.88469], [20.63508, 43.21671], [20.81448, 43.27205], [20.95651, 43.13094], [21.143395, 43.068685000000123], [21.27421, 42.90959], [21.43866, 42.86255], [21.63302, 42.67717], [21.77505, 42.6827], [21.66292, 42.43922], [21.54332, 42.32025], [21.576635989402117, 42.245224397061847], [21.352700000000134, 42.2068], [20.76216, 42.05186]]] } },
+            { "type": "Feature", "properties": { "admin": "Kuwait", "name": "Kuwait", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[47.974519077349889, 29.975819200148493], [48.183188510944483, 29.534476630159759], [48.09394331237641, 29.306299343374999], [48.416094191283939, 28.552004299426663], [47.708850538937376, 28.526062730416136], [47.459821811722819, 29.002519436147217], [46.568713413281742, 29.099025173452283], [47.302622104690947, 30.059069932570711], [47.974519077349889, 29.975819200148493]]] } },
+            { "type": "Feature", "properties": { "admin": "Laos", "name": "Lao PDR", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[105.218776890078871, 14.27321177821069], [105.544338413517664, 14.723933620660414], [105.589038527450128, 15.570316066952856], [104.779320509868768, 16.441864935771445], [104.716947056092465, 17.428858954330078], [103.956476678485288, 18.240954087796872], [103.200192091893726, 18.309632066312769], [102.998705682387694, 17.961694647691598], [102.413004998791592, 17.932781683824281], [102.113591750092453, 18.109101670804161], [101.059547560635139, 17.512497259994486], [101.035931431077742, 18.408928330961611], [101.282014601651667, 19.462584947176762], [100.606293573003128, 19.508344427971217], [100.548881056726856, 20.109237982661124], [100.115987583417819, 20.41784963630818], [100.329101190189519, 20.786121731036229], [101.180005324307515, 21.436572984294024], [101.270025669359939, 21.201651923095177], [101.803119744882906, 21.174366766845065], [101.652017856861491, 22.318198757409544], [102.170435825613552, 22.464753119389297], [102.754896274834636, 21.675137233969462], [103.203861118586431, 20.766562201413745], [104.435000441508024, 20.758733221921528], [104.822573683697073, 19.886641750563879], [104.183387892678908, 19.624668077060214], [103.896532017026701, 19.265180975821799], [105.094598423281496, 18.666974595611073], [105.925762160264, 17.485315456608955], [106.55600792849566, 16.604283962464802], [107.312705926545576, 15.908538316303177], [107.564525181103875, 15.202173163305554], [107.382727492301058, 14.202440904186968], [106.496373325630856, 14.57058380783428], [106.04394616091551, 13.881091009979952], [105.218776890078871, 14.27321177821069]]] } },
+            { "type": "Feature", "properties": { "admin": "Lebanon", "name": "Lebanon", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.821100701650231, 33.277426459276292], [35.552796665190805, 33.264274807258012], [35.460709262846699, 33.089040025356276], [35.126052687324538, 33.090900376918775], [35.48220665868012, 33.905450140919434], [35.979592319489392, 34.610058295219126], [35.998402540843628, 34.644914048799997], [36.448194207512095, 34.59393524834406], [36.611750115715886, 34.201788641897174], [36.066460402172048, 33.824912421192543], [35.821100701650231, 33.277426459276292]]] } },
+            { "type": "Feature", "properties": { "admin": "Liberia", "name": "Liberia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-7.712159389669749, 4.364565944837721], [-7.974107224957249, 4.355755113131961], [-9.004793667018673, 4.832418524592199], [-9.913420376006682, 5.593560695819205], [-10.765383876986643, 6.140710760925556], [-11.438779466182053, 6.785916856305746], [-11.199801805048278, 7.105845648624735], [-11.14670427086838, 7.396706447779534], [-10.695594855176477, 7.939464016141085], [-10.230093553091276, 8.406205552601291], [-10.016566534861253, 8.42850393313523], [-9.755342169625832, 8.541055202666923], [-9.33727983238458, 7.928534450711351], [-9.403348151069748, 7.526905218938906], [-9.208786383490844, 7.313920803247952], [-8.926064622422002, 7.309037380396375], [-8.722123582382123, 7.711674302598509], [-8.439298468448696, 7.686042792181736], [-8.485445522485348, 7.395207831243068], [-8.385451626000572, 6.911800645368742], [-8.602880214868618, 6.467564195171659], [-8.311347622094017, 6.193033148621081], [-7.993692592795879, 6.126189683451541], [-7.570152553731686, 5.707352199725903], [-7.53971513511176, 5.313345241716517], [-7.63536821128403, 5.188159084489455], [-7.712159389669749, 4.364565944837721]]] } },
+            { "type": "Feature", "properties": { "admin": "Libya", "name": "Libya", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[14.8513, 22.862950000000119], [14.143870883855239, 22.491288967371126], [13.581424594790459, 23.040506089769274], [11.999505649471697, 23.471668402596432], [11.560669386449032, 24.09790924732561], [10.771363559622952, 24.562532050061741], [10.303846876678445, 24.379313259370967], [9.948261346078024, 24.936953640232613], [9.910692579801774, 25.365454616796789], [9.319410841518218, 26.094324856057476], [9.716285841519662, 26.512206325785652], [9.629056023811073, 27.140953477481041], [9.756128370816779, 27.688258571884198], [9.68388471847288, 28.144173895779311], [9.859997999723472, 28.959989732371064], [9.805634392952353, 29.424638373323369], [9.482139926805415, 30.307556057246181], [9.970017124072966, 30.539324856075375], [10.056575148161697, 30.961831366493517], [9.950225050505194, 31.376069647745275], [10.636901482799484, 31.761420803345679], [10.944789666394511, 32.081814683555358], [11.43225345220378, 32.368903103152824], [11.488787469131008, 33.136995754523234], [12.66331, 32.79278], [13.08326, 32.87882], [13.91868, 32.71196], [15.24563, 32.26508], [15.71394, 31.37626], [16.61162, 31.18218], [18.02109, 30.76357], [19.08641, 30.26639], [19.57404, 30.52582], [20.05335, 30.98576], [19.82033, 31.751790000000135], [20.13397, 32.2382], [20.85452, 32.7068], [21.54298, 32.8432], [22.89576, 32.63858], [23.2368, 32.19149], [23.6091300000001, 32.18726], [23.9275, 32.01667], [24.92114, 31.89936], [25.16482, 31.56915], [24.80287, 31.08929], [24.95762, 30.6616], [24.70007, 30.04419], [25.00000000000011, 29.238654529533552], [25.00000000000011, 25.682499996360995], [25.00000000000011, 22.0], [25.00000000000011, 20.00304], [23.850000000000129, 20.0], [23.837660000000135, 19.580470000000101], [19.84926, 21.49509], [15.86085, 23.40972], [14.8513, 22.862950000000119]]] } },
+            { "type": "Feature", "properties": { "admin": "Sri Lanka", "name": "Sri Lanka", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[81.787959018891371, 7.523055324733162], [81.637322218760573, 6.481775214051921], [81.218019647144317, 6.197141424988287], [80.348356968104397, 5.968369859232154], [79.872468703128519, 6.763463446474928], [79.6951668639351, 8.200843410673384], [80.147800734379629, 9.824077663609554], [80.838817986986541, 9.268426825391186], [81.304319289071756, 8.564206244333688], [81.787959018891371, 7.523055324733162]]] } },
+            { "type": "Feature", "properties": { "admin": "Lesotho", "name": "Lesotho", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[28.978262566857236, -28.955596612261708], [29.325166456832587, -29.257386976846245], [29.018415154748016, -29.743765557577362], [28.848399692507734, -30.070050551068245], [28.291069370239903, -30.226216729454293], [28.107204624145421, -30.545732110314944], [27.749397006956478, -30.645105889612214], [26.999261915807629, -29.875953871379977], [27.532511020627471, -29.242710870075353], [28.07433841320778, -28.851468601193581], [28.541700066855491, -28.647501722937562], [28.978262566857236, -28.955596612261708]]] } },
+            { "type": "Feature", "properties": { "admin": "Lithuania", "name": "Lithuania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.731098667092649, 54.327536932993311], [22.651051873472536, 54.582740993866729], [22.757763706155256, 54.856574408581366], [22.31572350433057, 55.01529857036585], [21.26844892750346, 55.190481675835301], [21.05580040862241, 56.031076361711051], [22.201156853939491, 56.337801825579483], [23.878263787539957, 56.273671373105259], [24.860684441840753, 56.372528388079616], [25.000934279080887, 56.164530748104831], [25.533046502390327, 56.100296942766029], [26.494331495883749, 55.61510691997762], [26.588279249790386, 55.167175604871659], [25.768432651479792, 54.846962592175082], [25.536353794056989, 54.282423407602515], [24.45068362803703, 53.905702216194747], [23.484127638449841, 53.912497667041123], [23.243987257589506, 54.220566718149129], [22.731098667092649, 54.327536932993311]]] } },
+            { "type": "Feature", "properties": { "admin": "Luxembourg", "name": "Luxembourg", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[6.043073357781109, 50.128051662794221], [6.242751092156992, 49.90222565367872], [6.186320428094176, 49.4638028021145], [5.897759230176403, 49.442667141307012], [5.674051954784828, 49.52948354755749], [5.782417433300905, 50.090327867221205], [6.043073357781109, 50.128051662794221]]] } },
+            { "type": "Feature", "properties": { "admin": "Latvia", "name": "Latvia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[21.05580040862241, 56.031076361711051], [21.090423618257965, 56.783872789122924], [21.581866489353668, 57.411870632549913], [22.524341261492872, 57.753374335350756], [23.31845299652209, 57.006236477274854], [24.120729607853423, 57.025692654032753], [24.312862583114615, 57.793423570376966], [25.164593540149262, 57.970156968815175], [25.602809685984365, 57.847528794986559], [26.46353234223778, 57.476388658266316], [27.288184848751509, 57.474528306703817], [27.770015903440925, 57.244258124411218], [27.855282016722519, 56.759326483784278], [28.17670942557799, 56.169129950578807], [27.102459751094525, 55.783313707087672], [26.494331495883749, 55.61510691997762], [25.533046502390327, 56.100296942766029], [25.000934279080887, 56.164530748104831], [24.860684441840753, 56.372528388079616], [23.878263787539957, 56.273671373105259], [22.201156853939491, 56.337801825579483], [21.05580040862241, 56.031076361711051]]] } },
+            { "type": "Feature", "properties": { "admin": "Morocco", "name": "Morocco", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-5.193863491222031, 35.755182196590845], [-4.591006232105143, 35.330711981745644], [-3.640056525070007, 35.39985504815197], [-2.604305792644111, 35.17909332940112], [-2.169913702798624, 35.168396307916694], [-1.792985805661658, 34.527918606091298], [-1.73345455566141, 33.919712836232115], [-1.388049282222596, 32.864015000941372], [-1.124551153966195, 32.651521511357195], [-1.30789913573787, 32.262888902306024], [-2.616604783529567, 32.094346218386157], [-3.068980271812648, 31.724497992473285], [-3.647497931320145, 31.637294012980814], [-3.690441046554666, 30.896951605751152], [-4.859646165374442, 30.501187649043874], [-5.242129278982786, 30.00044302013557], [-6.060632290053745, 29.731699734001801], [-7.059227667661899, 29.57922842052465], [-8.67411617678283, 28.841288967396643], [-8.665589565454836, 27.656425889592462], [-8.817809007940523, 27.656425889592462], [-8.817828334986642, 27.656425889592462], [-8.794883999049032, 27.120696316022553], [-9.413037482124507, 27.088476060488539], [-9.735343390328749, 26.860944729107409], [-10.189424200877452, 26.860944729107409], [-10.551262579785258, 26.990807603456879], [-11.392554897496948, 26.883423977154386], [-11.718219773800339, 26.104091701760801], [-12.030758836301654, 26.030866197203121], [-12.500962693725368, 24.770116278578136], [-13.891110398809044, 23.691009019459383], [-14.22116777185715, 22.310163072188338], [-14.630832688850942, 21.860939846274867], [-14.750954555713404, 21.500600083903802], [-17.002961798561071, 21.42073415779668], [-17.020428432675768, 21.422310288981631], [-16.973247849993182, 21.88574453377495], [-16.589136928767626, 22.158234361250091], [-16.26192175949566, 22.679339504481273], [-16.326413946995896, 23.017768459560894], [-15.982610642958059, 23.723358466074096], [-15.426003790742183, 24.359133612561035], [-15.089331834360729, 24.520260728446964], [-14.824645148161689, 25.103532619725307], [-14.800925665739666, 25.636264960222285], [-14.439939947964827, 26.254418443297645], [-13.773804897506462, 26.618892320252279], [-13.13994177901429, 27.640147813420491], [-13.121613369914709, 27.654147671719805], [-12.61883663578311, 28.038185533148656], [-11.688919236690761, 28.148643907172577], [-10.9009569971044, 28.832142238880913], [-10.39959225100864, 29.09858592377778], [-9.564811163765624, 29.933573716749855], [-9.814718390329174, 31.177735500609053], [-9.434793260119362, 32.038096421836478], [-9.300692918321827, 32.564679266890629], [-8.657476365585039, 33.24024526624239], [-7.654178432638217, 33.697064927702506], [-6.912544114601358, 34.11047638603744], [-6.24434200685141, 35.145865383437517], [-5.929994269219832, 35.759988104793983], [-5.193863491222031, 35.755182196590845]]] } },
+            { "type": "Feature", "properties": { "admin": "Moldova", "name": "Moldova", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[26.619336785597788, 48.220726223333457], [26.857823520624798, 48.368210761094488], [27.52253746919515, 48.467119452501102], [28.259546746541837, 48.155562242213406], [28.670891147585163, 48.118148505234089], [29.122698195113024, 47.849095160506458], [29.050867954227321, 47.510226955752493], [29.415135125452732, 47.346645209332571], [29.559674106573105, 46.928582872091312], [29.908851759569295, 46.67436066343145], [29.838210076626289, 46.525325832701675], [30.024658644335364, 46.423936672545032], [29.759971958136383, 46.349987697935354], [29.170653924279879, 46.379262396828693], [29.072106967899288, 46.517677720722482], [28.862972446414055, 46.437889309263824], [28.933717482221621, 46.258830471372491], [28.659987420371575, 45.939986884131628], [28.48526940279276, 45.596907050145887], [28.233553501099035, 45.488283189468369], [28.054442986775392, 45.944586086605618], [28.160017937947707, 46.371562608417207], [28.128030226359037, 46.81047638608824], [27.551166212684841, 47.405117092470817], [27.233872918412736, 47.826770941756365], [26.924176059687561, 48.123264472030982], [26.619336785597788, 48.220726223333457]]] } },
+            { "type": "Feature", "properties": { "admin": "Madagascar", "name": "Madagascar", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[49.543518914595737, -12.469832858940553], [49.80898074727908, -12.895284925999551], [50.05651085795715, -13.555761407121981], [50.217431268114055, -14.758788750876795], [50.476536899625515, -15.226512139550541], [50.377111443895942, -15.706069431219122], [50.200274692593169, -16.000263360256763], [49.860605503138665, -15.414252618066913], [49.672606642460849, -15.710203545802477], [49.863344354050142, -16.451036879138773], [49.774564243372694, -16.875042006093597], [49.49861209493411, -17.10603565843827], [49.435618523970298, -17.953064060134363], [49.04179243347393, -19.118781019774442], [48.548540887247995, -20.496888116134119], [47.930749139198653, -22.391501153251077], [47.547723423051295, -23.781958916928513], [47.095761346226588, -24.941629733990446], [46.282477654817079, -25.178462823184102], [45.409507684110444, -25.601434421493082], [44.833573846217547, -25.346101169538933], [44.039720493349755, -24.9883452287823], [43.763768344911156, -24.460677178649988], [43.697777540874441, -23.574116306250595], [43.345654331237611, -22.77690398528387], [43.254187046080986, -22.057413018484116], [43.433297560404633, -21.336475111580185], [43.893682895692919, -21.163307386970121], [43.89637007017209, -20.830459486578167], [44.374325392439644, -20.072366224856385], [44.464397413924374, -19.435454196859045], [44.23242190936616, -18.961994724200899], [44.042976108584149, -18.331387220943167], [43.963084344260899, -17.409944756746778], [44.312468702986273, -16.850495700754951], [44.446517368351387, -16.216219170804504], [44.944936557806521, -16.179373874580396], [45.502731967964976, -15.974373467678538], [45.872993605336255, -15.793454278224681], [46.312243279817203, -15.780018405828795], [46.882182651564271, -15.210182386946309], [47.70512983581235, -14.594302666891762], [48.005214878131241, -14.091232598530372], [47.869047479042152, -13.663868503476582], [48.29382775248137, -13.784067884987483], [48.845060255738773, -13.08917489995866], [48.863508742066976, -12.487867933810417], [49.194651320193302, -12.040556735891967], [49.543518914595737, -12.469832858940553]]] } },
+            { "type": "Feature", "properties": { "admin": "Mexico", "name": "Mexico", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-97.140008307670684, 25.869997463478395], [-97.528072475966539, 24.992144069920297], [-97.702945522842214, 24.272343044526728], [-97.776041836319024, 22.932579860927653], [-97.872366706111094, 22.444211737553356], [-97.699043952204164, 21.898689480064256], [-97.388959520236739, 21.411018988525818], [-97.189333462293277, 20.635433254473124], [-96.525575527720306, 19.890930894444061], [-96.292127244841737, 19.32037140550954], [-95.90088497595994, 18.828024196848727], [-94.8390634834427, 18.562717393462204], [-94.425729539756205, 18.144370835843343], [-93.548651292682365, 18.423836981677933], [-92.786113857783477, 18.524838568592255], [-92.037348192090391, 18.704569200103432], [-91.407903408559235, 18.876083278880227], [-90.771869879910852, 19.284120388256778], [-90.533589850613026, 19.867418117751292], [-90.451475999701231, 20.707521877520428], [-90.278618333684889, 20.999855454995547], [-89.601321173851474, 21.261725775634485], [-88.543866339862845, 21.493675441976613], [-87.658416510757704, 21.458845526611977], [-87.051890224948053, 21.543543199138295], [-86.811982388032931, 21.331514797444747], [-86.845907965832595, 20.849864610268348], [-87.383291185235848, 20.255404771398727], [-87.621054450210721, 19.646553046135917], [-87.436750454441764, 19.472403469312265], [-87.586560431655911, 19.040130113190738], [-87.837191128271485, 18.259815985583426], [-88.090664028663156, 18.516647854074048], [-88.300031094093626, 18.499982204659997], [-88.490122850279278, 18.486830552641717], [-88.84834387892657, 17.883198147040329], [-89.029857347351737, 18.001511338772556], [-89.150909389995462, 17.955467637600403], [-89.143080410503316, 17.808318996649401], [-90.067933519230891, 17.819326076727517], [-91.001519945015943, 17.817594916245692], [-91.002269253284155, 17.254657701074272], [-91.453921271515114, 17.252177232324183], [-91.08167009150057, 16.918476670799517], [-90.711821865587623, 16.687483018454767], [-90.600846727240921, 16.470777899638787], [-90.438866950221993, 16.410109768128105], [-90.464472622422633, 16.069562079324722], [-91.747960171255926, 16.066564846251762], [-92.229248623406278, 15.251446641495871], [-92.087215949252013, 15.06458466232851], [-92.203229539747255, 14.830102850804108], [-92.227750006869812, 14.538828640190953], [-93.359463874061746, 15.61542959234367], [-93.875168830118511, 15.94016429286591], [-94.691656460330108, 16.20097524664288], [-95.250227016973014, 16.128318182840641], [-96.053382127653293, 15.752087917539592], [-96.557434048228274, 15.653515122942787], [-97.263592495496624, 15.917064927631312], [-98.013029954809596, 16.107311713113912], [-98.947675747456486, 16.566043402568763], [-99.697397427147024, 16.706164048728166], [-100.829498867581293, 17.171071071842047], [-101.666088629954444, 17.649026394109622], [-101.918528001700196, 17.916090196193974], [-102.478132086988907, 17.975750637275095], [-103.500989549558057, 18.292294623278845], [-103.917527432046811, 18.748571682200005], [-104.992009650475467, 19.316133938061679], [-105.493038499761411, 19.946767279535429], [-105.731396043707633, 20.434101874264108], [-105.397772996831321, 20.531718654863422], [-105.500660773524402, 20.816895046466122], [-105.27075232625792, 21.076284898355137], [-105.265817226974022, 21.422103583252348], [-105.603160976975374, 21.871145941652568], [-105.693413865973113, 22.269080308516148], [-106.028716396898943, 22.77375234627862], [-106.909980434988341, 23.767774359628895], [-107.91544877809136, 24.548915310152946], [-108.401904873470954, 25.172313951105931], [-109.260198737406625, 25.580609442644054], [-109.444089321717314, 25.824883938087673], [-109.291643846456267, 26.44293406829842], [-109.801457689231796, 26.676175645447923], [-110.391731737085692, 27.162114976504533], [-110.641018846461606, 27.859876003525521], [-111.178918830187826, 27.941240546169062], [-111.759606899851619, 28.467952582303944], [-112.228234626090369, 28.954408677683482], [-112.27182369672866, 29.266844387320074], [-112.80959448937395, 30.021113593052341], [-113.163810594518651, 30.786880804969424], [-113.148669399857141, 31.170965887978912], [-113.871881069781836, 31.56760834403519], [-114.205736660603506, 31.524045111613123], [-114.776451178835003, 31.79953217216114], [-114.936699795372121, 31.393484605427595], [-114.771231859173483, 30.91361725516526], [-114.673899298951739, 30.162681179315985], [-114.330974494262918, 29.750432440707407], [-113.588875088335413, 29.061611436473008], [-113.424053107540516, 28.826173610951223], [-113.271969367305502, 28.754782619739892], [-113.140039435664363, 28.411289374295954], [-112.962298346796473, 28.425190334582503], [-112.761587083774856, 27.78021678314752], [-112.457910529411635, 27.525813706974752], [-112.24495195193677, 27.171726792910754], [-111.616489020619184, 26.662817287700474], [-111.284674648872993, 25.732589830014426], [-110.987819383572386, 25.294606228124557], [-110.71000688357131, 24.826004340101854], [-110.655048997828871, 24.298594672131113], [-110.17285620811343, 24.265547593680417], [-109.771847093528521, 23.811182562754194], [-109.409104377055698, 23.364672349536242], [-109.433392300232896, 23.185587673428696], [-109.85421932660168, 22.818271592698061], [-110.031391974714424, 22.823077500901199], [-110.295070970483636, 23.430973212166684], [-110.949501309028022, 24.000964260345988], [-111.670568407012681, 24.484423122652508], [-112.182035895621468, 24.73841278736716], [-112.148988817170817, 25.470125230404044], [-112.300710822379671, 26.012004299416613], [-112.777296719191526, 26.321959540303162], [-113.464670783321907, 26.768185533143416], [-113.596729906043805, 26.639459540304465], [-113.848936733844241, 26.900063788352437], [-114.465746629680027, 27.142090358991361], [-115.055142178184965, 27.722726752222904], [-114.982252570437382, 27.798200181585109], [-114.570365566854917, 27.741485297144884], [-114.199328782999231, 28.115002549750553], [-114.162018398884612, 28.566111965442296], [-114.931842210736605, 29.279479275015483], [-115.518653937626965, 29.556361599235395], [-115.887365282029563, 30.180793768834171], [-116.2583503894529, 30.836464341753572], [-116.721526252084956, 31.635743720012037], [-117.127759999999839, 32.53534], [-115.99135, 32.612390000000111], [-114.72139, 32.72083], [-114.815, 32.52528], [-113.30498, 32.03914], [-111.02361, 31.33472], [-109.035, 31.341940000000129], [-108.24194, 31.34222], [-108.24, 31.754853718166366], [-106.507589999999851, 31.75452], [-106.1429, 31.39995], [-105.63159, 31.08383], [-105.03737, 30.64402], [-104.70575, 30.12173], [-104.456969999999885, 29.57196], [-103.94, 29.27], [-103.11, 28.97], [-102.48, 29.76], [-101.6624, 29.7793], [-100.9576, 29.380710000000125], [-100.45584, 28.696120000000118], [-100.11, 28.11000000000012], [-99.52, 27.54], [-99.3, 26.84], [-99.019999999999897, 26.37], [-98.24, 26.06], [-97.529999999999887, 25.84], [-97.140008307670684, 25.869997463478395]]] } },
+            { "type": "Feature", "properties": { "admin": "Macedonia", "name": "Macedonia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.59023, 41.85541], [20.717310000000108, 41.84711], [20.76216, 42.05186], [21.352700000000134, 42.2068], [21.576635989402117, 42.245224397061847], [21.917080000000105, 42.30364], [22.380525750424674, 42.320259507815074], [22.881373732197339, 41.999297186850349], [22.952377150166505, 41.337993882811176], [22.76177, 41.3048], [22.597308383889008, 41.130487168943198], [22.055377638444266, 41.149865831052686], [21.674160597426969, 40.93127452245794], [21.020040317476397, 40.842726955725873], [20.60518, 41.08622], [20.46315, 41.51509], [20.59023, 41.85541]]] } },
+            { "type": "Feature", "properties": { "admin": "Mali", "name": "Mali", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-12.170750291380299, 14.616834214735503], [-11.834207526079465, 14.799096991428936], [-11.666078253617853, 15.388208319556295], [-11.349095017939502, 15.411256008358475], [-10.650791388379414, 15.132745876521422], [-10.086846482778212, 15.330485744686269], [-9.700255092802703, 15.264107367407359], [-9.550238409859388, 15.486496893775435], [-5.537744309908446, 15.501689764869253], [-5.315277268891931, 16.201853745991837], [-5.488522508150438, 16.325102037007962], [-5.971128709324247, 20.640833441647626], [-6.453786586930334, 24.956590684503418], [-4.92333736817423, 24.974574082940993], [-1.550054897457613, 22.792665920497377], [1.823227573259032, 20.61080943448604], [2.060990838233919, 20.142233384679482], [2.683588494486428, 19.856230170160114], [3.146661004253899, 19.693578599521441], [3.158133172222704, 19.057364203360034], [4.267419467800038, 19.155265204336995], [4.270209995143801, 16.852227484601212], [3.723421665063482, 16.184283759012612], [3.638258904646476, 15.568119818580453], [2.749992709981483, 15.409524847876693], [1.385528191746857, 15.323561102759168], [1.01578331869851, 14.968182277887944], [0.374892205414682, 14.928908189346128], [-0.26625729003058, 14.924308986872147], [-0.515854458000348, 15.116157741755725], [-1.066363491205663, 14.973815009007764], [-2.001035122068771, 14.559008287000887], [-2.191824510090384, 14.246417548067352], [-2.967694464520576, 13.798150336151506], [-3.103706834312759, 13.54126679122859], [-3.52280270019986, 13.337661647998612], [-4.006390753587225, 13.472485459848112], [-4.280405035814879, 13.228443508349738], [-4.427166103523802, 12.542645575404292], [-5.220941941743119, 11.713858954307224], [-5.197842576508648, 11.375145778850136], [-5.470564947929004, 10.951269842976044], [-5.404341599946973, 10.370736802609144], [-5.816926235365286, 10.222554633012191], [-6.050452032892266, 10.096360785355442], [-6.205222947606429, 10.524060777219132], [-6.493965013037267, 10.411302801958268], [-6.666460944027547, 10.430810655148447], [-6.850506557635057, 10.138993841996237], [-7.622759161804808, 10.147236232946792], [-7.89958980959237, 10.297382106970824], [-8.029943610048617, 10.206534939001711], [-8.335377163109738, 10.494811916541932], [-8.282357143578279, 10.792597357623842], [-8.407310756860026, 10.90925690352276], [-8.620321010767126, 10.810890814655181], [-8.581305304386772, 11.136245632364801], [-8.376304897484911, 11.393645941610627], [-8.786099005559462, 11.812560939984705], [-8.905264858424529, 12.088358059126433], [-9.127473517279581, 12.308060411015331], [-9.327616339546008, 12.334286200403451], [-9.567911749703212, 12.194243068892472], [-9.890992804392011, 12.060478623904968], [-10.165213792348835, 11.844083563682743], [-10.593223842806278, 11.923975328005977], [-10.870829637078211, 12.177887478072106], [-11.036555955438256, 12.211244615116513], [-11.297573614944508, 12.077971096235768], [-11.456168585648269, 12.076834214725336], [-11.513942836950587, 12.442987575729415], [-11.467899135778522, 12.754518947800973], [-11.553397793005427, 13.141213690641063], [-11.927716030311613, 13.422075100147392], [-12.124887457721256, 13.994727484589784], [-12.170750291380299, 14.616834214735503]]] } },
+            { "type": "Feature", "properties": { "admin": "Myanmar", "name": "Myanmar", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[99.543309360759281, 20.186597601802056], [98.959675734454848, 19.752980658440944], [98.253723992915582, 19.708203029860041], [97.797782830804394, 18.627080389881751], [97.375896437573516, 18.445437730375811], [97.859122755934848, 17.567946071843657], [98.493761020911322, 16.837835598207928], [98.90334842325673, 16.177824204976115], [98.537375929765687, 15.308497422746081], [98.192074009191373, 15.123702500870349], [98.430819126379859, 14.622027696180831], [99.097755161538728, 13.827502549693275], [99.212011753336071, 13.269293728076462], [99.196353794351637, 12.804748439988666], [99.587286004639694, 11.892762762901695], [99.038120558673953, 10.960545762572435], [98.553550653073017, 9.932959906448543], [98.457174106848697, 10.675266018105146], [98.764545526120756, 11.441291612183745], [98.428338657629823, 12.032986761925681], [98.509574009192661, 13.122377631070675], [98.103603957107666, 13.64045970301285], [97.777732375075161, 14.837285874892638], [97.597071567782749, 16.100567938699765], [97.164539829499773, 16.928734442609336], [96.505768670642965, 16.427240505432845], [95.369352248112378, 15.714389960182599], [94.808404575584092, 15.803454291237637], [94.188804152404515, 16.037936102762014], [94.533485955791321, 17.277240301985724], [94.324816522196741, 18.213513902249893], [93.540988397193615, 19.366492621330021], [93.663254835996199, 19.726961574781992], [93.078277622452163, 19.855144965081973], [92.368553501355606, 20.670883287025344], [92.30323449093865, 21.475485337809815], [92.652257114637976, 21.324047552978481], [92.672720981825549, 22.041238918541247], [93.166127557348361, 22.278459580977099], [93.060294224014598, 22.703110663335565], [93.286326938859247, 23.043658352138998], [93.325187615942767, 24.078556423432197], [94.106741977925054, 23.850740871673477], [94.552657912171611, 24.675238348890328], [94.603249139385355, 25.162495428970399], [95.155153436262566, 26.001307277932078], [95.124767694074933, 26.573572089132295], [96.419365675850941, 27.264589341739221], [97.133999058015277, 27.08377350514996], [97.051988559968066, 27.699058946233144], [97.402561476636123, 27.88253611908544], [97.327113885490007, 28.261582749946331], [97.91198774616943, 28.335945136014338], [98.24623091023328, 27.747221381129172], [98.682690057370451, 27.508812160750612], [98.712093947344499, 26.74353587494026], [98.671838006589127, 25.918702500913518], [97.724609002679117, 25.083637193292994], [97.604719679761956, 23.897404690033039], [98.660262485755737, 24.063286037689959], [98.898749220782747, 23.142722072842524], [99.531992222087382, 22.949038804612574], [99.240898878987224, 22.118314317304577], [99.983489211021464, 21.742936713136398], [100.416537713627349, 21.558839423096607], [101.150032993578222, 21.849984442629015], [101.180005324307515, 21.436572984294024], [100.329101190189519, 20.786121731036229], [100.115987583417819, 20.41784963630818], [99.543309360759281, 20.186597601802056]]] } },
+            { "type": "Feature", "properties": { "admin": "Montenegro", "name": "Montenegro", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[19.801613396898681, 42.500093492190835], [19.738051385179627, 42.688247382165564], [19.30449, 42.19574], [19.371770000000136, 41.87755], [19.16246, 41.95502], [18.88214, 42.28151], [18.45, 42.48], [18.56, 42.65], [18.70648, 43.20011], [19.03165, 43.43253], [19.21852, 43.52384], [19.48389, 43.35229], [19.63, 43.213779970270522], [19.95857, 43.10604], [20.3398, 42.89852], [20.25758, 42.81275], [20.0707, 42.58863], [19.801613396898681, 42.500093492190835]]] } },
+            { "type": "Feature", "properties": { "admin": "Mongolia", "name": "Mongolia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[87.751264276076697, 49.297197984405479], [88.805566847695488, 49.470520738312409], [90.713667433640666, 50.331811835321076], [92.234711541719662, 50.802170722041716], [93.104219191462661, 50.495290228876414], [94.147566359435615, 50.480536607457083], [94.815949334698701, 50.013433335970838], [95.814027947983973, 49.977466539095708], [97.259727817781396, 49.726060695995727], [98.231761509191543, 50.422400621128737], [97.825739780674283, 51.010995184933165], [98.861490513100307, 52.047366034546684], [99.981732212323507, 51.634006252643978], [100.889480421962588, 51.516855780638316], [102.065222609467298, 51.25992055928311], [102.255908644624299, 50.510560614618669], [103.676545444760194, 50.089966132195109], [104.621552362081687, 50.275329494826067], [105.886591424586726, 50.406019192092209], [106.888804152455336, 50.274295966180219], [107.868175897250936, 49.793705145865808], [108.475167270951275, 49.282547715850725], [109.402449171996636, 49.292960516957535], [110.662010532678764, 49.130128078805861], [111.581230910286607, 49.377968248077678], [112.897739699354361, 49.543565375356984], [114.362456496235239, 50.248302720737399], [114.962109816550154, 50.140247300815112], [115.485695428531386, 49.805177313834591], [116.678800897286152, 49.888531399121376], [116.191802199367544, 49.134598090199091], [115.485282017073018, 48.135382595403428], [115.742837355615748, 47.726544501326273], [116.308952671373206, 47.853410142602826], [117.295507440257396, 47.69770905210742], [118.064142694166691, 48.066730455103674], [118.866574334794933, 47.747060044946153], [119.772823927897477, 47.048058783550125], [119.66326989143873, 46.692679958678909], [118.874325799638711, 46.805412095723646], [117.421701287914175, 46.672732855814253], [116.717868280098841, 46.388202419615205], [115.985096470200062, 45.727235012385989], [114.46033165899604, 45.339816799493811], [113.463906691544139, 44.808893134127111], [112.436062453258785, 45.011645616224278], [111.873306105600278, 45.102079372735055], [111.348376906379428, 44.457441718110083], [111.667737257943202, 44.073175767587706], [111.829587843881342, 43.743118394539515], [111.129682244920218, 43.406834011400136], [110.412103306115256, 42.871233628911014], [109.243595819131428, 42.519446316084093], [107.744772576937933, 42.481515814781865], [106.129315627061658, 42.134327704428898], [104.964993931093446, 41.597409572916334], [104.522281935648977, 41.908346666016541], [103.312278273534787, 41.907468166667591], [101.833040399179922, 42.51487295182627], [100.845865513108237, 42.663804429691439], [99.515817498780009, 42.524691473961717], [97.451757440177985, 42.748889675460013], [96.349395786527793, 42.725635280928678], [95.762454868556674, 43.319449164394598], [95.306875441471504, 44.241330878265458], [94.688928664125299, 44.352331854828414], [93.480733677141274, 44.975472113619951], [92.133890822318193, 45.115075995456444], [90.945539585334288, 45.286073309910265], [90.585768263718265, 45.719716091487513], [90.970809360724985, 46.888146063822923], [90.280825636763893, 47.693549099307923], [88.854297723346733, 48.06908173277295], [88.013832228551721, 48.599462795600601], [87.751264276076697, 49.297197984405479]]] } },
+            { "type": "Feature", "properties": { "admin": "Mozambique", "name": "Mozambique", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.559989047999345, -11.520020033415923], [35.312397902169032, -11.439146416879145], [36.514081658684248, -11.720938002166733], [36.775150994622791, -11.594537448780804], [37.471284214026596, -11.568750909067157], [37.827644891111383, -11.268769219612834], [38.427556593587745, -11.285202325081654], [39.521029900883768, -10.896853936408224], [40.316588576017182, -10.317096042525696], [40.478387485523022, -10.765440769089992], [40.437253045418672, -11.761710707245014], [40.560811395028558, -12.639176527561023], [40.599620395679743, -14.201975192931858], [40.775475294768988, -14.691764418194239], [40.477250604012596, -15.406294447493968], [40.089263950365208, -16.100774021064456], [39.452558628097044, -16.720891208566936], [38.53835086442151, -17.101023044505954], [37.411132846838875, -17.586368096591233], [36.281279331209348, -18.659687595293445], [35.896496616364054, -18.842260430580634], [35.198399692533137, -19.552811374593887], [34.786383497870041, -19.784011732667732], [34.701892531072836, -20.497043145431007], [35.176127150215358, -21.254361260668407], [35.373427768705731, -21.840837090748874], [35.385848253705397, -22.14], [35.562545536369079, -22.09], [35.533934767404297, -23.070787855727751], [35.371774122872374, -23.535358982031692], [35.607470330555621, -23.706563002214676], [35.458745558419615, -24.122609958596545], [35.040734897610655, -24.478350518493798], [34.215824008935463, -24.816314385682652], [33.013210076639005, -25.357573337507731], [32.574632195777859, -25.727318210556088], [32.660363396950082, -26.148584486599443], [32.915955031065685, -26.215867201443459], [32.830120477028878, -26.74219166433619], [32.071665480281062, -26.733820082304902], [31.985779249811962, -26.29177988048022], [31.837777947728057, -25.843331801051342], [31.752408481581874, -25.484283949487406], [31.930588820124242, -24.369416599222532], [31.670397983534645, -23.658969008073861], [31.191409132621278, -22.251509698172395], [32.244988234188007, -21.116488539313689], [32.508693068173436, -20.395292250248303], [32.659743279762573, -20.30429005298231], [32.772707960752619, -19.715592136313294], [32.611994256324884, -19.419382826416268], [32.654885695127142, -18.672089939043492], [32.849860874164385, -17.979057305577175], [32.847638787575839, -16.713398125884613], [32.328238966610222, -16.392074069893749], [31.852040643040592, -16.319417006091374], [31.636498243951188, -16.071990248277881], [31.173063999157673, -15.860943698797868], [30.338954705534537, -15.880839125230242], [30.274255812305103, -15.507786960515208], [30.179481235481827, -14.796099134991525], [33.214024692525207, -13.97186003993615], [33.789700148256678, -14.451830743063068], [34.064825473778619, -14.359950046448118], [34.459633416488536, -14.613009535381421], [34.517666049952304, -15.013708591372609], [34.307291294092089, -15.478641452702592], [34.381291945134045, -16.183559665596039], [35.033810255683527, -16.801299737213089], [35.339062941231639, -16.107440280830108], [35.771904738108347, -15.896858819240721], [35.686845330555926, -14.611045830954328], [35.267956170398001, -13.887834161029563], [34.907151320136158, -13.565424899960565], [34.559989047999345, -13.579997653866872], [34.280006137841973, -12.280025323132504], [34.559989047999345, -11.520020033415923]]] } },
+            { "type": "Feature", "properties": { "admin": "Mauritania", "name": "Mauritania", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-12.170750291380299, 14.616834214735503], [-12.830658331747513, 15.303691514542942], [-13.43573767745306, 16.039383042866188], [-14.099521450242175, 16.304302273010489], [-14.577347581428977, 16.598263658102805], [-15.135737270558813, 16.587282416240779], [-15.623666144258689, 16.369337063049809], [-16.120690070041928, 16.45566254319338], [-16.463098110407881, 16.135036119038457], [-16.549707810929061, 16.673892116761959], [-16.270551723688353, 17.166962795474866], [-16.146347418674846, 18.108481553616652], [-16.256883307347163, 19.096715806550304], [-16.377651129613266, 19.593817246981981], [-16.277838100641514, 20.092520656814695], [-16.536323614965465, 20.567866319251486], [-17.063423224342568, 20.99975210213082], [-16.845193650773989, 21.333323472574875], [-12.929101935263528, 21.327070624267559], [-13.118754441774708, 22.771220201096249], [-12.874221564169574, 23.284832261645171], [-11.93722449385332, 23.374594224536164], [-11.969418911171159, 25.933352769468261], [-8.687293667017398, 25.881056219988899], [-8.684399786809051, 27.395744126895998], [-4.92333736817423, 24.974574082940993], [-6.453786586930334, 24.956590684503418], [-5.971128709324247, 20.640833441647626], [-5.488522508150438, 16.325102037007962], [-5.315277268891931, 16.201853745991837], [-5.537744309908446, 15.501689764869253], [-9.550238409859388, 15.486496893775435], [-9.700255092802703, 15.264107367407359], [-10.086846482778212, 15.330485744686269], [-10.650791388379414, 15.132745876521422], [-11.349095017939502, 15.411256008358475], [-11.666078253617853, 15.388208319556295], [-11.834207526079465, 14.799096991428936], [-12.170750291380299, 14.616834214735503]]] } },
+            { "type": "Feature", "properties": { "admin": "Malawi", "name": "Malawi", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.559989047999345, -11.520020033415923], [34.280006137841973, -12.280025323132504], [34.559989047999345, -13.579997653866872], [34.907151320136158, -13.565424899960565], [35.267956170398001, -13.887834161029563], [35.686845330555926, -14.611045830954328], [35.771904738108347, -15.896858819240721], [35.339062941231639, -16.107440280830108], [35.033810255683527, -16.801299737213089], [34.381291945134045, -16.183559665596039], [34.307291294092089, -15.478641452702592], [34.517666049952304, -15.013708591372609], [34.459633416488536, -14.613009535381421], [34.064825473778619, -14.359950046448118], [33.789700148256678, -14.451830743063068], [33.214024692525207, -13.97186003993615], [32.688165317523122, -13.712857761289273], [32.991764357237876, -12.783870537978272], [33.306422153463068, -12.435778090060214], [33.114289178201908, -11.607198174692311], [33.315310499817279, -10.796549981329695], [33.485687697083584, -10.525558770391111], [33.231387973775291, -9.676721693564799], [32.759375441221316, -9.230599053589058], [33.739729038230443, -9.417150974162722], [33.940837724096532, -9.693673841980292], [34.280006137841973, -10.159999688358402], [34.559989047999345, -11.520020033415923]]] } },
+            { "type": "Feature", "properties": { "admin": "Malaysia", "name": "Malaysia", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[101.075515578213299, 6.204867051615891], [101.154218784593809, 5.691384182147713], [101.814281854258013, 5.810808417174228], [102.141186964936423, 6.221636053894655], [102.371147088635212, 6.12820506431096], [102.961705356866673, 5.524495144061077], [103.381214634212142, 4.855001125503746], [103.438575474056165, 4.181605536308381], [103.332122023534851, 3.72669790284297], [103.42942874554052, 3.382868760589019], [103.502447544368877, 2.791018581550204], [103.854674106870334, 2.515454006353763], [104.247931756611479, 1.631141058759055], [104.228811476663523, 1.293048000489534], [103.519707472754433, 1.226333726400682], [102.573615350354771, 1.967115383304744], [101.39063846232915, 2.760813706875623], [101.273539666755838, 3.27029165284118], [100.69543541870668, 3.939139715994869], [100.557407668055092, 4.767280381688279], [100.19670617065772, 5.312492580583678], [100.306260207116509, 6.040561835143875], [100.085756870527078, 6.46448944745029], [100.259596388756918, 6.64282481528957], [101.075515578213299, 6.204867051615891]]], [[[118.618320754064825, 4.47820241944754], [117.882034946770162, 4.137551377779487], [117.01521447150634, 4.306094061699468], [115.86551720587677, 4.306559149590156], [115.51907840379198, 3.169238389494395], [115.134037306785231, 2.821481838386219], [114.621355422017473, 1.430688177898886], [113.805849644019531, 1.217548732911041], [112.859809198052176, 1.497790025229946], [112.380251906383648, 1.410120957846757], [111.797548455860408, 0.904441229654651], [111.159137811326559, 0.976478176269509], [110.514060907027101, 0.773131415200993], [109.830226678508836, 1.338135687664191], [109.663260125773718, 2.006466986494984], [110.396135288537039, 1.663774725751395], [111.168852980597478, 1.850636704918784], [111.370081007942076, 2.697303371588872], [111.796928338672842, 2.885896511238073], [112.995614862115247, 3.102394924324869], [113.712935418758718, 3.893509426281127], [114.204016554828399, 4.525873928236819], [114.659595981913526, 4.00763682699781], [114.869557326315373, 4.348313706881952], [115.347460972150671, 4.316636053887009], [115.405700311343594, 4.955227565933824], [115.450710483869798, 5.447729803891561], [116.220741001450961, 6.143191229675621], [116.725102980619752, 6.924771429873998], [117.129626092600461, 6.928052883324566], [117.643393182446303, 6.422166449403305], [117.689075148592337, 5.98749013918018], [118.347691278152197, 5.708695786965462], [119.181903924639926, 5.407835598162249], [119.110693800941718, 5.016128241389864], [118.439727004064082, 4.966518866389619], [118.618320754064825, 4.47820241944754]]]] } },
+            { "type": "Feature", "properties": { "admin": "Namibia", "name": "Namibia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[16.344976840895239, -28.576705010697697], [15.601818068105812, -27.821247247022797], [15.210472446359457, -27.09095590587404], [14.989710727608548, -26.117371921495153], [14.74321414557633, -25.392920017195376], [14.40814415859583, -23.85301401132984], [14.385716586981145, -22.656652927340687], [14.257714064194172, -22.111208184499951], [13.868642205468657, -21.699036960539974], [13.352497999737437, -20.872834161057497], [12.82684533046449, -19.673165785401661], [12.608564080463617, -19.045348809487695], [11.794918654028063, -18.069129327061912], [11.734198846085118, -17.30188933682447], [12.215461460019352, -17.11166838955808], [12.814081251688405, -16.941342868724067], [13.462362094789963, -16.971211846588769], [14.058501417709007, -17.42338062914266], [14.209706658595021, -17.353100681225715], [18.26330936043416, -17.309950860262003], [18.956186964603599, -17.789094740472255], [21.377176141045563, -17.930636488519688], [23.215048455506057, -17.52311614346598], [24.033861525170771, -17.29584319424632], [24.6823490740015, -17.35341073981947], [25.076950310982255, -17.578823337476617], [25.084443393664564, -17.661815687737366], [24.520705193792534, -17.887124932529932], [24.217364536239209, -17.889347019118485], [23.579005568137713, -18.281261081620055], [23.196858351339298, -17.869038181227783], [21.655040317478971, -18.219146010005222], [20.910641310314531, -18.252218926672018], [20.881134067475866, -21.814327080983144], [19.895457797940672, -21.849156996347865], [19.895767856534427, -24.767790215760588], [19.89473432788861, -28.461104831660769], [19.002127312911082, -28.972443129188857], [18.464899122804745, -29.045461928017271], [17.836151971109526, -28.856377862261311], [17.387497185951499, -28.783514092729774], [17.218928663815401, -28.355943291946804], [16.824017368240899, -28.082161553664466], [16.344976840895239, -28.576705010697697]]] } },
+            { "type": "Feature", "properties": { "admin": "New Caledonia", "name": "New Caledonia", "continent": "Oceania" }, "geometry": { "type": "Polygon", "coordinates": [[[165.779989862326346, -21.080004978115621], [166.599991489933814, -21.700018812753523], [167.120011428086883, -22.159990736583488], [166.74003462144475, -22.399976088146943], [166.189732293968632, -22.129708347260447], [165.474375441752159, -21.679606621998229], [164.829815301775653, -21.149819838141948], [164.16799523341362, -20.444746595951624], [164.029605747735957, -20.105645847252347], [164.459967075862664, -20.120011895429492], [165.020036249041993, -20.459991143477726], [165.460009393575064, -20.800022067958253], [165.779989862326346, -21.080004978115621]]] } },
+            { "type": "Feature", "properties": { "admin": "Niger", "name": "Niger", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[2.154473504249949, 11.940150051313422], [2.177107781593917, 12.625017808477534], [1.024103224297619, 12.851825669806598], [0.993045688490156, 13.335749620003865], [0.429927605805517, 13.988733018443893], [0.295646396495215, 14.444234930880663], [0.374892205414767, 14.928908189346144], [1.015783318698481, 14.968182277887989], [1.385528191746971, 15.323561102759237], [2.74999270998154, 15.409524847876751], [3.63825890464659, 15.56811981858044], [3.723421665063596, 16.184283759012654], [4.270209995143886, 16.852227484601311], [4.267419467800095, 19.155265204337123], [5.677565952180712, 19.601206976799794], [8.572893100629868, 21.565660712159225], [11.999505649471697, 23.471668402596432], [13.581424594790459, 23.040506089769274], [14.143870883855239, 22.491288967371126], [14.8513, 22.862950000000119], [15.096887648181847, 21.308518785074902], [15.471076694407314, 21.048457139565979], [15.487148064850143, 20.730414537025634], [15.90324669766431, 20.387618923417499], [15.68574059414777, 19.957180080642384], [15.300441114979716, 17.927949937405], [15.247731154041842, 16.627305813050778], [13.972201775781681, 15.684365953021139], [13.540393507550785, 14.36713369390122], [13.956698846094124, 13.996691189016925], [13.954476759505607, 13.353448798063765], [14.595781284247604, 13.330426947477859], [14.495787387762899, 12.859396267137353], [14.213530714584746, 12.80203542729333], [14.181336297266906, 12.483656927943169], [13.995352817448289, 12.4615652531383], [13.318701613018558, 13.55635630945795], [13.083987257548809, 13.596147162322492], [12.302071160540546, 13.037189032437535], [11.527803175511504, 13.328980007373556], [10.989593133191532, 13.387322699431191], [10.701031935273816, 13.246917832894038], [10.114814487354748, 13.277251898649464], [9.524928012743088, 12.85110219975456], [9.014933302454436, 12.826659247280414], [7.804671258178869, 13.343526923063731], [7.330746697630046, 13.098038031461213], [6.82044192874781, 13.115091254117598], [6.445426059605721, 13.492768459522718], [5.443058302440135, 13.865923977102225], [4.368343540066006, 13.747481594289408], [4.107945997747378, 13.531215725147941], [3.967282749048933, 12.956108710171574], [3.680633579125924, 12.552903347214167], [3.611180454125587, 11.660167141155965], [2.848643019226585, 12.235635891158207], [2.490163608418015, 12.233052069543588], [2.154473504249949, 11.940150051313422]]] } },
+            { "type": "Feature", "properties": { "admin": "Nigeria", "name": "Nigeria", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[8.500287713259693, 4.771982937026847], [7.462108188515939, 4.41210826254624], [7.082596469764438, 4.464689032403228], [6.698072137080598, 4.240594183769516], [5.898172641634686, 4.262453314628984], [5.362804803090881, 4.887970689305957], [5.033574252959368, 5.611802476418233], [4.325607130560683, 6.270651149923466], [3.574180128604552, 6.258300482605717], [2.691701694356254, 6.258817246928628], [2.74906253420022, 7.870734361192886], [2.723792758809509, 8.506845404489708], [2.912308383810255, 9.13760793704432], [3.220351596702101, 9.4441525333997], [3.705438266625918, 10.063210354040207], [3.600070021182801, 10.332186184119406], [3.797112257511713, 10.734745591673104], [3.572216424177469, 11.327939357951516], [3.611180454125558, 11.660167141155966], [3.68063357912581, 12.552903347214222], [3.967282749048848, 12.956108710171572], [4.107945997747321, 13.531215725147829], [4.368343540066063, 13.747481594289324], [5.443058302440163, 13.865923977102295], [6.445426059605636, 13.492768459522676], [6.820441928747753, 13.115091254117514], [7.330746697630017, 13.098038031461199], [7.804671258178784, 13.343526923063745], [9.014933302454462, 12.826659247280427], [9.524928012742945, 12.851102199754477], [10.114814487354689, 13.277251898649409], [10.701031935273702, 13.246917832894081], [10.989593133191532, 13.387322699431108], [11.527803175511393, 13.328980007373584], [12.302071160540521, 13.037189032437521], [13.083987257548866, 13.596147162322563], [13.318701613018558, 13.556356309457824], [13.995352817448346, 12.461565253138343], [14.181336297266792, 12.483656927943112], [14.57717776862253, 12.085360826053501], [14.468192172918974, 11.90475169519341], [14.415378859116682, 11.572368882692071], [13.572949659894558, 10.798565985553564], [13.308676385153914, 10.160362046748926], [13.1675997249971, 9.64062632897341], [12.955467970438971, 9.417771714714702], [12.753671502339214, 8.717762762888993], [12.218872104550597, 8.305824082874322], [12.063946160539556, 7.799808457872301], [11.839308709366801, 7.397042344589434], [11.745774366918509, 6.981382961449753], [11.058787876030349, 6.644426784690593], [10.497375115611417, 7.055357774275562], [10.118276808318255, 7.038769639509879], [9.522705926154398, 6.453482367372116], [9.233162876023043, 6.444490668153334], [8.757532993208626, 5.47966583904791], [8.500287713259693, 4.771982937026847]]] } },
+            { "type": "Feature", "properties": { "admin": "Nicaragua", "name": "Nicaragua", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-85.712540452807289, 11.088444932494822], [-86.058488328785245, 11.40343862552994], [-86.525849982432931, 11.806876532432593], [-86.7459915839963, 12.143961900272483], [-87.167516242201131, 12.458257961471656], [-87.668493415054698, 12.909909979702629], [-87.557466600275603, 13.064551703336061], [-87.392386237319201, 12.914018256069836], [-87.316654425795463, 12.984685777228972], [-87.005769009127562, 13.025794379117157], [-86.880557013684339, 13.254204209847241], [-86.733821784191576, 13.263092556201441], [-86.755086636079696, 13.754845485890909], [-86.520708177419877, 13.778487453664436], [-86.312142096689911, 13.771356106008167], [-86.096263800790581, 14.038187364147245], [-85.801294725268576, 13.836054999237586], [-85.698665330736901, 13.960078436738083], [-85.514413011400222, 14.079011745657834], [-85.165364549484792, 14.354369615125076], [-85.148750576502948, 14.560196844943615], [-85.052787441736925, 14.551541042534719], [-84.924500698572388, 14.790492865452348], [-84.820036790694346, 14.819586696832669], [-84.649582078779602, 14.66680532476175], [-84.449335903648588, 14.621614284722494], [-84.228341640952394, 14.748764146376654], [-83.975721401693576, 14.749435939996458], [-83.628584967772895, 14.880073960830298], [-83.489988776366104, 15.016267198135534], [-83.147219000974104, 14.995829169164109], [-83.233234422523907, 14.8998660343981], [-83.28416154654758, 14.676623846897197], [-83.182126430987267, 14.310703029838447], [-83.412499966144424, 13.970077826386554], [-83.519831916014667, 13.56769928634588], [-83.55220720084553, 13.127054348193084], [-83.498515387694255, 12.869292303921226], [-83.473323126951968, 12.419087225794424], [-83.626104499022887, 12.320850328007563], [-83.719613003255034, 11.893124497927724], [-83.650857510090702, 11.629032090700116], [-83.855470343750369, 11.373311265503785], [-83.808935716471538, 11.103043524617274], [-83.655611741861563, 10.938764146361418], [-83.895054490885926, 10.726839097532444], [-84.190178595704822, 10.793450018756671], [-84.355930752281026, 10.999225572142901], [-84.673069017256239, 11.082657172078139], [-84.903003302738924, 10.952303371621895], [-85.561851976244171, 11.217119248901593], [-85.712540452807289, 11.088444932494822]]] } },
+            { "type": "Feature", "properties": { "admin": "Netherlands", "name": "Netherlands", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[6.074182570020922, 53.51040334737813], [6.905139601274128, 53.482162177130633], [7.092053256873895, 53.14404328064488], [6.842869500362381, 52.228440253297542], [6.589396599970825, 51.85202912048338], [5.988658074577812, 51.85161570902504], [6.156658155958779, 50.803721015010574], [5.60697594567, 51.037298488969768], [4.973991326526913, 51.475023708698124], [4.047071160507527, 51.267258612668556], [3.314971144228536, 51.345755113319903], [3.830288527043137, 51.620544542031936], [4.705997348661184, 53.091798407597757], [6.074182570020922, 53.51040334737813]]] } },
+            { "type": "Feature", "properties": { "admin": "Norway", "name": "Norway", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[28.165547316202911, 71.185474351680497], [31.293418409965472, 70.453787746859902], [30.005435011522785, 70.186258856884876], [31.101078728975118, 69.558080145944857], [29.399580519332879, 69.156916002063056], [28.591929559043187, 69.064776923286686], [29.015572950971968, 69.76649119737796], [27.732292107867885, 70.164193020296281], [26.179622023226298, 69.825298977326142], [25.689212680776389, 69.092113755968995], [24.735679152126714, 68.649556789821432], [23.662049594830759, 68.891247463650515], [22.356237827247405, 68.841741441514941], [21.244936150810723, 69.370443020293109], [20.645592889089581, 69.106247260200846], [20.02526899585791, 69.065138658312705], [19.878559604581248, 68.407194322372604], [17.993868442464386, 68.567391262477329], [17.729181756265344, 68.01055186631622], [16.768878614985535, 68.013936672631374], [16.108712192456832, 67.302455552836889], [15.108411492583055, 66.193866889095418], [13.555689731509087, 64.787027696381458], [13.919905226302202, 64.445420640716108], [13.571916131248766, 64.049114081469654], [12.57993533697393, 64.066218980558332], [11.930569288794228, 63.128317572676977], [11.992064243221531, 61.800362453856557], [12.63114668137524, 61.293571682370079], [12.300365838274896, 60.117932847730046], [11.468271925511173, 59.432393296945989], [11.027368605196925, 58.856149400459394], [10.356556837616095, 59.469807033925363], [8.382000359743641, 58.313288479233265], [7.048748406613297, 58.078884182357271], [5.665835402050418, 58.588155422593658], [5.308234490590733, 59.663231919993805], [4.992078077829005, 61.97099803328426], [5.912900424837885, 62.614472968182682], [8.553411085655766, 63.454008287196459], [10.527709181366784, 64.486038316497471], [12.358346795306371, 65.879725857193151], [14.7611458675816, 67.810641587995121], [16.435927361728968, 68.563205471461671], [19.184028354578512, 69.817444159617807], [21.378416375420606, 70.255169379346043], [23.02374230316158, 70.202071845166259], [24.546543409938515, 71.030496731237221], [26.370049676221807, 70.986261705195361], [28.165547316202911, 71.185474351680497]]], [[[24.72412, 77.85385], [22.49032, 77.44493], [20.72601, 77.67704], [21.41611, 77.93504], [20.8119, 78.25463], [22.88426, 78.45494], [23.28134, 78.07954], [24.72412, 77.85385]]], [[[18.25183, 79.70175], [21.54383, 78.95611], [19.02737, 78.5626], [18.47172, 77.82669], [17.59441, 77.63796], [17.1182, 76.80941], [15.91315, 76.77045], [13.76259, 77.38035], [14.66956, 77.73565], [13.1706, 78.02493], [11.22231, 78.8693], [10.44453, 79.65239], [13.17077, 80.01046], [13.71852, 79.66039], [15.14282, 79.67431], [15.52255, 80.01608], [16.99085, 80.05086], [18.25183, 79.70175]]], [[[25.447625359811887, 80.407340399894494], [27.407505730913492, 80.056405748200447], [25.924650506298171, 79.517833970854539], [23.024465773213613, 79.40001170522909], [20.075188429451877, 79.566823228667232], [19.897266473070907, 79.842361965647498], [18.46226362475792, 79.859880276194403], [17.368015170977454, 80.318896186027004], [20.455992059010693, 80.598155626132225], [21.907944777115397, 80.357679348462071], [22.919252557067431, 80.657144273593488], [25.447625359811887, 80.407340399894494]]]] } },
+            { "type": "Feature", "properties": { "admin": "Nepal", "name": "Nepal", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[88.120440708369841, 27.876541652939586], [88.043132765661198, 27.445818589786818], [88.174804315140904, 26.810405178325944], [88.060237664749806, 26.414615383402484], [87.22747195836628, 26.39789805755607], [86.024392938179147, 26.630984605408567], [85.25177859898335, 26.726198431906337], [84.675017938173767, 27.234901231387528], [83.304248895199535, 27.364505723575554], [81.999987420584958, 27.925479234319987], [81.057202589851997, 28.416095282499036], [80.088424513676259, 28.794470119740136], [80.476721225917373, 29.729865220655334], [81.11125613802929, 30.183480943313398], [81.525804477874729, 30.422716986608627], [82.327512648450863, 30.115268052688126], [83.337115106137176, 29.463731594352193], [83.898992954446712, 29.320226141877654], [84.234579705750136, 28.839893703724691], [85.011638218123025, 28.642773952747337], [85.823319940131498, 28.203575954698699], [86.954517043000592, 27.97426178640351], [88.120440708369841, 27.876541652939586]]] } },
+            { "type": "Feature", "properties": { "admin": "New Zealand", "name": "New Zealand", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[173.020374790740703, -40.919052422856417], [173.247234328502003, -41.331998793300777], [173.958405389702875, -40.926700534835604], [174.2475867048081, -41.349155368821663], [174.248516880589449, -41.770008233406749], [173.876446568087886, -42.233184096038819], [173.222739699595621, -42.970038344088557], [172.711246372770717, -43.372287693048492], [173.080112746470206, -43.853343601253577], [172.308583612352464, -43.865694268571332], [171.452925246463622, -44.24251881284372], [171.185137974327233, -44.897104180684885], [170.616697219116588, -45.908928724959701], [169.83142215400926, -46.355774834987585], [169.332331170934253, -46.641235446967848], [168.411353794628525, -46.619944756863582], [167.763744745146823, -46.290197442409195], [166.676886021184202, -46.219917494492236], [166.509144321964669, -45.852704766626204], [167.046424188503238, -45.110941257508664], [168.303763462596862, -44.12397307716612], [168.949408807651508, -43.93581918719142], [169.667814569373149, -43.555325616226334], [170.524919875366152, -43.031688327812823], [171.125089960004004, -42.512753594737781], [171.569713983443194, -41.767424411792128], [171.948708937871885, -41.514416599291145], [172.097227004278722, -40.956104424809674], [172.798579543343948, -40.493962090823466], [173.020374790740703, -40.919052422856417]]], [[[174.612008905330526, -36.156397393540537], [175.336615838927173, -37.209097995758263], [175.3575964704375, -36.52619394302112], [175.808886753642469, -36.798942152657681], [175.958490025127475, -37.555381768546063], [176.763195428776555, -37.881253350578696], [177.438813104560495, -37.961248467766488], [178.010354445708657, -37.579824721020124], [178.517093540762801, -37.695373223624792], [178.274731073313802, -38.582812595373092], [177.970460239979332, -39.166342868812968], [177.206992629299123, -39.145775648760839], [176.939980503647007, -39.449736423501562], [177.032946405340113, -39.879942722331471], [176.8858236026052, -40.06597787858216], [176.508017206119348, -40.60480803808958], [176.012440220440283, -41.289624118821493], [175.239567499082966, -41.688307793953236], [175.067898391009408, -41.425894870775075], [174.650972935278418, -41.281820977545443], [175.227630243223615, -40.459235528323397], [174.900156691789959, -39.908933200847216], [173.824046665743992, -39.508854262043506], [173.852261997775315, -39.146602471677461], [174.57480187408035, -38.797683200842748], [174.743473749081033, -38.027807712558378], [174.69701663645057, -37.381128838857954], [174.292028436579187, -36.71109221776144], [174.319003534235549, -36.534823907213884], [173.840996535535766, -36.121980889634109], [173.05417117745958, -35.237125339500331], [172.636005487353714, -34.529106540669382], [173.007042271209457, -34.450661716450334], [173.551298456107475, -35.006183363587958], [174.329390497126241, -35.265495700828616], [174.612008905330526, -36.156397393540537]]]] } },
+            { "type": "Feature", "properties": { "admin": "Oman", "name": "Oman", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[58.861141391846573, 21.114034532144299], [58.487985874266961, 20.428985907467101], [58.03431847517659, 20.481437486243347], [57.826372511634098, 20.24300242764863], [57.66576216007094, 19.736004950433109], [57.788700392493368, 19.067570298737646], [57.694390903560667, 18.944709580963799], [57.2342639504338, 18.947991034414255], [56.609650913321971, 18.574267076079476], [56.512189162019482, 18.087113348863934], [56.283520949128011, 17.876066799383945], [55.661491733630683, 17.884128322821535], [55.269939406155189, 17.632309068263194], [55.274900343655091, 17.228354397037659], [54.791002231674113, 16.950696926333357], [54.239252964093751, 17.04498057704998], [53.57050825380459, 16.707662665264674], [53.108572625547502, 16.651051133688977], [52.782184279192066, 17.349742336491229], [52.000009800022227, 19.000003363516068], [54.999981723862405, 19.999994004796118], [55.666659376859869, 22.000001125572307], [55.208341098863187, 22.708329982997007], [55.234489373602869, 23.110992743415348], [55.52584109886449, 23.524869289640911], [55.528631626208288, 23.933604030853498], [55.981213820220503, 24.130542914317854], [55.80411868675624, 24.269604193615287], [55.88623253766805, 24.920830593357486], [56.396847365143984, 24.924732163995508], [56.845140415276049, 24.241673081961487], [57.403452589757428, 23.878594468678834], [58.136947869708322, 23.747930609628835], [58.729211460205427, 23.565667832935414], [59.180501743410346, 22.992395331305456], [59.450097690677033, 22.660270900965592], [59.80806033716285, 22.533611965418199], [59.806148309168087, 22.31052480721419], [59.442191196536399, 21.71454051359208], [59.282407667889871, 21.433885809814875], [58.861141391846573, 21.114034532144299]]], [[[56.391421339753393, 25.895990708921254], [56.261041701080913, 25.714606431576748], [56.070820753814544, 26.055464178973946], [56.362017449779344, 26.395934353128947], [56.485679152253809, 26.309117946878665], [56.391421339753393, 25.895990708921254]]]] } },
+            { "type": "Feature", "properties": { "admin": "Pakistan", "name": "Pakistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[75.158027785140902, 37.13303091078911], [75.896897414050116, 36.666806138651829], [76.192848341785677, 35.898403428687821], [77.837450799474553, 35.494009507787759], [76.871721632804011, 34.653544012992732], [75.757060988268321, 34.504922593721311], [74.240202671204955, 34.748887030571247], [73.749948358051952, 34.317698879527846], [74.104293654277328, 33.441473293586846], [74.451559279278698, 32.764899603805489], [75.258641798813187, 32.271105455040491], [74.405928989564998, 31.692639471965272], [74.421380242820263, 30.97981476493117], [73.450638462217412, 29.976413479119863], [72.823751662084689, 28.961591701772047], [71.777665643200308, 27.913180243434521], [70.61649620960192, 27.989196275335861], [69.514392938113119, 26.940965684511365], [70.168926629522005, 26.491871649678835], [70.282873162725579, 25.722228705339823], [70.844699334602822, 25.215102037043511], [71.0432401874682, 24.356523952730193], [68.842599318318761, 24.359133612560932], [68.176645135373377, 23.691965033456704], [67.443666619745457, 23.944843654876983], [67.145441928989058, 24.663611151624639], [66.37282758979326, 25.425140896093847], [64.530407749291115, 25.237038682551425], [62.905700718034595, 25.218409328710202], [61.497362908784183, 25.078237006118492], [61.874187453056535, 26.239974880472097], [63.316631707619578, 26.756532497661659], [63.23389773952028, 27.217047024030702], [62.755425652929851, 27.378923448184985], [62.727830438085974, 28.259644883735383], [61.771868117118615, 28.699333807890792], [61.369308709564926, 29.303276272085917], [60.874248488208778, 29.829238999952604], [62.549856805272775, 29.318572496044304], [63.550260858011164, 29.468330796826162], [64.148002150331237, 29.340819200145965], [64.350418735618504, 29.560030625928089], [65.046862013616092, 29.472180691031902], [66.346472609324408, 29.88794342703617], [66.38145755398601, 30.738899237586448], [66.938891229118454, 31.304911200479346], [67.683393589147457, 31.303154201781414], [67.792689243444769, 31.582930406209623], [68.556932000609308, 31.713310044882011], [68.926676873657655, 31.620189113892064], [69.317764113242546, 31.901412258424436], [69.262522007122541, 32.501944078088293], [69.687147251264847, 33.105498969041228], [70.323594191371583, 33.358532619758385], [69.93054324735958, 34.020120144175102], [70.881803012988385, 33.988855902638512], [71.156773309213449, 34.348911444632144], [71.115018751921625, 34.733125718722228], [71.613076206350698, 35.153203436822857], [71.498767938121077, 35.650563259415996], [71.262348260385735, 36.074387518857797], [71.846291945283909, 36.509942328429851], [72.920024855444453, 36.720007025696312], [74.067551710917812, 36.836175645488446], [74.575892775372964, 37.02084137628345], [75.158027785140902, 37.13303091078911]]] } },
+            { "type": "Feature", "properties": { "admin": "Panama", "name": "Panama", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-77.881571417945239, 7.223771267114783], [-78.214936082660103, 7.512254950384159], [-78.429160732726061, 8.052041123888925], [-78.182095709938608, 8.319182440621772], [-78.43546525746568, 8.387705389840788], [-78.622120530903928, 8.718124497915026], [-79.120307176413732, 8.996092027213022], [-79.557877366845176, 8.932374986197145], [-79.760578172510037, 8.584515082224398], [-80.164481167303322, 8.333315944853593], [-80.382659064439608, 8.29840851484043], [-80.480689256497286, 8.090307522001067], [-80.003689948227148, 7.54752411542337], [-80.276670701808982, 7.419754136581713], [-80.421158006497066, 7.271571966984763], [-80.886400926420791, 7.220541490096535], [-81.059542812814698, 7.817921047390596], [-81.189715745757937, 7.647905585150339], [-81.519514736644666, 7.706610012233908], [-81.721311204744453, 8.108962714058434], [-82.131441209628889, 8.175392767769635], [-82.390934414382542, 8.292362372262287], [-82.820081346350406, 8.290863755725821], [-82.850958014644803, 8.073822740099954], [-82.965783047197348, 8.225027980985983], [-82.9131764391242, 8.423517157419068], [-82.829770677405151, 8.626295477732368], [-82.868657192704759, 8.807266343618521], [-82.719183112300513, 8.925708726431493], [-82.927154914059145, 9.074330145702914], [-82.932890998043561, 9.476812038608172], [-82.546196255203469, 9.566134751824674], [-82.187122565423394, 9.207448635286779], [-82.207586432610952, 8.995575262890098], [-81.808566860669259, 8.95061676679617], [-81.714154018872023, 9.031955471223581], [-81.43928707551153, 8.786234035675715], [-80.947301601876745, 8.858503526235905], [-80.521901211250054, 9.11107208906243], [-79.914599778955974, 9.312765204297618], [-79.573302781884294, 9.611610012241526], [-79.021191779277913, 9.552931423374103], [-79.058450486960353, 9.454565334506523], [-78.500887620747164, 9.420458889193879], [-78.055927700497989, 9.247730414258296], [-77.729513515926399, 8.946844387238867], [-77.353360765273848, 8.670504665558068], [-77.474722866511314, 8.524286200388216], [-77.242566494440069, 7.935278225125442], [-77.431107957656977, 7.638061224798733], [-77.75341386586139, 7.709839789252141], [-77.881571417945239, 7.223771267114783]]] } },
+            { "type": "Feature", "properties": { "admin": "Peru", "name": "Peru", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-69.590423753524036, -17.580011895419329], [-69.858443569605839, -18.092693780187009], [-70.3725723944777, -18.347975355708861], [-71.375250210236914, -17.77379851651385], [-71.462040778271117, -17.363487644116379], [-73.444529588500401, -16.359362888252992], [-75.23788265654143, -15.26568287522778], [-76.009205084929931, -14.649286390850317], [-76.423469204397733, -13.823186944232431], [-76.259241502574156, -13.535039157772939], [-77.10619238962181, -12.222716159720816], [-78.092152879534623, -10.377712497604062], [-79.036953091126918, -8.38656788496589], [-79.445920376284832, -7.930833428583859], [-79.760578172510037, -7.194340915560081], [-80.537481655586049, -6.541667575713715], [-81.249996304026411, -6.136834405139182], [-80.926346808582423, -5.690556735866563], [-81.410942552399433, -4.736764825055459], [-81.099669562489353, -4.036394138203696], [-80.302560594387188, -3.404856459164712], [-80.184014858709645, -3.821161797708043], [-80.46929460317692, -4.059286797708999], [-80.442241990872134, -4.425724379090673], [-80.028908047185581, -4.346090996928893], [-79.62497921417615, -4.454198093283494], [-79.205289069317715, -4.959128513207388], [-78.639897223612323, -4.547784112164072], [-78.450683966775628, -3.873096612161375], [-77.83790483265858, -3.003020521663103], [-76.635394253226707, -2.608677666843817], [-75.544995693652027, -1.56160979574588], [-75.233722703741932, -0.911416924649529], [-75.373223232713841, -0.15203175212045], [-75.106624518520064, -0.05720549886486], [-74.441600511355958, -0.530820000819887], [-74.122395189089048, -1.002832533373848], [-73.659503546834586, -1.260491224781134], [-73.070392218707212, -2.308954359550952], [-72.325786505813639, -2.434218031426453], [-71.774760708285385, -2.169789727388937], [-71.413645799429773, -2.342802422702128], [-70.813475714791949, -2.256864515800742], [-70.047708502874841, -2.725156345229699], [-70.692682054309699, -3.742872002785858], [-70.394043952094975, -3.766591485207825], [-69.893635219996611, -4.298186944194326], [-70.79476884630229, -4.251264743673302], [-70.928843349883564, -4.401591485210367], [-71.748405727816532, -4.59398284263301], [-72.891927659787243, -5.274561455916979], [-72.964507208941185, -5.741251315944892], [-73.219711269814596, -6.089188734566076], [-73.120027431923575, -6.629930922068238], [-73.724486660441627, -6.918595472850638], [-73.723401455363486, -7.340998630404412], [-73.987235480429646, -7.523829847853063], [-73.571059332967053, -8.424446709835832], [-73.015382656532537, -9.03283334720806], [-73.226713426390148, -9.462212823121233], [-72.563033006465631, -9.520193780152715], [-72.184890713169821, -10.05359791426943], [-71.302412278921523, -10.079436130415372], [-70.481893886991159, -9.490118096558842], [-70.548685675728393, -11.009146823778462], [-70.093752204046879, -11.123971856331011], [-69.52967810736493, -10.951734307502193], [-68.665079718689611, -12.561300144097171], [-68.880079515239956, -12.89972909917665], [-68.929223802349526, -13.602683607643007], [-68.94888668483658, -14.45363941819328], [-69.339534674747, -14.953195489158828], [-69.160346645774936, -15.323973890853015], [-69.389764166934697, -15.66012908291165], [-68.959635382753291, -16.500697930571267], [-69.590423753524036, -17.580011895419329]]] } },
+            { "type": "Feature", "properties": { "admin": "Philippines", "name": "Philippines", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[126.376813592637447, 8.414706325713352], [126.478512811387873, 7.750354112168976], [126.537423944200611, 7.189380601424572], [126.19677290253253, 6.274294338400038], [125.831420526229081, 7.293715318221855], [125.363852166852283, 6.78648529706099], [125.683160841983707, 6.049656887227257], [125.396511672060626, 5.581003322772288], [124.219787632342332, 6.16135549562618], [123.938719517106918, 6.88513560630612], [124.243662144061318, 7.360610459823659], [123.610212437027542, 7.833527329942753], [123.29607140512519, 7.418875637232786], [122.825505812675388, 7.457374579290216], [122.085499302255769, 6.899424139834847], [121.919928013192603, 7.192119452336072], [122.312358840017112, 8.034962063016506], [122.94239790251963, 8.316236883981174], [123.487687616063511, 8.693009751821192], [123.841154412939815, 8.240324204944384], [124.6014697612502, 8.514157619659015], [124.764612257995623, 8.960409450715458], [125.471390822451539, 8.986996975129641], [125.412117954612754, 9.760334784377545], [126.222714471543156, 9.28607432701885], [126.306636997585073, 8.782487494334573], [126.376813592637447, 8.414706325713352]]], [[[123.982437778825798, 10.278778591345811], [123.62318322153277, 9.950090643753297], [123.309920688979332, 9.318268744336676], [122.995883009941636, 9.022188625520398], [122.380054966319463, 9.713360907424201], [122.586088901867072, 9.981044826696104], [122.837081333508706, 10.261156927934234], [122.947410516451896, 10.881868394408029], [123.498849725438447, 10.940624497923945], [123.337774285984722, 10.267383938025445], [124.077935825701218, 11.232725531453706], [123.982437778825798, 10.278778591345811]]], [[[118.504580926590336, 9.316382554558087], [117.174274530100675, 8.367499904814663], [117.664477166821371, 9.066888739452933], [118.386913690261736, 9.684499619989223], [118.98734215706105, 10.376292019080507], [119.511496209797528, 11.36966807702721], [119.689676548339889, 10.554291490109872], [119.029458449378978, 10.003653265823869], [118.504580926590336, 9.316382554558087]]], [[[121.883547804859106, 11.891755072471977], [122.483821242361458, 11.582187404827506], [123.120216506035959, 11.583660183147867], [123.100837843926442, 11.165933742716486], [122.637713657726692, 10.741308498574226], [122.002610304859559, 10.441016750526087], [121.967366978036523, 10.905691229694622], [122.038370396005519, 11.415840969280039], [121.883547804859106, 11.891755072471977]]], [[[125.502551711123488, 12.162694606978347], [125.783464797062152, 11.046121934447767], [125.01188398651226, 11.311454576050377], [125.032761265158115, 10.975816148314703], [125.277449172060244, 10.358722032101308], [124.801819289245714, 10.134678859899889], [124.760168084818474, 10.8379951033923], [124.459101190286049, 10.889929917845633], [124.302521600441722, 11.495370998577227], [124.891012811381572, 11.415582587118589], [124.877990350443952, 11.794189968304988], [124.266761509295705, 12.557760931849682], [125.22711632700782, 12.53572093347719], [125.502551711123488, 12.162694606978347]]], [[[121.527393833503481, 13.069590155484516], [121.262190382981544, 12.2055602075644], [120.833896112146533, 12.704496161342416], [120.323436313967477, 13.466413479053866], [121.18012820850214, 13.429697373910439], [121.527393833503481, 13.069590155484516]]], [[[121.321308221523566, 18.504064642811013], [121.937601353036371, 18.21855235439838], [122.246006300954264, 18.478949896717094], [122.336956821787965, 18.224882717354173], [122.174279412933174, 17.810282701076371], [122.51565392465335, 17.09350474697197], [122.252310825693883, 16.262444362854122], [121.662786086108255, 15.931017564350125], [121.505069614753367, 15.124813544164621], [121.728828566577249, 14.328376369682244], [122.258925409027313, 14.218202216035973], [122.701275669445636, 14.336541245984417], [123.950295037940236, 13.782130642141066], [123.855107049658599, 13.237771104378464], [124.181288690284873, 12.997527370653469], [124.077419061378222, 12.536676947474573], [123.298035109552245, 13.027525539598981], [122.928651971529902, 13.552919826710404], [122.671355015148663, 13.185836289925131], [122.034649692880521, 13.784481919810343], [121.126384718918587, 13.636687323455559], [120.628637323083296, 13.857655747935649], [120.679383579593832, 14.271015529838319], [120.99181928923052, 14.525392767795079], [120.693336216312687, 14.756670640517282], [120.564145135582976, 14.396279201713821], [120.070428501466367, 14.970869452367094], [119.920928582846102, 15.406346747290735], [119.883773228028247, 16.363704331929963], [120.286487664878791, 16.034628811095327], [120.39004723519173, 17.599081122299506], [120.7158671407919, 18.505227362537536], [121.321308221523566, 18.504064642811013]]]] } },
+            { "type": "Feature", "properties": { "admin": "Papua New Guinea", "name": "Papua New Guinea", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[155.880025669578401, -6.819996840037758], [155.599991082988765, -6.919990736522491], [155.166994256815087, -6.535931491729299], [154.729191522438327, -5.900828138862208], [154.514114211239644, -5.139117526880012], [154.652503696917336, -5.042430922061839], [154.759990676084357, -5.339983819198493], [155.062917922179338, -5.566791680527486], [155.547746209941693, -6.200654799019658], [156.019965448224752, -6.540013929880386], [155.880025669578401, -6.819996840037758]]], [[[151.982795851854462, -5.478063246282344], [151.459106887008659, -5.560280450058739], [151.301390415653884, -5.840728448106701], [150.754447056276661, -6.083762709175387], [150.241196730753813, -6.317753594592984], [149.709963006793316, -6.316513360218051], [148.890064732050462, -6.026040134305432], [148.318936802360696, -5.74714242922613], [148.401825799756864, -5.437755629094722], [149.298411900020824, -5.583741550319216], [149.845561965127217, -5.505503431829339], [149.996250441690279, -5.026101169457674], [150.139755894164921, -5.001348158389788], [150.236907586873485, -5.53222014732428], [150.807467075808063, -5.455842380396886], [151.089672072553981, -5.113692722192368], [151.647880894170811, -4.757073662946168], [151.537861769821518, -4.167807305521889], [152.136791620084352, -4.148790378438519], [152.338743117480988, -4.31296640382976], [152.318692661751754, -4.867661228050748], [151.982795851854462, -5.478063246282344]]], [[[147.191873814074938, -7.388024183789978], [148.084635858349372, -8.044108168167609], [148.734105259393573, -9.104663588093755], [149.306835158484432, -9.071435642130067], [149.266630894161324, -9.514406019736027], [150.038728469034311, -9.684318129111698], [149.738798456012262, -9.872937106977002], [150.801627638959133, -10.29368661869742], [150.690574985963849, -10.582712904505865], [150.028393182575826, -10.652476088099929], [149.782310012001972, -10.393267103723941], [148.923137648717216, -10.28092253992136], [147.913018426707993, -10.130440769087469], [147.135443150012236, -9.492443536012017], [146.567880894150619, -8.942554619994153], [146.048481073184917, -8.067414239131308], [144.74416792213799, -7.630128269077473], [143.897087844009661, -7.915330498896279], [143.286375767184268, -8.245491224809056], [143.413913202080664, -8.983068942910945], [142.628431431244223, -9.326820570516501], [142.068258905200196, -9.159595635620034], [141.033851760013874, -9.117892754760417], [141.017056919519007, -5.85902190513802], [141.000210402591847, -2.600151055515624], [142.735246616791443, -3.289152927263216], [144.583970982033236, -3.861417738463401], [145.27317955950997, -4.373737888205027], [145.829786411725649, -4.876497897972683], [145.981921828392956, -5.465609226100012], [147.648073358347574, -6.083659356310803], [147.891107619416175, -6.614014580922315], [146.970905389594861, -6.721656589386255], [147.191873814074938, -7.388024183789978]]], [[[153.14003787659874, -4.499983412294113], [152.827292108368255, -4.766427097190998], [152.63867313050298, -4.176127211120927], [152.406025832324929, -3.789742526874561], [151.953236932583536, -3.462062269711821], [151.384279413050024, -3.035421644710111], [150.6620495953388, -2.741486097833956], [150.939965448204532, -2.500002129734028], [151.479984165654514, -2.779985039891386], [151.820015090135087, -2.999971612157907], [152.239989455371074, -3.24000864015366], [152.640016717742526, -3.659983005389647], [153.019993524384631, -3.980015150573293], [153.14003787659874, -4.499983412294113]]]] } },
+            { "type": "Feature", "properties": { "admin": "Poland", "name": "Poland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[15.016995883858666, 51.106674099321566], [14.607098422919531, 51.745188096719964], [14.685026482815685, 52.089947414755187], [14.437599725002197, 52.624850165408382], [14.074521111719488, 52.981262518925426], [14.353315463934136, 53.248171291712957], [14.119686313542584, 53.757029120491026], [14.802900424873455, 54.050706285205735], [16.363477003655728, 54.513158677785711], [17.622831658608671, 54.851535956432897], [18.620858595461637, 54.682605699270766], [18.696254510175461, 54.438718777069276], [19.6606400896064, 54.426083889373913], [20.89224450041862, 54.312524929412518], [22.731098667092649, 54.327536932993311], [23.243987257589506, 54.220566718149129], [23.484127638449841, 53.912497667041123], [23.527535841574995, 53.47012156840654], [23.804934930117774, 53.08973135030606], [23.799198846133375, 52.691099351606553], [23.19949384938618, 52.486977444053664], [23.508002150168689, 52.023646552124717], [23.52707075368437, 51.578454087930233], [24.029985792748899, 50.705406602575174], [23.922757195743259, 50.424881089878738], [23.426508416444388, 50.308505764357449], [22.518450148211596, 49.476773586619736], [22.776418898212619, 49.027395331409608], [22.558137648211751, 49.08573802346713], [21.607808058364206, 49.470107326854077], [20.887955356538406, 49.328772284535823], [20.415839471119849, 49.431453355499755], [19.825022820726865, 49.217125352569219], [19.320712517990469, 49.571574001659179], [18.909574822676316, 49.435845852244562], [18.85314415861361, 49.496229763377634], [18.392913852622168, 49.988628648470737], [17.649445021238986, 50.049038397819942], [17.554567091551117, 50.36214590107641], [16.868769158605655, 50.473973700556016], [16.719475945714429, 50.215746568393527], [16.176253289462263, 50.4226073268579], [16.238626743238566, 50.697732652379827], [15.490972120839725, 50.7847299261432], [15.016995883858666, 51.106674099321566]]] } },
+            { "type": "Feature", "properties": { "admin": "Puerto Rico", "name": "Puerto Rico", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-66.2824344550082, 18.51476166429536], [-65.771302863209286, 18.426679185453875], [-65.591003790942935, 18.228034979723912], [-65.847163865813755, 17.975905666571855], [-66.599934455009475, 17.98182261806927], [-67.184162360285256, 17.946553453030074], [-67.24242753769434, 18.374460150622934], [-67.100679083917726, 18.520601101144347], [-66.2824344550082, 18.51476166429536]]] } },
+            { "type": "Feature", "properties": { "admin": "North Korea", "name": "Dem. Rep. Korea", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[130.640015903852401, 42.39500946712527], [130.780007358931101, 42.220007229168843], [130.400030552288996, 42.280003567059701], [129.965948521037234, 41.941367906251052], [129.667362095254788, 41.601104437825221], [129.705189243692445, 40.882827867184318], [129.188114862179958, 40.661807766271984], [129.010399611528186, 40.485436102859801], [128.633368361526692, 40.189846910150301], [127.967414178581322, 40.025412502597547], [127.533435500194145, 39.756850083976694], [127.502119582225276, 39.323930772451526], [127.385434198110261, 39.213472398427648], [127.783342726757709, 39.050898342437414], [128.349716424676586, 38.612242946927843], [128.205745884311426, 38.370397243801882], [127.780035435090966, 38.304535630845884], [127.073308547067342, 38.256114813788393], [126.683719924018888, 37.804772854151174], [126.237338901881742, 37.840377916000271], [126.174758742376213, 37.749685777328033], [125.689103631697165, 37.940010077459014], [125.568439162295675, 37.752088731429616], [125.275330438336184, 37.66907054295271], [125.24008711151312, 37.857224432927424], [124.981033156433952, 37.948820909164773], [124.712160679219352, 38.108346055649783], [124.985994093933954, 38.548474229479673], [125.221948683778677, 38.665857245430665], [125.13285851450749, 38.848559271798578], [125.386589797060566, 39.387957872061158], [125.321115757346774, 39.551384589184202], [124.737482131042384, 39.660344346671614], [124.265624627785286, 39.928493353834149], [125.079941847840615, 40.569823716792442], [126.182045119329402, 41.107336127276362], [126.86908328664984, 41.816569322266176], [127.343782993682993, 41.50315176041596], [128.208433058790632, 41.466771552082477], [128.052215203972281, 41.994284572917934], [129.59666873587949, 42.424981797854542], [129.994267205933198, 42.985386867843779], [130.640015903852401, 42.39500946712527]]] } },
+            { "type": "Feature", "properties": { "admin": "Portugal", "name": "Portugal", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-9.034817674180244, 41.880570583659669], [-8.671945766626719, 42.134689439454952], [-8.26385698081779, 42.280468654950326], [-8.01317460776991, 41.790886135417118], [-7.422512986673794, 41.792074693359822], [-7.251308966490822, 41.91834605566504], [-6.668605515967655, 41.883386949219577], [-6.389087693700914, 41.381815497394641], [-6.851126674822551, 41.111082668617513], [-6.864019944679383, 40.330871893874821], [-7.026413133156593, 40.184524237624238], [-7.066591559263527, 39.711891587882768], [-7.498632371439724, 39.629571031241802], [-7.098036668313126, 39.03007274022378], [-7.374092169616317, 38.373058580064914], [-7.029281175148794, 38.075764065089757], [-7.166507941099863, 37.803894354802217], [-7.537105475281022, 37.428904323876232], [-7.45372555177809, 37.097787583966053], [-7.855613165711985, 36.838268540996253], [-8.382816127953687, 36.978880113262449], [-8.898856980820325, 36.868809312480771], [-8.746101446965552, 37.6513455266766], [-8.839997524439879, 38.266243394517609], [-9.287463751655221, 38.358485826158592], [-9.526570603869713, 38.737429104154906], [-9.44698889814023, 39.392066148428363], [-9.048305223008425, 39.755093085278766], [-8.977353481471679, 40.159306138665798], [-8.7686840478771, 40.76063894303018], [-8.790853237330309, 41.18433401139125], [-8.990789353867568, 41.543459377603625], [-9.034817674180244, 41.880570583659669]]] } },
+            { "type": "Feature", "properties": { "admin": "Paraguay", "name": "Paraguay", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-62.685057135657871, -22.24902922942238], [-62.291179368729203, -21.051634616787389], [-62.265961269770784, -20.513734633061272], [-61.786326463453761, -19.633736667562957], [-60.043564622626477, -19.342746677327419], [-59.11504248720609, -19.356906019775398], [-58.183471442280492, -19.868399346600359], [-58.166392381408038, -20.176700941653674], [-57.870673997617786, -20.732687676681948], [-57.937155727761287, -22.090175876557169], [-56.881509568902885, -22.282153822521476], [-56.473317430229379, -22.086300144135279], [-55.797958136606894, -22.356929620047815], [-55.61068274598113, -22.655619398694839], [-55.517639329639621, -23.57199757252663], [-55.400747239795407, -23.956935316668797], [-55.027901780809543, -24.001273695575225], [-54.652834235235119, -23.839578138933955], [-54.292959560754511, -24.021014092710722], [-54.293476325077435, -24.570799655863958], [-54.428946092330577, -25.162184747012162], [-54.625290696823562, -25.739255466415507], [-54.788794928595038, -26.621785577096126], [-55.695845506398143, -27.387837009390857], [-56.486701626192989, -27.548499037386286], [-57.609759690976134, -27.395898532828383], [-58.618173590719735, -27.123718763947089], [-57.633660040911117, -25.603656508081638], [-57.777217169817924, -25.162339776309032], [-58.807128465394968, -24.771459242453307], [-60.028966030504016, -24.032796319273267], [-60.846564704009907, -23.880712579038288], [-62.685057135657871, -22.24902922942238]]] } },
+            { "type": "Feature", "properties": { "admin": "Palestine", "name": "Palestine", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.545665317534535, 32.393992011030569], [35.545251906076196, 31.782504787720832], [35.397560662586038, 31.489086005167572], [34.927408481594554, 31.35343537040141], [34.970506626125989, 31.616778469360803], [35.225891554512422, 31.754341132121759], [34.974640740709319, 31.866582343059715], [35.183930291491428, 32.532510687788935], [35.545665317534535, 32.393992011030569]]] } },
+            { "type": "Feature", "properties": { "admin": "Qatar", "name": "Qatar", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[50.810108270069563, 24.754742539971371], [50.743910760303677, 25.482424221289389], [51.01335167827348, 26.006991685484191], [51.286461622936045, 26.114582017515865], [51.589078810437243, 25.801112779233375], [51.606700473848804, 25.215670477798735], [51.389607781790623, 24.627385972588051], [51.112415398977006, 24.556330878186721], [50.810108270069563, 24.754742539971371]]] } },
+            { "type": "Feature", "properties": { "admin": "Romania", "name": "Romania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.710531447040488, 47.882193915389394], [23.142236362406798, 48.096341050806942], [23.760958286237404, 47.985598456405448], [24.402056105250374, 47.981877753280422], [24.866317172960571, 47.737525743188307], [25.207743361112986, 47.891056423527459], [25.945941196402394, 47.987148749374207], [26.197450392366925, 48.220881252630342], [26.619336785597788, 48.220726223333457], [26.924176059687561, 48.123264472030982], [27.233872918412736, 47.826770941756365], [27.551166212684841, 47.405117092470817], [28.128030226359037, 46.81047638608824], [28.160017937947707, 46.371562608417207], [28.054442986775392, 45.944586086605618], [28.233553501099035, 45.488283189468369], [28.679779493939371, 45.30403087013169], [29.149724969201646, 45.464925442072442], [29.603289015427425, 45.293308010431119], [29.62654340995876, 45.035390936862392], [29.141611769331831, 44.820210272799038], [28.837857700320196, 44.913873806328041], [28.55808149589199, 43.707461656258118], [27.970107049275068, 43.812468166675202], [27.242399529740904, 44.175986029632398], [26.065158725699739, 43.943493760751259], [25.569271681426923, 43.688444729174712], [24.100679152124169, 43.741051337247846], [23.332302280376322, 43.897010809904707], [22.94483239105184, 43.823785305347123], [22.657149692482985, 44.234923000661276], [22.474008416440594, 44.409227606781762], [22.705725538837349, 44.578002834647016], [22.459022251075933, 44.702517198254291], [22.145087924902807, 44.478422349620573], [21.562022739353605, 44.768947251965486], [21.483526238702233, 45.181170152357772], [20.874312778413351, 45.416375433934228], [20.76217492033998, 45.734573065771428], [20.220192498462833, 46.127468980486547], [21.021952345471245, 46.316087958351886], [21.626514926853869, 46.994237779318148], [22.09976769378283, 47.672439276716695], [22.710531447040488, 47.882193915389394]]] } },
+            { "type": "Feature", "properties": { "admin": "Russia", "name": "Russia", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[143.648007440362846, 50.747600409541512], [144.65414757708561, 48.976390692737581], [143.173927850517174, 49.306551418650365], [142.558668247650076, 47.861575018904908], [143.533492466404027, 46.836728013692479], [143.505277134372591, 46.137907619809475], [142.747700636973889, 46.740764878926562], [142.092030064054484, 45.966755276058777], [141.906925083585008, 46.805928860046535], [142.018442824470867, 47.780132961612921], [141.904444614835029, 48.859188544299563], [142.135800002205656, 49.615163072297449], [142.179983351815281, 50.952342434281903], [141.594075962490024, 51.935434882202529], [141.682546014573632, 53.301966457728767], [142.606934035410745, 53.762145087287891], [142.209748976815376, 54.225475979216853], [142.654786411712934, 54.365880845753864], [142.914615513276544, 53.704577541714734], [143.260847609632037, 52.740760403039033], [143.235267775647628, 51.756660264688733], [143.648007440362846, 50.747600409541512]]], [[[22.731098667092649, 54.327536932993311], [20.892244500418652, 54.312524929412568], [19.6606400896064, 54.42608388937397], [19.88848147958134, 54.866160386771483], [21.268448927503492, 55.190481675835279], [22.315723504330599, 55.015298570365886], [22.757763706155281, 54.856574408581416], [22.651051873472564, 54.582740993866693], [22.731098667092649, 54.327536932993311]]], [[[180.000000000000114, 70.832199208546669], [178.903425, 70.78114], [178.7253, 71.0988], [180.000000000000114, 71.515714336428246], [180.000000000000114, 70.832199208546669]]], [[[143.60385, 73.21244], [142.08763, 73.20544], [140.038155, 73.31692], [139.86312, 73.36983], [140.81171, 73.76506], [142.06207, 73.85758], [143.48283, 73.47525], [143.60385, 73.21244]]], [[[150.73167, 75.08406], [149.575925, 74.68892], [147.977465, 74.778355], [146.11919, 75.17298], [146.358485, 75.49682], [148.22223, 75.345845], [150.73167, 75.08406]]], [[[145.086285, 75.562625], [144.3, 74.82], [140.61381, 74.84768], [138.95544, 74.61148], [136.97439, 75.26167], [137.51176, 75.94917], [138.831075, 76.13676], [141.471615, 76.09289], [145.086285, 75.562625]]], [[[57.535692579992386, 70.720463975702145], [56.944979282463933, 70.63274323188665], [53.677375115784187, 70.762657782668455], [53.412016635965372, 71.206661688920192], [51.601894565645708, 71.474759019650477], [51.455753615124209, 72.014881089965129], [52.478275180883564, 72.229441636840946], [52.444168735570841, 72.77473135038484], [54.427613559797649, 73.627547512497571], [53.508289829325136, 73.749813951300141], [55.902458937407644, 74.627486477345329], [55.631932814359701, 75.081412258597155], [57.868643833248839, 75.609390367323186], [61.170044386647497, 76.251883450008123], [64.498368361270209, 76.439055487769267], [66.210977003855092, 76.809782213031227], [68.157059767534818, 76.939696763812904], [68.852211134725124, 76.544811306454605], [68.180572544227644, 76.233641669409096], [64.637326287703004, 75.737754625136219], [61.583507521414752, 75.260884507946784], [58.477082147053366, 74.309056301562819], [56.986785516187993, 73.333043524866227], [55.41933597191094, 72.371267605265956], [55.622837762276291, 71.540594794390316], [57.535692579992386, 70.720463975702145]]], [[[106.970130000000111, 76.97419], [107.240000000000123, 76.48], [108.1538, 76.723350000000138], [111.077260000000138, 76.71], [113.33151, 76.22224], [114.13417, 75.84764], [113.88539, 75.327790000000121], [112.77918, 75.03186], [110.151250000000175, 74.47673], [109.4, 74.18], [110.64, 74.04], [112.11919, 73.787740000000113], [113.019540000000234, 73.976930000000138], [113.529580000000294, 73.33505], [113.96881, 73.59488], [115.56782, 73.75285], [118.776330000000215, 73.58772], [119.02, 73.12], [123.20066, 72.97122], [123.257770000000178, 73.73503], [125.380000000000166, 73.56], [126.97644, 73.56549], [128.59126, 73.03871], [129.05157, 72.39872], [128.46, 71.98], [129.715990000000204, 71.19304], [131.288580000000252, 70.786990000000102], [132.253500000000145, 71.8363], [133.857660000000294, 71.386420000000143], [135.56193, 71.655250000000123], [137.49755, 71.34763], [138.234090000000123, 71.62803], [139.86983, 71.487830000000116], [139.14791, 72.4161900000001], [140.46817, 72.849410000000134], [149.5, 72.2], [150.35118000000017, 71.60643], [152.96890000000019, 70.84222], [157.00688, 71.03141], [158.99779, 70.86672], [159.830310000000225, 70.45324], [159.70866, 69.72198], [160.94053000000028, 69.43728], [162.279070000000104, 69.64204], [164.05248, 69.66823], [165.940370000000172, 69.47199], [167.83567, 69.58269], [169.57763000000017, 68.6938], [170.816880000000253, 69.01363], [170.008200000000159, 69.65276], [170.453450000000259, 70.09703], [173.643910000000204, 69.81743], [175.72403000000017, 69.877250000000217], [178.6, 69.4], [180.000000000000114, 68.963636363636553], [180.000000000000114, 64.979708702198465], [179.99281, 64.97433], [178.707200000000199, 64.53493], [177.411280000000147, 64.60821], [178.313000000000187, 64.07593], [178.90825000000018, 63.251970000000128], [179.37034, 62.98262], [179.48636, 62.56894], [179.228250000000116, 62.304100000000133], [177.3643, 62.5219], [174.569290000000194, 61.76915], [173.68013, 61.65261], [172.15, 60.95], [170.6985, 60.33618], [170.330850000000282, 59.88177], [168.90046, 60.57355], [166.294980000000265, 59.7885500000002], [165.840000000000202, 60.16], [164.87674, 59.7316], [163.539290000000108, 59.86871], [163.217110000000218, 59.21101], [162.01733, 58.24328], [162.05297, 57.83912], [163.19191, 57.61503], [163.057940000000144, 56.159240000000111], [162.129580000000203, 56.12219], [161.70146, 55.285680000000148], [162.117490000000117, 54.85514], [160.368770000000325, 54.34433], [160.021730000000218, 53.20257], [158.530940000000157, 52.958680000000236], [158.23118, 51.94269], [156.789790000000266, 51.01105], [156.42000000000013, 51.7], [155.99182, 53.15895], [155.43366, 55.381030000000109], [155.914420000000291, 56.767920000000132], [156.75815, 57.3647], [156.81035, 57.83204], [158.364330000000166, 58.05575], [160.150640000000124, 59.314770000000109], [161.87204, 60.343000000000117], [163.66969, 61.1409], [164.473550000000103, 62.55061], [163.258420000000172, 62.46627], [162.65791, 61.6425], [160.12148, 60.54423], [159.30232, 61.77396], [156.72068, 61.43442], [154.218060000000293, 59.758180000000117], [155.04375, 59.14495], [152.81185, 58.88385], [151.265730000000246, 58.78089], [151.33815, 59.50396], [149.78371, 59.655730000000126], [148.54481, 59.16448], [145.48722, 59.33637], [142.197820000000121, 59.03998], [138.958480000000293, 57.08805], [135.12619, 54.72959], [136.70171, 54.603550000000112], [137.19342, 53.97732], [138.1647, 53.755010000000247], [138.80463, 54.25455], [139.90151, 54.189680000000166], [141.34531, 53.089570000000109], [141.37923, 52.23877], [140.59742000000017, 51.23967], [140.51308, 50.045530000000113], [140.061930000000189, 48.446710000000152], [138.554720000000202, 46.99965], [138.21971, 46.30795], [136.86232, 45.143500000000174], [135.515350000000183, 43.989], [134.869390000000237, 43.39821], [133.536870000000249, 42.81147], [132.90627, 42.79849], [132.278070000000241, 43.284560000000106], [130.935870000000136, 42.55274], [130.78, 42.220000000000191], [130.640000000000157, 42.395], [130.633866408409801, 42.903014634770543], [131.144687941614961, 42.929989732426932], [131.288555129115593, 44.111519680348252], [131.025190000000237, 44.96796], [131.883454217659562, 45.321161607436508], [133.097120000000189, 45.14409], [133.769643996313164, 46.116926988299149], [134.112350000000163, 47.212480000000127], [134.50081, 47.578450000000139], [135.026311476786759, 48.478229885443902], [133.373595819228001, 48.183441677434836], [132.506690000000106, 47.78896], [130.987260000000106, 47.79013], [130.582293328982644, 48.72968740497619], [129.397817824420486, 49.4406000840156], [127.657400000000351, 49.76027], [127.287455682484904, 50.739797268265434], [126.939156528837827, 51.353894151405896], [126.564399041856959, 51.784255479532689], [125.946348911646439, 52.792798570356936], [125.068211297710434, 53.161044826868924], [123.57147, 53.4588], [122.245747918793043, 53.431725979213681], [121.003084751470354, 53.251401068731226], [120.177088657716865, 52.753886216841195], [120.725789015791975, 52.516226304730893], [120.7382, 51.96411], [120.182080000000155, 51.64355], [119.27939, 50.58292], [119.288460728025839, 50.142882798861947], [117.87924441942647, 49.510983384797036], [116.67880089728618, 49.888531399121398], [115.485695428531415, 49.805177313834733], [114.962109816550353, 50.140247300815119], [114.362456496235325, 50.24830272073747], [112.897739699354361, 49.543565375356984], [111.581230910286649, 49.377968248077671], [110.662010532678835, 49.130128078805846], [109.402449171996707, 49.292960516957685], [108.475167270951275, 49.282547715850704], [107.868175897251092, 49.793705145865871], [106.888804152455293, 50.274295966180276], [105.886591424586868, 50.40601919209216], [104.62158, 50.275320000000157], [103.676545444760336, 50.08996613219513], [102.25589, 50.510560000000105], [102.06521, 51.25991], [100.889480421962631, 51.516855780638409], [99.981732212323564, 51.63400625264395], [98.861490513100492, 52.047366034546698], [97.82573978067451, 51.010995184933236], [98.231761509191699, 50.422400621128716], [97.259760000000199, 49.72605], [95.814020000000156, 49.977460000000114], [94.815949334698757, 50.01343333597088], [94.147566359435601, 50.480536607457161], [93.10421, 50.49529], [92.234711541719676, 50.802170722041737], [90.713667433640765, 50.331811835321098], [88.805566847695573, 49.470520738312459], [87.751264276076824, 49.297197984405543], [87.359970330762692, 49.214980780629148], [86.829356723989648, 49.826674709668133], [85.541269972682485, 49.69285858824815], [85.115559523462082, 50.117302964877631], [84.416377394553038, 50.311399644565817], [83.935114780618903, 50.889245510453563], [83.383003778012451, 51.069182847693881], [81.945985548839943, 50.812195949906325], [80.568446893235446, 51.388336493528435], [80.035559523441705, 50.864750881547209], [77.80091556184432, 53.404414984747532], [76.525179477854749, 54.177003485727127], [76.891100294913443, 54.490524400441913], [74.384820000000119, 53.546850000000113], [73.425678745420512, 53.489810289109741], [73.50851606638436, 54.035616766976588], [72.224150018202195, 54.376655381886778], [71.180131056609468, 54.133285224008247], [70.86526655465515, 55.169733588270091], [69.068166945272893, 55.385250149143488], [68.169100376258896, 54.970391750704366], [65.66687, 54.601250000000149], [65.178533563095939, 54.354227810272064], [61.436600000000126, 54.00625], [60.978066440683236, 53.664993394579128], [61.69998619980062, 52.979996446334255], [60.73999311711453, 52.719986477257734], [60.927268507740237, 52.447548326214999], [59.967533807215567, 51.96042043721566], [61.588003371024136, 51.272658799843171], [61.337424350840998, 50.799070136104248], [59.932807244715555, 50.842194118851822], [59.642282342370564, 50.545442206415707], [58.363320000000122, 51.06364], [56.77798, 51.04355], [55.71694, 50.621710000000142], [54.532878452376181, 51.026239732459359], [52.328723585831042, 51.718652248738088], [50.766648390512174, 51.692762356159861], [48.702381626181044, 50.605128485712825], [48.577841424357601, 49.87475962991563], [47.549480421749379, 50.454698391311119], [46.751596307162764, 49.356005764353725], [47.043671502476585, 49.152038886097571], [46.466445753776291, 48.394152330104923], [47.315240000000152, 47.71585], [48.05725, 47.74377], [48.694733514201872, 47.075628160177885], [48.59325000000014, 46.56104], [49.101160000000121, 46.39933], [48.645410000000105, 45.80629], [47.67591, 45.641490000000111], [46.68201, 44.6092], [47.59094, 43.660160000000118], [47.49252, 42.98658], [48.58437000000017, 41.80888], [47.987283156126033, 41.405819200194387], [47.815665724484653, 41.151416124021338], [47.373315464066387, 41.219732367511135], [46.686070591016708, 41.827137152669899], [46.404950799348924, 41.860675157227426], [45.7764, 42.092440000000224], [45.470279168485909, 42.502780666670041], [44.537622918482057, 42.711992702803677], [43.93121, 42.554960000000101], [43.755990000000182, 42.74083], [42.394400000000154, 43.2203], [40.922190000000128, 43.382150000000131], [40.076964959479838, 43.553104153002486], [39.95500857927108, 43.434997666999287], [38.68, 44.28], [37.539120000000104, 44.65721], [36.675460000000122, 45.24469], [37.40317, 45.40451], [38.23295, 46.24087], [37.67372, 46.63657], [39.14767, 47.044750000000128], [39.121200000000123, 47.26336], [38.22353803889947, 47.102189846375971], [38.2551123390298, 47.546400458356956], [38.77057, 47.825620000000228], [39.738277622238982, 47.898937079452068], [39.895620000000136, 48.23241], [39.67465, 48.783820000000127], [40.080789015469477, 49.307429917999364], [40.069040000000108, 49.60105], [38.594988234213552, 49.926461900423718], [38.010631137857068, 49.915661526074715], [37.393459506995228, 50.383953355503664], [36.626167840325387, 50.225590928745127], [35.35611616388811, 50.577197374059139], [35.37791, 50.77394], [35.02218305841793, 51.207572333371495], [34.224815708154402, 51.255993150428921], [34.141978387190612, 51.56641347920619], [34.391730584457228, 51.768881740925892], [33.75269982273587, 52.335074571331646], [32.715760532367163, 52.238465481162159], [32.412058139787767, 52.288694973349763], [32.15944000000021, 52.061250000000101], [31.78597, 52.10168], [31.540018344862254, 52.742052313846429], [31.305200636527978, 53.073995876673301], [31.49764, 53.167430000000124], [32.304519484188368, 53.132726141972839], [32.693643019346119, 53.351420803432141], [32.405598585751157, 53.618045355842], [31.731272820774585, 53.794029446012011], [31.791424187962399, 53.974638576872181], [31.384472283663818, 54.157056382862365], [30.757533807098774, 54.811770941784388], [30.971835971813245, 55.08154775656412], [30.873909132620064, 55.55097646750351], [29.896294386522435, 55.789463202530484], [29.371571893030783, 55.670090643936263], [29.229513380660389, 55.918344224666399], [28.176709425577933, 56.169129950578778], [27.855282016722519, 56.759326483784363], [27.770015903440985, 57.244258124411189], [27.288184848751648, 57.474528306703903], [27.716685825315771, 57.791899115624439], [27.420150000000202, 58.724570000000128], [28.131699253051856, 59.300825100330982], [27.98112, 59.47537], [29.1177, 60.028050000000107], [28.07, 60.503520000000137], [30.211107212044645, 61.780027777749673], [31.139991082491029, 62.357692776124431], [31.516092156711263, 62.867687486412898], [30.035872430142796, 63.552813625738551], [30.444684686003736, 64.204453436939062], [29.544429559047014, 64.948671576590542], [30.21765, 65.80598], [29.054588657352376, 66.944286200622017], [29.977426385220689, 67.69829702419274], [28.445943637818765, 68.364612942163987], [28.591929559043358, 69.064776923286686], [29.39955, 69.15692000000017], [31.101080000000103, 69.55811], [32.132720000000255, 69.905950000000232], [33.77547, 69.301420000000107], [36.51396, 69.06342], [40.292340000000159, 67.9324], [41.059870000000124, 67.457130000000106], [41.125950000000174, 66.79158000000011], [40.01583, 66.266180000000119], [38.38295, 65.99953], [33.918710000000168, 66.75961], [33.18444, 66.63253], [34.81477, 65.900150000000124], [34.87857425307876, 65.436212877048192], [34.943910000000152, 64.414370000000147], [36.23129, 64.10945], [37.012730000000111, 63.84983], [37.141970000000143, 64.33471], [36.539579035089801, 64.76446], [37.176040000000135, 65.143220000000113], [39.59345, 64.520790000000162], [40.4356, 64.76446], [39.762600000000148, 65.49682], [42.09309, 66.47623], [43.01604000000011, 66.41858], [43.94975000000013, 66.06908], [44.53226, 66.756340000000122], [43.69839, 67.35245], [44.187950000000136, 67.95051], [43.45282, 68.57079], [46.250000000000135, 68.25], [46.821340000000156, 67.68997], [45.55517, 67.56652], [45.56202, 67.010050000000192], [46.349150000000137, 66.66767], [47.894160000000248, 66.884550000000146], [48.13876, 67.52238], [50.227660000000142, 67.998670000000132], [53.717430000000164, 68.85738], [54.47171, 68.80815], [53.485820000000118, 68.20131], [54.72628, 68.09702], [55.442680000000124, 68.43866], [57.317020000000149, 68.46628], [58.802000000000206, 68.88082], [59.941420000000178, 68.27844], [61.077840000000165, 68.94069], [60.03, 69.52], [60.55, 69.85], [63.504000000000147, 69.54739], [64.888115, 69.234835000000132], [68.512160000000108, 68.09233000000016], [69.18068, 68.61563000000011], [68.16444, 69.14436], [68.13522, 69.35649], [66.930080000000103, 69.454610000000102], [67.25976, 69.92873], [66.724920000000125, 70.708890000000125], [66.69466, 71.028970000000228], [68.540060000000111, 71.934500000000227], [69.19636, 72.843360000000146], [69.94, 73.04000000000012], [72.58754, 72.77629], [72.79603, 72.22006], [71.84811, 71.40898], [72.47011, 71.09019], [72.79188, 70.39114], [72.564700000000201, 69.02085], [73.66787, 68.4079], [73.2387, 67.7404], [71.280000000000101, 66.320000000000149], [72.423010000000147, 66.172670000000167], [72.82077, 66.53267], [73.920990000000131, 66.789460000000119], [74.186510000000183, 67.28429], [75.052, 67.760470000000154], [74.469260000000148, 68.32899], [74.93584, 68.98918], [73.84236, 69.07146], [73.601870000000204, 69.62763], [74.3998, 70.63175], [73.1011, 71.447170000000241], [74.890820000000204, 72.12119], [74.65926, 72.83227], [75.158010000000175, 72.854970000000108], [75.68351, 72.300560000000118], [75.288980000000109, 71.33556], [76.35911, 71.152870000000135], [75.903130000000161, 71.87401], [77.5766500000001, 72.26717], [79.652020000000107, 72.32011], [81.5, 71.75], [80.61071, 72.582850000000107], [80.51109, 73.6482], [82.25, 73.85], [84.65526, 73.805910000000154], [86.822300000000226, 73.93688], [86.00956, 74.459670000000145], [87.166820000000143, 75.11643], [88.31571, 75.14393], [90.26, 75.64], [92.90058, 75.77333], [93.234210000000132, 76.0472], [95.860000000000127, 76.14], [96.67821, 75.91548], [98.922540000000197, 76.44689], [100.759670000000199, 76.43028], [101.03532, 76.86189], [101.990840000000105, 77.287540000000192], [104.3516, 77.69792], [106.066640000000135, 77.37389], [104.705000000000211, 77.1274], [106.970130000000111, 76.97419]]], [[[105.07547, 78.30689], [99.43814, 77.921], [101.2649, 79.23399], [102.08635, 79.34641], [102.837815, 79.28129], [105.37243, 78.71334], [105.07547, 78.30689]]], [[[51.136186557831266, 80.54728017854093], [49.793684523320692, 80.415427761548202], [48.894411248577526, 80.33956675894369], [48.75493655782175, 80.175468248200829], [47.586119012244147, 80.010181179515328], [46.502825962109647, 80.247246812654339], [47.072455275262897, 80.559424140129451], [44.846958042181107, 80.589809882317169], [46.799138624871226, 80.771917629713627], [48.31847741068465, 80.784009914869927], [48.52280602396668, 80.514568996900138], [49.097189568890897, 80.753985907708412], [50.039767693894603, 80.918885403151791], [51.522932977103679, 80.699725653801906], [51.136186557831266, 80.54728017854093]]], [[[99.93976, 78.88094], [97.75794, 78.7562], [94.97259, 79.044745], [93.31288, 79.4265], [92.5454, 80.14379], [91.18107, 80.34146], [93.77766, 81.0246], [95.940895, 81.2504], [97.88385, 80.746975], [100.186655, 79.780135], [99.93976, 78.88094]]]] } },
+            { "type": "Feature", "properties": { "admin": "Rwanda", "name": "Rwanda", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[30.419104852019235, -1.134659112150416], [30.816134881317705, -1.698914076345388], [30.758308953583104, -2.287250257988368], [30.469696079232978, -2.413857517103458], [29.938359002407935, -2.348486830254238], [29.632176141078585, -2.917857761246096], [29.02492638521678, -2.839257907730157], [29.117478875451546, -2.292211195488384], [29.254834832483336, -2.215109958508911], [29.29188683443661, -1.620055840667987], [29.579466180140876, -1.341313164885626], [29.821518588996003, -1.443322442229785], [30.419104852019235, -1.134659112150416]]] } },
+            { "type": "Feature", "properties": { "admin": "Western Sahara", "name": "W. Sahara", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-8.794883999049075, 27.120696316022503], [-8.81782833498667, 27.656425889592349], [-8.665589565454805, 27.656425889592349], [-8.66512447756419, 27.58947907155822], [-8.684399786809051, 27.395744126895998], [-8.687293667017398, 25.881056219988899], [-11.969418911171159, 25.933352769468261], [-11.93722449385332, 23.374594224536164], [-12.874221564169574, 23.284832261645171], [-13.118754441774708, 22.771220201096249], [-12.929101935263528, 21.327070624267559], [-16.845193650773989, 21.333323472574875], [-17.063423224342568, 20.99975210213082], [-17.020428432675736, 21.422310288981475], [-17.002961798561085, 21.420734157796574], [-14.750954555713532, 21.50060008390366], [-14.630832688851068, 21.860939846274899], [-14.221167771857251, 22.310163072188153], [-13.891110398809044, 23.691009019459297], [-12.500962693725368, 24.770116278578193], [-12.030758836301613, 26.030866197203036], [-11.718219773800353, 26.104091701760616], [-11.392554897496977, 26.883423977154358], [-10.551262579785272, 26.990807603456879], [-10.18942420087758, 26.860944729107398], [-9.735343390328877, 26.860944729107398], [-9.413037482124464, 27.088476060488514], [-8.794883999049075, 27.120696316022503]]] } },
+            { "type": "Feature", "properties": { "admin": "Saudi Arabia", "name": "Saudi Arabia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[42.779332309750963, 16.34789134364868], [42.64957278826607, 16.77463532151496], [42.347989129410706, 17.075805568911996], [42.270887892431219, 17.474721787989122], [41.754381951673949, 17.833046169500971], [41.221391229015573, 18.671599636301206], [40.939341261566533, 19.486485297111752], [40.247652215339819, 20.174634507726488], [39.801684604660934, 20.338862209550054], [39.139399448408277, 21.29190481209293], [39.023695916506782, 21.986875311770191], [39.066328973147577, 22.579655666590263], [38.492772251140075, 23.688451036060851], [38.023860304523616, 24.078685614512928], [37.483634881344379, 24.285494696545008], [37.154817742671177, 24.858482977797301], [37.209491408035994, 25.084541530858104], [36.931627231602583, 25.602959499610172], [36.639603712721218, 25.826227525327219], [36.249136590323808, 26.570135606384873], [35.640181512196385, 27.376520494083415], [35.130186801907875, 28.063351955674712], [34.632336053207972, 28.058546047471559], [34.787778761541936, 28.607427273059692], [34.832220493312938, 28.957483425404838], [34.956037225084252, 29.356554673778835], [36.068940870922049, 29.19749461518445], [36.501214227043583, 29.505253607698702], [36.740527784987243, 29.865283311476183], [37.503581984209028, 30.003776150018396], [37.668119744626374, 30.338665269485894], [37.998848911294367, 30.508499864213128], [37.002165561681004, 31.508412990844736], [39.004885695152545, 32.010216986614971], [39.195468377444961, 32.16100881604266], [40.399994337736238, 31.889991766887931], [41.889980910007829, 31.190008653278362], [44.709498732284736, 29.178891099559376], [46.568713413281742, 29.099025173452283], [47.459821811722819, 29.002519436147217], [47.708850538937376, 28.526062730416136], [48.416094191283939, 28.552004299426663], [48.807594842327163, 27.689627997339876], [49.299554477745815, 27.461218166609804], [49.470913527225647, 27.109999294538078], [50.152422316290874, 26.689663194275994], [50.212935418504671, 26.277026882425371], [50.113303257045928, 25.943972276304248], [50.23985883972874, 25.608049628190923], [50.527386509000728, 25.327808335872099], [50.660556675016885, 24.999895534764018], [50.810108270069563, 24.754742539971371], [51.112415398977006, 24.556330878186721], [51.389607781790623, 24.627385972588051], [51.579518670463258, 24.245497137951102], [51.617707553926969, 24.014219265228824], [52.000733270074321, 23.001154486578937], [55.006803012924898, 22.496947536707129], [55.208341098863187, 22.708329982997039], [55.666659376859812, 22.000001125572336], [54.999981723862355, 19.999994004796104], [52.000009800022227, 19.000003363516054], [49.116671583864857, 18.616667588774941], [48.183343540241324, 18.166669216377311], [47.466694777217626, 17.116681626854877], [47.000004917189749, 16.949999294497438], [46.749994337761642, 17.283338120996174], [46.366658563020529, 17.233315334537632], [45.399999220568752, 17.333335069238554], [45.216651238797184, 17.43332896572333], [44.062613152855072, 17.410358791569589], [43.791518589051904, 17.319976711491105], [43.380794305196098, 17.579986680567668], [43.115797560403351, 17.088440456607369], [43.218375278502734, 16.666889960186406], [42.779332309750963, 16.34789134364868]]] } },
+            { "type": "Feature", "properties": { "admin": "Sudan", "name": "Sudan", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.963392794971178, 9.464285229420623], [33.824963480907506, 9.48406084571536], [33.842130853028145, 9.981914637215992], [33.721959248183097, 10.325262079630191], [33.206938084561777, 10.720111638406591], [33.086766479716729, 11.441141267476493], [33.206938084561777, 12.179338268667093], [32.743419037302537, 12.24800775714999], [32.674749548819641, 12.024831919580716], [32.073891524594778, 11.973329803218517], [32.314234734284746, 11.681484477166519], [32.400071594888338, 11.080626452941486], [31.850715687025509, 10.531270545078822], [31.352861895524875, 9.810240916008693], [30.837840731903377, 9.707236683284519], [29.996639497988546, 10.290927335388684], [29.618957311332842, 10.084918869940223], [29.515953078608607, 9.793073543888053], [29.000931914987166, 9.604232450560287], [28.966597170745779, 9.398223985111654], [27.970889587744345, 9.398223985111654], [27.833550610778783, 9.604232450560287], [27.112520981708876, 9.638567194801622], [26.752006167173811, 9.466893473594492], [26.477328213242508, 9.552730334198086], [25.96230704962101, 10.136420986302422], [25.790633328413943, 10.411098940233726], [25.069603699343979, 10.27375996326799], [24.79492574541268, 9.810240916008693], [24.537415163602017, 8.917537565731719], [24.194067721187643, 8.728696472403895], [23.886979580860665, 8.619729712933063], [23.805813429466745, 8.666318874542522], [23.459012892355979, 8.954285793489019], [23.394779087017291, 9.26506785729225], [23.557249790142915, 9.681218166538766], [23.554304233502187, 10.089255275915319], [22.977543572692749, 10.714462591998538], [22.864165480244246, 11.142395127807616], [22.87622, 11.384610000000119], [22.50869, 11.67936], [22.49762, 12.26024], [22.28801, 12.64605], [21.93681, 12.588180000000133], [22.03759, 12.95546], [22.29658, 13.37232], [22.18329, 13.78648], [22.51202, 14.09318], [22.30351, 14.32682], [22.567950000000106, 14.944290000000134], [23.02459, 15.68072], [23.886890000000101, 15.61084], [23.837660000000135, 19.580470000000101], [23.850000000000129, 20.0], [25.00000000000011, 20.00304], [25.00000000000011, 22.0], [29.02, 22.0], [32.9, 22.0], [36.86623, 22.0], [37.18872, 21.01885], [36.96941, 20.837440000000125], [37.114700000000134, 19.80796], [37.48179, 18.61409], [37.86276, 18.36786], [38.410089959473218, 17.998307399970312], [37.904000000000103, 17.42754], [37.16747, 17.263140000000128], [36.852530000000108, 16.95655], [36.75389, 16.29186], [36.32322, 14.82249], [36.42951, 14.42211], [36.27022, 13.563330000000118], [35.86363, 12.57828], [35.26049, 12.08286], [34.831630000000125, 11.318960000000116], [34.73115000000012, 10.910170000000106], [34.25745, 10.63009], [33.96162, 9.58358], [33.963392794971178, 9.464285229420623]]] } },
+            { "type": "Feature", "properties": { "admin": "South Sudan", "name": "S. Sudan", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.963392794971178, 9.464285229420623], [33.97498, 8.68456], [33.82550000000014, 8.37916], [33.294800000000116, 8.35458], [32.95418, 7.7849700000001], [33.56829, 7.71334], [34.0751, 7.22595], [34.25032, 6.82607], [34.70702, 6.59422000000012], [35.298007118233095, 5.506], [34.620196267853935, 4.847122742082034], [34.005, 4.249884947362147], [33.39, 3.79], [32.68642, 3.79232], [31.881450000000136, 3.55827], [31.24556, 3.7819], [30.83385, 3.50917], [29.95349, 4.1737], [29.715995314256013, 4.600804755060152], [29.159078403446635, 4.389267279473244], [28.696677687298795, 4.455077215996993], [28.428993768026992, 4.287154649264607], [27.979977247842946, 4.408413397637388], [27.374226108517625, 5.233944403500173], [27.213409051225248, 5.550953477394613], [26.465909458123289, 5.946717434101855], [26.213418409945113, 6.546603298362127], [25.796647983511257, 6.979315904158169], [25.124130893664805, 7.500085150579422], [25.114932488716867, 7.825104071479244], [24.567369012152191, 8.229187933785452], [23.886979580860665, 8.619729712933063], [24.194067721187643, 8.728696472403895], [24.537415163602017, 8.917537565731719], [24.79492574541268, 9.810240916008693], [25.069603699343979, 10.27375996326799], [25.790633328413943, 10.411098940233726], [25.96230704962101, 10.136420986302422], [26.477328213242508, 9.552730334198086], [26.752006167173811, 9.466893473594492], [27.112520981708876, 9.638567194801622], [27.833550610778783, 9.604232450560287], [27.970889587744345, 9.398223985111654], [28.966597170745779, 9.398223985111654], [29.000931914987166, 9.604232450560287], [29.515953078608607, 9.793073543888053], [29.618957311332842, 10.084918869940223], [29.996639497988546, 10.290927335388684], [30.837840731903377, 9.707236683284519], [31.352861895524875, 9.810240916008693], [31.850715687025509, 10.531270545078822], [32.400071594888338, 11.080626452941486], [32.314234734284746, 11.681484477166519], [32.073891524594778, 11.973329803218517], [32.674749548819641, 12.024831919580716], [32.743419037302537, 12.24800775714999], [33.206938084561777, 12.179338268667093], [33.086766479716729, 11.441141267476493], [33.206938084561777, 10.720111638406591], [33.721959248183097, 10.325262079630191], [33.842130853028145, 9.981914637215992], [33.824963480907506, 9.48406084571536], [33.963392794971178, 9.464285229420623]]] } },
+            { "type": "Feature", "properties": { "admin": "Senegal", "name": "Senegal", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-16.713728807023468, 13.594958604379853], [-17.126106736712611, 14.373515733289221], [-17.625042690490655, 14.72954051356407], [-17.185172898822227, 14.91947724045286], [-16.700706346085919, 15.621527411354107], [-16.463098110407881, 16.135036119038457], [-16.120690070041928, 16.45566254319338], [-15.623666144258689, 16.369337063049809], [-15.135737270558813, 16.587282416240779], [-14.577347581428977, 16.598263658102805], [-14.099521450242175, 16.304302273010489], [-13.43573767745306, 16.039383042866188], [-12.830658331747513, 15.303691514542942], [-12.170750291380299, 14.616834214735503], [-12.124887457721256, 13.994727484589784], [-11.927716030311613, 13.422075100147392], [-11.553397793005427, 13.141213690641063], [-11.467899135778522, 12.754518947800973], [-11.513942836950587, 12.442987575729415], [-11.658300950557928, 12.386582749882834], [-12.20356482588563, 12.465647691289401], [-12.278599005573438, 12.354440008997285], [-12.499050665730561, 12.332089952031053], [-13.217818162478235, 12.575873521367964], [-13.700476040084322, 12.586182969610192], [-15.548476935274005, 12.628170070847343], [-15.816574266004251, 12.515567124883345], [-16.147716844130581, 12.547761542201185], [-16.67745195155457, 12.38485158940105], [-16.84152462408127, 13.151393947802557], [-15.931295945692208, 13.130284125211331], [-15.691000535534991, 13.270353094938455], [-15.511812506562931, 13.278569647672864], [-15.141163295949463, 13.509511623585235], [-14.712197231494626, 13.298206691943774], [-14.277701788784553, 13.28058502853224], [-13.844963344772404, 13.505041612191999], [-14.046992356817478, 13.794067898000446], [-14.376713833055785, 13.625680243377371], [-14.687030808968483, 13.63035696049978], [-15.081735398813816, 13.876491807505982], [-15.398770310924457, 13.860368760630916], [-15.624596320039936, 13.623587347869556], [-16.713728807023468, 13.594958604379853]]] } },
+            { "type": "Feature", "properties": { "admin": "Solomon Islands", "name": "Solomon Is.", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[162.119024693040842, -10.482719008021133], [162.398645868172196, -10.826367282762119], [161.700032180018354, -10.820011081590222], [161.319796991214702, -10.204751478723123], [161.917383254237933, -10.446700534713653], [162.119024693040842, -10.482719008021133]]], [[[160.852228631837903, -9.872937106977002], [160.462588332357228, -9.89520964929484], [159.849447463214176, -9.794027194867367], [159.640002883135139, -9.639979750205269], [159.70294477766663, -9.242949720906777], [160.362956170898428, -9.400304457235533], [160.688517694337179, -9.610162448772808], [160.852228631837903, -9.872937106977002]]], [[[161.679981724289121, -9.599982191611373], [161.52939660059053, -9.784312025596433], [160.788253208660507, -8.917543226764918], [160.579997186524338, -8.320008640173965], [160.92002811100491, -8.320008640173965], [161.280006138349961, -9.120011488484449], [161.679981724289121, -9.599982191611373]]], [[[159.875027297198585, -8.337320244991714], [159.917401971677975, -8.538289890174864], [159.133677199539335, -8.114181410355398], [158.586113722974687, -7.754823500197713], [158.211149530264834, -7.421872246941147], [158.359977655265425, -7.320017998893915], [158.820001255527671, -7.56000335045739], [159.640002883135139, -8.020026950719567], [159.875027297198585, -8.337320244991714]]], [[[157.53842573468927, -7.347819919466928], [157.339419793933217, -7.404767347852554], [156.902030471014768, -7.176874281445391], [156.491357863591304, -6.765943291860394], [156.542827590153934, -6.599338474151478], [157.140000441718882, -7.021638278840653], [157.53842573468927, -7.347819919466928]]]] } },
+            { "type": "Feature", "properties": { "admin": "Sierra Leone", "name": "Sierra Leone", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-11.438779466182053, 6.785916856305746], [-11.708194545935736, 6.860098374860724], [-12.428098924193815, 7.262942002792029], [-12.949049038128193, 7.798645738145736], [-13.124025437868479, 8.163946438016977], [-13.246550258832512, 8.903048610871506], [-12.711957566773076, 9.342711696810765], [-12.596719122762206, 9.620188300001969], [-12.425928514037562, 9.835834051955953], [-12.150338100625003, 9.858571682164378], [-11.917277390988655, 10.046983954300556], [-11.117481248407328, 10.045872911006283], [-10.839151984083299, 9.688246161330367], [-10.622395188835037, 9.267910061068276], [-10.65477047366589, 8.977178452994194], [-10.494315151399629, 8.715540676300433], [-10.505477260774667, 8.348896389189603], [-10.230093553091276, 8.406205552601291], [-10.695594855176477, 7.939464016141085], [-11.14670427086838, 7.396706447779534], [-11.199801805048278, 7.105845648624735], [-11.438779466182053, 6.785916856305746]]] } },
+            { "type": "Feature", "properties": { "admin": "El Salvador", "name": "El Salvador", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-87.793111131526558, 13.384480495655051], [-87.904112108089507, 13.149016831917134], [-88.483301561216791, 13.163951320849488], [-88.843227912129692, 13.259733588102474], [-89.256742723329282, 13.4585328231293], [-89.812393561547637, 13.520622056527994], [-90.095554572290951, 13.73533763270073], [-90.064677903996568, 13.881969509328924], [-89.7219339668207, 14.134228013561694], [-89.5342193265205, 14.244815578666302], [-89.587342698916544, 14.362586167859485], [-89.353325975282772, 14.424132798719112], [-89.058511929057644, 14.340029405164085], [-88.843072882832814, 14.140506700085169], [-88.541230841815974, 13.980154730683475], [-88.50399797234968, 13.845485948130854], [-88.065342576840123, 13.964625962779774], [-87.859515347021585, 13.893312486216979], [-87.723502977229387, 13.785050360565503], [-87.793111131526558, 13.384480495655051]]] } },
+            { "type": "Feature", "properties": { "admin": "Somaliland", "name": "Somaliland", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[48.938129510296491, 9.451748968946672], [48.486735874226994, 8.837626247589979], [47.78942, 8.003], [46.948328484897942, 7.996876532417386], [43.67875, 9.183580000000116], [43.296975132018744, 9.540477403191742], [42.92812, 10.021940000000139], [42.55876, 10.572580000000126], [42.776851841000948, 10.926878566934416], [43.145304803242126, 11.462039699748853], [43.470659620951658, 11.27770986576388], [43.666668328634834, 10.864169216348158], [44.117803582542805, 10.445538438351603], [44.614259067570849, 10.442205308468941], [45.556940545439133, 10.698029486529775], [46.645401238802997, 10.816549383991171], [47.525657586462778, 11.127228094929986], [48.021596307167769, 11.193063869669741], [48.378783807169263, 11.375481675660122], [48.948206414593457, 11.410621649618516], [48.942005242718423, 11.394266058798163], [48.938491245322595, 10.982327378783451], [48.938232863161076, 9.973500067581481], [48.938129510296491, 9.451748968946672]]] } },
+            { "type": "Feature", "properties": { "admin": "Somalia", "name": "Somalia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[49.72862, 11.5789], [50.25878, 11.67957], [50.73202, 12.0219], [51.1112, 12.02464], [51.13387, 11.74815], [51.04153, 11.16651], [51.04531, 10.6409], [50.83418, 10.27972], [50.55239, 9.19874], [50.07092, 8.08173], [49.4527, 6.80466], [48.59455, 5.33911], [47.74079, 4.2194], [46.56476, 2.85529], [45.56399, 2.04576], [44.06815, 1.05283], [43.13597, 0.2922], [42.04157, -0.91916], [41.81095, -1.44647], [41.58513, -1.68325], [40.993, -0.85829], [40.98105, 2.78452], [41.855083092643966, 3.918911920483726], [42.12861, 4.23413], [42.76967, 4.25259], [43.66087, 4.95755], [44.9636, 5.00162], [47.78942, 8.003], [48.486735874226937, 8.837626247589993], [48.938129510296442, 9.451748968946616], [48.938232863161026, 9.973500067581508], [48.938491245322481, 10.982327378783465], [48.942005242718345, 11.394266058798136], [48.948204758509732, 11.410617281697961], [49.26776, 11.43033], [49.72862, 11.5789]]] } },
+            { "type": "Feature", "properties": { "admin": "Republic of Serbia", "name": "Serbia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.874312778413408, 45.416375433934306], [21.483526238702204, 45.181170152357865], [21.562022739353718, 44.768947251965635], [22.145087924902892, 44.478422349620573], [22.459022251075961, 44.702517198254426], [22.705725538837434, 44.578002834647002], [22.47400841644065, 44.409227606781762], [22.657149692483067, 44.234923000661347], [22.410446404721593, 44.008063462900047], [22.500156691180219, 43.642814439460999], [22.986018507588479, 43.211161200527094], [22.604801466571352, 42.898518785161109], [22.43659467946139, 42.580321153323943], [22.545011834409642, 42.461362006188025], [22.380525750424674, 42.320259507815074], [21.917080000000105, 42.30364], [21.576635989402117, 42.245224397061847], [21.54332, 42.32025], [21.66292, 42.43922], [21.77505, 42.6827], [21.63302, 42.67717], [21.43866, 42.86255], [21.27421, 42.90959], [21.143395, 43.068685000000123], [20.95651, 43.13094], [20.81448, 43.27205], [20.63508, 43.21671], [20.49679, 42.88469], [20.25758, 42.81275], [20.3398, 42.89852], [19.95857, 43.10604], [19.63, 43.213779970270522], [19.48389, 43.35229], [19.21852, 43.52384], [19.454, 43.568100000000115], [19.59976, 44.03847], [19.11761, 44.42307], [19.36803, 44.863], [19.00548, 44.86023], [19.390475701584588, 45.236515611342369], [19.072768995854172, 45.521511135432078], [18.82982, 45.90888], [19.596044549241636, 46.171729844744547], [20.22019249846289, 46.127468980486569], [20.76217492033998, 45.734573065771478], [20.874312778413408, 45.416375433934306]]] } },
+            { "type": "Feature", "properties": { "admin": "Suriname", "name": "Suriname", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.147436489476874, 5.973149929219161], [-55.949318406789786, 5.772877915872], [-55.841779751190408, 5.953125311706059], [-55.033250291551759, 6.025291449401662], [-53.958044603070888, 5.756548163267764], [-54.478632981979224, 4.896755682795585], [-54.3995422023565, 4.212611395683466], [-54.006930508018996, 3.620037746592558], [-54.181726040246261, 3.189779771330421], [-54.269705166223183, 2.732391669115046], [-54.524754197799709, 2.311848863123785], [-55.097587449755125, 2.523748073736612], [-55.569755011605984, 2.42150625244713], [-55.973322109589361, 2.510363877773016], [-56.073341844290283, 2.220794989425499], [-55.905600145070871, 2.021995754398659], [-55.995698004771739, 1.817667141116601], [-56.53938574891454, 1.89952260986692], [-57.150097825739898, 2.768926906745406], [-57.281433478409703, 3.333491929534119], [-57.601568976457848, 3.334654649260684], [-58.044694383360664, 4.060863552258382], [-57.860209520078691, 4.576801052260449], [-57.914288906472123, 4.812626451024413], [-57.307245856339492, 5.073566595882225], [-57.147436489476874, 5.973149929219161]]] } },
+            { "type": "Feature", "properties": { "admin": "Slovakia", "name": "Slovakia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[18.85314415861361, 49.496229763377634], [18.909574822676316, 49.435845852244562], [19.320712517990469, 49.571574001659179], [19.825022820726865, 49.217125352569219], [20.415839471119849, 49.431453355499755], [20.887955356538406, 49.328772284535823], [21.607808058364206, 49.470107326854077], [22.558137648211751, 49.08573802346713], [22.280841912533553, 48.825392157580659], [22.085608351334848, 48.422264309271782], [21.872236362401729, 48.319970811550007], [20.801293979584919, 48.62385407164237], [20.473562045989862, 48.562850043321809], [20.239054396249344, 48.327567247096916], [19.769470656013109, 48.2026911484636], [19.66136355965849, 48.266614895208647], [19.174364861739885, 48.111378892603859], [18.777024773847668, 48.081768296900627], [18.696512892336923, 47.88095368101439], [17.857132602620023, 47.758428860050365], [17.488472934649813, 47.867466132186209], [16.979666782304033, 48.123497015976298], [16.879982944412998, 48.470013332709463], [16.960288120194573, 48.596982326850593], [17.101984897538895, 48.8169688991171], [17.545006951577101, 48.800019029325362], [17.886484816161808, 48.903475246773695], [17.913511590250462, 48.996492824899072], [18.104972771891848, 49.043983466175298], [18.170498488037961, 49.271514797556421], [18.399993523846174, 49.315000515330034], [18.554971144289478, 49.495015367218777], [18.85314415861361, 49.496229763377634]]] } },
+            { "type": "Feature", "properties": { "admin": "Slovenia", "name": "Slovenia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[13.806475457421524, 46.509306138691201], [14.632471551174827, 46.431817328469535], [15.137091912504982, 46.658702704447016], [16.011663852612653, 46.683610744811688], [16.202298211337361, 46.852385972676949], [16.370504998447412, 46.841327216166498], [16.564808383864854, 46.503750922219822], [15.768732944408548, 46.238108222023442], [15.671529575267552, 45.834153550797865], [15.323953891672403, 45.731782538427673], [15.327674594797424, 45.452316392593218], [14.935243767972931, 45.471695054702671], [14.595109490627804, 45.6349409043127], [14.411968214585411, 45.466165676447446], [13.715059848697221, 45.500323798192369], [13.937630242578305, 45.591015936864608], [13.698109978905475, 46.016778062517339], [13.806475457421524, 46.509306138691201]]] } },
+            { "type": "Feature", "properties": { "admin": "Sweden", "name": "Sweden", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.183173455501922, 65.723740546320158], [21.213516879977213, 65.02600535751526], [21.369631381930954, 64.413587958424273], [19.778875766690216, 63.609554348395022], [17.847779168375208, 62.749400132896803], [17.11955488451812, 61.341165676510954], [17.831346062906388, 60.636583360427394], [18.787721795332086, 60.081914374422581], [17.869224887776337, 58.95376618105869], [16.829185011470084, 58.719826972073385], [16.44770958829147, 57.041118069071871], [15.87978559740378, 56.104301866268649], [14.666681349352071, 56.20088511822216], [14.100721062891461, 55.407781073622637], [12.942910597392054, 55.361737372450563], [12.625100538797025, 56.307080186581956], [11.787942335668671, 57.441817125063061], [11.027368605196866, 58.856149400459344], [11.468271925511145, 59.432393296946024], [12.300365838274896, 60.117932847730025], [12.631146681375181, 61.293571682370121], [11.992064243221559, 61.800362453856543], [11.930569288794228, 63.128317572676963], [12.57993533697393, 64.066218980558318], [13.571916131248711, 64.049114081469696], [13.9199052263022, 64.445420640716065], [13.555689731509087, 64.7870276963815], [15.108411492582999, 66.19386688909546], [16.108712192456775, 67.302455552836875], [16.768878614985478, 68.013936672631388], [17.729181756265344, 68.010551866316263], [17.993868442464329, 68.567391262477344], [19.878559604581248, 68.407194322372561], [20.025268995857882, 69.065138658312691], [20.645592889089521, 69.106247260200846], [21.978534783626113, 68.616845608180682], [23.539473097434435, 67.936008612735236], [23.565879754335576, 66.396050930437411], [23.903378533633795, 66.006927395279604], [22.183173455501922, 65.723740546320158]]] } },
+            { "type": "Feature", "properties": { "admin": "Swaziland", "name": "Swaziland", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[32.071665480281062, -26.733820082304902], [31.868060337051073, -27.17792734142127], [31.282773064913325, -27.285879408478991], [30.685961948374477, -26.743845310169526], [30.676608514129633, -26.398078301704604], [30.949666782359905, -26.022649021104144], [31.044079624157146, -25.731452325139436], [31.333157586397899, -25.660190525008943], [31.837777947728057, -25.843331801051342], [31.985779249811962, -26.29177988048022], [32.071665480281062, -26.733820082304902]]] } },
+            { "type": "Feature", "properties": { "admin": "Syria", "name": "Syria", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[38.792340529136077, 33.378686428352218], [36.834062127435537, 32.312937526980768], [35.719918247222743, 32.709192409794859], [35.700797967274745, 32.716013698857374], [35.836396925608618, 32.868123277308506], [35.821100701650231, 33.277426459276292], [36.066460402172048, 33.824912421192543], [36.611750115715886, 34.201788641897174], [36.448194207512095, 34.59393524834406], [35.998402540843628, 34.644914048799997], [35.905023227692219, 35.410009467097318], [36.149762811026527, 35.821534735653664], [36.417550083163029, 36.040616970355053], [36.685389031731795, 36.259699205056457], [36.739494256341395, 36.817520453431079], [37.066761102045824, 36.623036200500614], [38.167727492024191, 36.901210435527766], [38.699891391765895, 36.712927354472335], [39.522580193852541, 36.716053778625984], [40.673259311695681, 37.091276353497285], [41.212089471203043, 37.074352321921687], [42.349591098811764, 37.22987254490409], [41.837064243340954, 36.605853786763568], [41.289707472505448, 36.358814602192261], [41.383965285005807, 35.628316555314349], [41.00615888851992, 34.419372260062111], [38.792340529136077, 33.378686428352218]]] } },
+            { "type": "Feature", "properties": { "admin": "Chad", "name": "Chad", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[14.495787387762899, 12.859396267137353], [14.595781284247604, 13.330426947477859], [13.954476759505607, 13.353448798063765], [13.956698846094124, 13.996691189016925], [13.540393507550785, 14.36713369390122], [13.97217, 15.68437], [15.247731154041842, 16.627305813050778], [15.300441114979716, 17.927949937405], [15.68574059414777, 19.957180080642384], [15.90324669766431, 20.387618923417499], [15.487148064850143, 20.730414537025634], [15.47106, 21.04845], [15.096887648181847, 21.308518785074902], [14.8513, 22.862950000000119], [15.86085, 23.40972], [19.84926, 21.49509], [23.837660000000135, 19.580470000000101], [23.886890000000101, 15.61084], [23.02459, 15.68072], [22.567950000000106, 14.944290000000134], [22.30351, 14.32682], [22.51202, 14.09318], [22.18329, 13.78648], [22.29658, 13.37232], [22.03759, 12.95546], [21.93681, 12.588180000000133], [22.28801, 12.64605], [22.49762, 12.26024], [22.50869, 11.67936], [22.87622, 11.384610000000119], [22.864165480244246, 11.142395127807616], [22.231129184668756, 10.971888739460608], [21.723821648859538, 10.567055568885959], [21.000868361096305, 9.475985215691479], [20.059685499764267, 9.012706000194838], [19.094008009526071, 9.074846910025768], [18.81200971850927, 8.982914536978623], [18.911021762780589, 8.630894680206435], [18.389554884523303, 8.281303615751879], [17.964929640380884, 7.890914008002992], [16.705988396886365, 7.508327541529978], [16.4561845231874, 7.734773667832938], [16.290561557691884, 7.754307359239417], [16.106231723706738, 7.497087917506461], [15.279460483469164, 7.42192454673801], [15.436091749745737, 7.692812404811887], [15.120865512765302, 8.382150173369437], [14.979995558337688, 8.796104234243442], [14.544466586981851, 8.965861314322238], [13.954218377344088, 9.549494940626685], [14.17146609869911, 10.021378282100043], [14.627200555081057, 9.920919297724591], [14.909353875394796, 9.992129421422758], [15.46787275560524, 9.982336737503543], [14.923564894275042, 10.891325181517514], [14.960151808337679, 11.555574042197234], [14.89336, 12.21905], [14.495787387762899, 12.859396267137353]]] } },
+            { "type": "Feature", "properties": { "admin": "Togo", "name": "Togo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[1.865240512712318, 6.14215770102973], [1.060121697604927, 5.928837388528875], [0.836931186536333, 6.279978745952147], [0.570384148774849, 6.914358628767188], [0.490957472342245, 7.411744289576474], [0.712029249686878, 8.312464504423827], [0.461191847342121, 8.677222601756013], [0.365900506195885, 9.46500397382948], [0.367579990245389, 10.191212876827176], [-0.049784715159944, 10.706917832883928], [0.023802524423701, 11.018681748900802], [0.899563022474069, 10.997339382364258], [0.772335646171484, 10.470808213742357], [1.077795037448737, 10.175606594275022], [1.425060662450136, 9.825395412632998], [1.46304284018467, 9.334624335157086], [1.664477573258381, 9.128590399609378], [1.618950636409238, 6.832038072126236], [1.865240512712318, 6.14215770102973]]] } },
+            { "type": "Feature", "properties": { "admin": "Thailand", "name": "Thailand", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[102.58493248902667, 12.186594956913279], [101.687157830819928, 12.645740057826568], [100.831809523524839, 12.627084865769204], [100.978467238369191, 13.412721665902563], [100.097797479251099, 13.406856390837429], [100.018732537844528, 12.307001044153353], [99.478920526123602, 10.846366685423545], [99.153772414143134, 9.963061428258554], [99.222398716226749, 9.239255479362425], [99.873831821698118, 9.207862046745118], [100.279646844486194, 8.29515289960605], [100.45927412313273, 7.429572658717175], [101.017327915452697, 6.856868597842476], [101.623079054778032, 6.740622463401918], [102.141186964936367, 6.221636053894626], [101.81428185425797, 5.810808417174242], [101.154218784593837, 5.691384182147713], [101.075515578213327, 6.20486705161592], [100.259596388756933, 6.642824815289542], [100.085756870527092, 6.46448944745029], [99.690690545655727, 6.848212795433595], [99.519641554769606, 7.343453884302759], [98.988252801512289, 7.907993068875325], [98.503786248775967, 8.382305202666286], [98.339661899816988, 7.794511623562384], [98.150009393305808, 8.350007432483876], [98.259150018306229, 8.973922837759799], [98.553550653073017, 9.932959906448543], [99.038120558673953, 10.960545762572435], [99.587286004639694, 11.892762762901695], [99.196353794351637, 12.804748439988666], [99.212011753336071, 13.269293728076462], [99.097755161538728, 13.827502549693275], [98.430819126379859, 14.622027696180831], [98.192074009191373, 15.123702500870349], [98.537375929765687, 15.308497422746081], [98.90334842325673, 16.177824204976115], [98.493761020911322, 16.837835598207928], [97.859122755934848, 17.567946071843657], [97.375896437573516, 18.445437730375811], [97.797782830804394, 18.627080389881751], [98.253723992915582, 19.708203029860041], [98.959675734454848, 19.752980658440944], [99.543309360759281, 20.186597601802056], [100.115987583417819, 20.41784963630818], [100.548881056726856, 20.109237982661124], [100.606293573003128, 19.508344427971217], [101.282014601651667, 19.462584947176762], [101.035931431077742, 18.408928330961611], [101.059547560635139, 17.512497259994486], [102.113591750092453, 18.109101670804161], [102.413004998791592, 17.932781683824281], [102.998705682387694, 17.961694647691598], [103.200192091893726, 18.309632066312769], [103.956476678485288, 18.240954087796872], [104.716947056092465, 17.428858954330078], [104.779320509868768, 16.441864935771445], [105.589038527450128, 15.570316066952856], [105.544338413517664, 14.723933620660414], [105.218776890078871, 14.27321177821069], [104.281418084736586, 14.416743068901363], [102.988422072361601, 14.225721136934464], [102.348099399833004, 13.39424734135822], [102.58493248902667, 12.186594956913279]]] } },
+            { "type": "Feature", "properties": { "admin": "Tajikistan", "name": "Tajikistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[71.014198032520156, 40.244365546218226], [70.648018833299957, 39.935753892571157], [69.559609816368507, 40.103211371412968], [69.464886915977516, 39.526683254548693], [70.549161818325601, 39.604197902986492], [71.784693637991992, 39.279463202464363], [73.67537926625478, 39.431236884105594], [73.928852166646408, 38.505815334622724], [74.257514276022718, 38.606506862943441], [74.864815708316812, 38.378846340481587], [74.829985792952087, 37.990007025701388], [74.980002475895404, 37.419990139305888], [73.948695916646486, 37.421566270490786], [73.260055779924983, 37.495256862938994], [72.636889682917271, 37.047558091778349], [72.193040805962383, 36.94828766534566], [71.84463829945058, 36.738171291646914], [71.448693475230229, 37.065644843080513], [71.541917759084768, 37.905774441065631], [71.239403924448155, 37.953265082341879], [71.348131137990251, 38.258905341132156], [70.806820509732873, 38.486281643216408], [70.376304152309274, 38.138395901027515], [70.270574171840124, 37.73516469985401], [70.116578403610319, 37.588222764632086], [69.518785434857946, 37.608996690413413], [69.196272820924364, 37.15114350030742], [68.859445835245921, 37.344335842430588], [68.135562371701369, 37.023115139304302], [67.829999627559502, 37.144994004864678], [68.392032505165943, 38.157025254868728], [68.176025018185911, 38.901553453113898], [67.442219679641298, 39.140143541005479], [67.701428664017342, 39.580478420564518], [68.536416456989414, 39.533452867178923], [69.011632928345477, 40.086158148756653], [69.329494663372813, 40.727824408524839], [70.666622348925031, 40.960213324541407], [70.458159621059608, 40.49649485937028], [70.601406691372674, 40.218527330072284], [71.014198032520156, 40.244365546218226]]] } },
+            { "type": "Feature", "properties": { "admin": "Turkmenistan", "name": "Turkmenistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[61.21081709172573, 35.650072333309218], [61.123070509694131, 36.491597194966239], [60.377637973883864, 36.52738312432836], [59.234761997316795, 37.412987982730336], [58.436154412678192, 37.522309475243794], [57.330433790928964, 38.029229437810933], [56.619366082592805, 38.121394354803478], [56.180374790273319, 37.935126654607423], [55.511578403551894, 37.964117133123153], [54.800303989486558, 37.392420762678178], [53.921597934795543, 37.198918361961255], [53.735511102112504, 37.906136176091685], [53.880928582581831, 38.952093003895349], [53.101027866432894, 39.290573635407121], [53.357808058491216, 39.975286363274442], [52.693972609269807, 40.033629055331964], [52.91525109234361, 40.87652334244472], [53.85813927594112, 40.631034450842165], [54.736845330632136, 40.951014919593455], [54.0083109881813, 41.551210842447404], [53.721713494690576, 42.123191433270016], [52.916749708880069, 41.868116563477322], [52.81468875510361, 41.135370591794704], [52.502459751196135, 41.783315538086356], [52.94429324729164, 42.116034247397586], [54.079417759014937, 42.324109402020817], [54.755345493392625, 42.04397146256656], [55.455251092353755, 41.259859117185826], [55.968191359282898, 41.308641669269356], [57.096391229079089, 41.32231008561056], [56.93221520368779, 41.82602610937559], [57.786529982337065, 42.170552883465511], [58.629010857991453, 42.751551011723045], [59.976422153569771, 42.223081976890199], [60.083340691981654, 41.425146185871391], [60.46595299667068, 41.22032664648254], [61.547178989513547, 41.2663703476546], [61.882714064384679, 41.084856879229392], [62.374260288344992, 40.053886216790382], [63.518014764261018, 39.363256537425627], [64.170223016216752, 38.892406724598231], [65.215998976507379, 38.402695013984292], [66.546150343700205, 37.974684963526855], [66.518606805288655, 37.362784328758785], [66.217384881459324, 37.393790188133913], [65.745630731066811, 37.661164048812061], [65.588947788357828, 37.305216783185628], [64.746105177677393, 37.111817735333297], [64.546479119733888, 36.31207326918426], [63.982895949158696, 36.007957465146596], [63.193538445900337, 35.857165635718907], [62.984662306576588, 35.404040839167614], [62.230651483005879, 35.270663967422287], [61.21081709172573, 35.650072333309218]]] } },
+            { "type": "Feature", "properties": { "admin": "East Timor", "name": "Timor-Leste", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[124.96868248911619, -8.892790215697081], [125.086246372580248, -8.656887302284678], [125.947072381698234, -8.432094821815033], [126.64470421763852, -8.39824675866385], [126.957243280139792, -8.273344821814396], [127.335928175974615, -8.397316582882601], [126.967991978056517, -8.668256117388891], [125.925885044458568, -9.106007175333351], [125.088520135601073, -9.393173109579292], [125.070019972840583, -9.08998748132287], [124.96868248911619, -8.892790215697081]]] } },
+            { "type": "Feature", "properties": { "admin": "Trinidad and Tobago", "name": "Trinidad and Tobago", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-61.68, 10.76], [-61.105, 10.89], [-60.895, 10.855], [-60.935, 10.11], [-61.77, 10.0], [-61.95, 10.09], [-61.66, 10.365], [-61.68, 10.76]]] } },
+            { "type": "Feature", "properties": { "admin": "Tunisia", "name": "Tunisia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[9.482139926805273, 30.307556057246181], [9.055602654668148, 32.102691962201284], [8.439102817426116, 32.506284898400814], [8.430472853233367, 32.748337307255944], [7.612641635782181, 33.344114895148955], [7.524481642292242, 34.097376410451453], [8.140981479534302, 34.655145982393783], [8.376367628623766, 35.479876003555937], [8.217824334352313, 36.433176988260271], [8.420964389691674, 36.946427313783154], [9.509993523810605, 37.349994411766531], [10.210002475636315, 37.230001735984807], [10.180650262094529, 36.724037787415071], [11.028867221733348, 37.09210317641395], [11.100025668999249, 36.899996039368908], [10.600004510143092, 36.410000108377368], [10.593286573945134, 35.947444362932806], [10.939518670300686, 35.698984076473486], [10.807847120821007, 34.833507188449182], [10.149592726287123, 34.330773016897702], [10.339658644256613, 33.785741685515312], [10.856836378633684, 33.768740139291275], [11.108500603895118, 33.293342800422188], [11.488787469131008, 33.136995754523134], [11.432253452203692, 32.368903103152867], [10.944789666394453, 32.081814683555358], [10.636901482799484, 31.761420803345747], [9.950225050505081, 31.376069647745251], [10.056575148161752, 30.961831366493595], [9.97001712407285, 30.539324856075236], [9.482139926805273, 30.307556057246181]]] } },
+            { "type": "Feature", "properties": { "admin": "Turkey", "name": "Turkey", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[36.913127068842151, 41.335358384764291], [38.347664829264502, 40.948586127275711], [39.512606642420238, 41.102762763018561], [40.373432651538245, 41.013672593747337], [41.554084100110707, 41.535656236327604], [42.619548781104548, 41.58317271581992], [43.582745802592704, 41.09214325618256], [43.752657911968491, 40.740200914058811], [43.656436395040963, 40.253563951166157], [44.400008579288759, 40.005000311842302], [44.79398969908199, 39.713002631177027], [44.109225294782355, 39.428136298168049], [44.421402622257595, 38.281281236314513], [44.225755649600522, 37.971584377589345], [44.772699008977739, 37.170444647768441], [44.293451775902852, 37.001514390606353], [43.942258742047343, 37.256227525372928], [42.77912560402185, 37.385263576805798], [42.349591098811764, 37.229872544904104], [41.212089471203015, 37.074352321921729], [40.673259311695702, 37.091276353497356], [39.522580193852512, 36.716053778626012], [38.699891391765917, 36.712927354472313], [38.167727492024156, 36.90121043552778], [37.066761102045824, 36.623036200500614], [36.739494256341366, 36.817520453431108], [36.685389031731816, 36.259699205056499], [36.417550083163086, 36.040616970355096], [36.149762811026584, 35.821534735653664], [35.782084995269848, 36.274995429014915], [36.160821567537049, 36.650605577128367], [35.550936313628334, 36.565442816711325], [34.714553256984367, 36.795532131490909], [34.026894972476455, 36.219960028623966], [32.509158156064096, 36.107563788389193], [31.69959516777956, 36.644275214172602], [30.621624790171062, 36.677864895162308], [30.391096225717114, 36.262980658506983], [29.69997562024556, 36.144357408181001], [28.732902866335387, 36.676831366516431], [27.641186557737363, 36.658822129862749], [27.048767937943289, 37.653360907536005], [26.318218214633042, 38.208133246405382], [26.804700148228726, 38.985760199533551], [26.170785353304375, 39.463612168936457], [27.280019972449388, 40.420013739578302], [28.819977654747209, 40.460011298172212], [29.240003696415574, 41.219990749672682], [31.145933872204434, 41.087621568357058], [32.347979363745786, 41.736264146484629], [33.513282911927512, 42.018960069337304], [35.167703891751863, 42.040224921225438], [36.913127068842151, 41.335358384764291]]], [[[27.192376743282406, 40.690565700842448], [26.358009067497782, 40.151993923496477], [26.043351271272535, 40.617753607743161], [26.056942172965332, 40.824123440100735], [26.294602085075692, 40.936261298174166], [26.604195590936282, 41.562114569661013], [26.117041863720825, 41.826904608724554], [27.135739373490505, 42.141484890301307], [27.996720411905407, 42.007358710287768], [28.115524529744441, 41.622886054036279], [28.988442824018779, 41.299934190428175], [28.806438429486743, 41.05496206314853], [27.619017368284112, 40.999823309893102], [27.192376743282406, 40.690565700842448]]]] } },
+            { "type": "Feature", "properties": { "admin": "Taiwan", "name": "Taiwan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[121.777817824389899, 24.394273586519393], [121.175632358892713, 22.790857245367164], [120.747079705896198, 21.970571397382106], [120.220083449383651, 22.814860948166732], [120.106188592612369, 23.556262722258229], [120.694679803552233, 24.53845083261373], [121.49504438688875, 25.295458889257379], [121.951243931161429, 24.997595933527034], [121.777817824389899, 24.394273586519393]]] } },
+            { "type": "Feature", "properties": { "admin": "United Republic of Tanzania", "name": "Tanzania", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.903711197104592, -0.95], [34.07262, -1.05982], [37.69869, -3.09699], [37.7669, -3.67712], [39.20222, -4.67677], [38.74054, -5.90895], [38.79977, -6.47566], [39.44, -6.84], [39.470000000000134, -7.1], [39.19469, -7.7039], [39.25203, -8.00781], [39.18652, -8.48551], [39.53574, -9.112369999999883], [39.9496, -10.0984], [40.31659, -10.317099999999867], [39.521, -10.89688], [38.427556593587767, -11.285202325081626], [37.82764, -11.26879], [37.47129, -11.56876], [36.775150994622884, -11.59453744878078], [36.514081658684397, -11.720938002166745], [35.312397902169145, -11.439146416879165], [34.559989047999451, -11.520020033415845], [34.28, -10.16], [33.940837724096518, -9.693673841980283], [33.73972, -9.41715], [32.759375441221373, -9.230599053589001], [32.191864861791935, -8.930358981973255], [31.556348097466628, -8.762048841998647], [31.157751336950064, -8.594578747317312], [30.74, -8.34], [30.2, -7.08], [29.62, -6.52], [29.419992710088305, -5.939998874539297], [29.519986606573063, -5.419978936386257], [29.339997592900367, -4.499983412294113], [29.753512404099858, -4.452389418153301], [30.11632, -4.09012], [30.50554, -3.56858], [30.75224, -3.35931], [30.74301, -3.03431], [30.52766, -2.80762], [30.46967, -2.41383], [30.758308953583132, -2.287250257988375], [30.816134881317844, -1.698914076345374], [30.419104852019291, -1.134659112150416], [30.769860000000101, -1.01455], [31.86617, -1.02736], [33.903711197104592, -0.95]]] } },
+            { "type": "Feature", "properties": { "admin": "Uganda", "name": "Uganda", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.86617, -1.02736], [30.769860000000101, -1.01455], [30.419104852019291, -1.134659112150416], [29.821518588996121, -1.443322442229771], [29.579466180141019, -1.341313164885605], [29.587837762172164, -0.587405694179381], [29.8195, -0.2053], [29.875778842902431, 0.597379868976361], [30.086153598762785, 1.062312730306416], [30.468507521290285, 1.583805446779706], [30.852670118948133, 1.849396470543752], [31.174149204235952, 2.204465236821306], [30.77332, 2.339890000000139], [30.83385, 3.50917], [31.24556, 3.7819], [31.88145, 3.55827], [32.68642, 3.79232], [33.39, 3.79], [34.005, 4.249884947362147], [34.47913, 3.5556], [34.59607, 3.053740000000118], [35.03599, 1.90584], [34.6721, 1.17694], [34.18, 0.515], [33.893568969666994, 0.109813537861839], [33.903711197104592, -0.95], [31.86617, -1.02736]]] } },
+            { "type": "Feature", "properties": { "admin": "Ukraine", "name": "Ukraine", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[31.78599816257158, 52.10167796488544], [32.159412062312661, 52.061266994833204], [32.412058139787625, 52.288694973349735], [32.715760532366964, 52.238465481162038], [33.7526998227357, 52.335074571331681], [34.391730584457001, 51.768881740925778], [34.141978387190385, 51.566413479206226], [34.22481570815426, 51.255993150428942], [35.022183058417873, 51.207572333371445], [35.377923618315116, 50.773955390010343], [35.35611616388794, 50.577197374059054], [36.62616784032533, 50.225590928745127], [37.393459506995065, 50.383953355503586], [38.01063113785689, 49.915661526074622], [38.59498823421341, 49.926461900423618], [40.069058465339097, 49.601055406281688], [40.080789015469342, 49.307429917999272], [39.674663934087526, 48.783818467801872], [39.895632358567575, 48.232405097031425], [39.738277622238819, 47.898937079451983], [38.770584751141186, 47.825608222029807], [38.255112339029743, 47.546400458356807], [38.223538038899413, 47.102189846375872], [37.42513715998998, 47.022220567404197], [36.759854770664383, 46.698700263040919], [35.823684523264816, 46.645964463887054], [34.962341749823871, 46.273196519549636], [35.020787794745978, 45.65121898048465], [35.51000857925316, 45.409993394546177], [36.529997999830151, 45.46998973243705], [36.334712762199146, 45.113215643893952], [35.239999220528112, 44.939996242851599], [33.882511020652878, 44.361478583344066], [33.326420932760037, 44.564877020844875], [33.546924269349446, 45.034770819674883], [32.454174432105496, 45.327466132176063], [32.630804477679128, 45.519185695978905], [33.588162062318382, 45.851568508480227], [33.298567335754704, 46.08059845639783], [31.744140252415171, 46.333347886737378], [31.675307244602401, 46.706245022155528], [30.748748813609094, 46.583100084003995], [30.37760867688888, 46.032410183285663], [29.603289015427425, 45.293308010431119], [29.149724969201646, 45.464925442072442], [28.679779493939371, 45.30403087013169], [28.233553501099035, 45.488283189468369], [28.48526940279276, 45.596907050145887], [28.659987420371575, 45.939986884131628], [28.933717482221621, 46.258830471372491], [28.862972446414055, 46.437889309263824], [29.072106967899288, 46.517677720722482], [29.170653924279879, 46.379262396828693], [29.759971958136383, 46.349987697935354], [30.024658644335364, 46.423936672545032], [29.838210076626289, 46.525325832701675], [29.908851759569295, 46.67436066343145], [29.559674106573105, 46.928582872091312], [29.415135125452732, 47.346645209332571], [29.050867954227321, 47.510226955752493], [29.122698195113024, 47.849095160506458], [28.670891147585163, 48.118148505234089], [28.259546746541837, 48.155562242213406], [27.52253746919515, 48.467119452501102], [26.857823520624798, 48.368210761094488], [26.619336785597788, 48.220726223333457], [26.197450392366925, 48.220881252630342], [25.945941196402394, 47.987148749374207], [25.207743361112986, 47.891056423527459], [24.866317172960571, 47.737525743188307], [24.402056105250374, 47.981877753280422], [23.760958286237404, 47.985598456405448], [23.142236362406798, 48.096341050806942], [22.710531447040488, 47.882193915389394], [22.640819939878746, 48.150239569687351], [22.085608351334848, 48.422264309271782], [22.280841912533553, 48.825392157580659], [22.558137648211751, 49.08573802346713], [22.776418898212619, 49.027395331409608], [22.518450148211596, 49.476773586619736], [23.426508416444388, 50.308505764357449], [23.922757195743259, 50.424881089878738], [24.029985792748899, 50.705406602575174], [23.52707075368437, 51.578454087930233], [24.005077752384206, 51.617443956094448], [24.553106316839511, 51.888461005249177], [25.327787713327005, 51.910656032918538], [26.337958611768549, 51.832288723347915], [27.454066196408426, 51.59230337178446], [28.241615024536564, 51.572227077839059], [28.617612745892242, 51.427713934934836], [28.992835320763522, 51.602044379271462], [29.254938185347921, 51.368234361366881], [30.157363722460889, 51.416138414101454], [30.55511722181145, 51.319503485715643], [30.619454380014837, 51.822806098022362], [30.927549269338975, 52.042353420614383], [31.78599816257158, 52.10167796488544]]] } },
+            { "type": "Feature", "properties": { "admin": "Uruguay", "name": "Uruguay", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.625133429582945, -30.216294854454258], [-56.976025763564721, -30.109686374636119], [-55.97324459494093, -30.883075860316296], [-55.601510179249331, -30.853878676071385], [-54.572451544805105, -31.494511407193745], [-53.787951626182185, -32.047242526987617], [-53.209588995971529, -32.727666110974717], [-53.650543992718084, -33.202004082981823], [-53.373661668498229, -33.768377780900757], [-53.806425950726521, -34.396814874002224], [-54.935866054897716, -34.952646579733617], [-55.674089728403274, -34.752658786764066], [-56.215297003796053, -34.85983570733741], [-57.139685024633096, -34.430456231424238], [-57.817860683815489, -34.462547295877492], [-58.427074144104381, -33.909454441057569], [-58.349611172098854, -33.2631889788154], [-58.132647671121433, -33.040566908502008], [-58.142440355040748, -32.044503676076147], [-57.874937303281875, -31.016556084926201], [-57.625133429582945, -30.216294854454258]]] } },
+            { "type": "Feature", "properties": { "admin": "United States of America", "name": "United States", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-155.54211, 19.08348], [-155.68817, 18.91619], [-155.93665, 19.05939], [-155.90806, 19.33888], [-156.07347, 19.70294], [-156.02368, 19.81422], [-155.85008, 19.97729], [-155.91907, 20.17395], [-155.86108, 20.26721], [-155.78505, 20.2487], [-155.40214, 20.07975], [-155.22452, 19.99302], [-155.06226, 19.8591], [-154.80741, 19.50871], [-154.83147, 19.45328], [-155.222169999999892, 19.23972], [-155.54211, 19.08348]]], [[[-156.07926, 20.64397], [-156.41445, 20.57241], [-156.58673, 20.783], [-156.70167, 20.8643], [-156.71055, 20.92676], [-156.61258, 21.01249], [-156.25711, 20.91745], [-155.99566, 20.76404], [-156.07926, 20.64397]]], [[[-156.75824, 21.17684], [-156.78933, 21.06873], [-157.32521, 21.09777], [-157.25027, 21.21958], [-156.75824, 21.17684]]], [[[-157.65283, 21.32217], [-157.70703, 21.26442], [-157.7786, 21.27729], [-158.12667, 21.31244], [-158.2538, 21.53919], [-158.29265, 21.57912], [-158.0252, 21.71696], [-157.94161, 21.65272], [-157.65283, 21.32217]]], [[[-159.34512, 21.982], [-159.46372, 21.88299], [-159.80051, 22.06533], [-159.74877, 22.1382], [-159.5962, 22.23618], [-159.36569, 22.21494], [-159.34512, 21.982]]], [[[-94.81758, 49.38905], [-94.639999999999858, 48.840000000000103], [-94.32914, 48.67074], [-93.63087, 48.60926], [-92.61, 48.45], [-91.64, 48.14], [-90.829999999999856, 48.27], [-89.6, 48.01], [-89.272917446636654, 48.019808254582834], [-88.378114183286513, 48.302917588893806], [-87.439792623300207, 47.94], [-86.461990831228135, 47.553338019392037], [-85.652363247403215, 47.220218817730498], [-84.876079881514855, 46.900083319682366], [-84.779238247399817, 46.637101955749117], [-84.54374874544564, 46.538684190449224], [-84.6049, 46.4396], [-84.3367, 46.408770000000104], [-84.142119513673279, 46.512225857115723], [-84.091851264161463, 46.275418606138253], [-83.890765347005654, 46.116926988299149], [-83.616130947590491, 46.116926988299149], [-83.469550747394621, 45.994686387712584], [-83.592850714843067, 45.816893622412543], [-82.550924648758169, 45.347516587905446], [-82.337763125431053, 44.44], [-82.137642381503952, 43.571087551439987], [-82.43, 42.98], [-82.899999999999878, 42.430000000000135], [-83.119999999999877, 42.08], [-83.141999681312555, 41.975681057292995], [-83.029810146806909, 41.832795722005997], [-82.690089280920162, 41.675105088867319], [-82.439277716791608, 41.675105088867319], [-81.277746548167059, 42.209025987306845], [-80.247447679347843, 42.36619985612267], [-78.939362148743683, 42.863611355148116], [-78.92, 42.965], [-79.009999999999863, 43.27], [-79.171673550111862, 43.466339423184301], [-78.720279914042365, 43.625089423184953], [-77.737885097957601, 43.629055589363382], [-76.820034145805565, 43.628784288093748], [-76.5, 44.018458893758599], [-76.375, 44.09631], [-75.31821, 44.81645000000016], [-74.867, 45.00048000000011], [-73.347829999999874, 45.00738], [-71.505059999999858, 45.0082], [-71.405, 45.255000000000123], [-71.08482, 45.305240000000154], [-70.659999999999783, 45.46], [-70.305, 45.915], [-69.99997, 46.69307], [-69.237216, 47.447781], [-68.905, 47.185], [-68.23444, 47.35486], [-67.79046, 47.06636], [-67.79134, 45.702810000000134], [-67.13741, 45.13753], [-66.96466, 44.809700000000149], [-68.03252, 44.3252], [-69.059999999999874, 43.98], [-70.116169999999897, 43.684050000000141], [-70.645475633410967, 43.090238348964043], [-70.81489, 42.8653], [-70.825, 42.335], [-70.494999999999891, 41.805], [-70.08, 41.78], [-70.185, 42.145], [-69.88497, 41.922830000000111], [-69.96503, 41.637170000000161], [-70.64, 41.475], [-71.12039, 41.494450000000164], [-71.859999999999829, 41.32], [-72.295, 41.27], [-72.87643, 41.22065], [-73.71, 40.931102351654481], [-72.24126, 41.119480000000138], [-71.944999999999808, 40.93], [-73.345, 40.63], [-73.982, 40.628], [-73.952325, 40.75075], [-74.25671, 40.47351], [-73.96244, 40.42763], [-74.17838, 39.70926], [-74.90604, 38.93954], [-74.98041, 39.1964], [-75.20002, 39.24845], [-75.52805, 39.4985], [-75.32, 38.96], [-75.071834764789784, 38.782032230179276], [-75.05673, 38.404120000000106], [-75.37747, 38.01551], [-75.94023, 37.21689], [-76.03127, 37.2566], [-75.722049999999783, 37.937050000000106], [-76.23287, 38.319215], [-76.35, 39.15], [-76.542725, 38.717615], [-76.32933, 38.08326], [-76.98999793161353, 38.239991766913384], [-76.301619999999886, 37.917945], [-76.25874, 36.9664000000001], [-75.9718, 36.89726], [-75.868039999999809, 36.55125], [-75.72749, 35.550740000000125], [-76.36318, 34.808540000000129], [-77.39763499999988, 34.51201], [-78.05496, 33.92547], [-78.554349999999815, 33.861330000000116], [-79.06067, 33.49395], [-79.20357, 33.15839], [-80.301325, 32.509355], [-80.86498, 32.0333], [-81.33629, 31.44049], [-81.49042, 30.729990000000122], [-81.31371, 30.03552], [-80.98, 29.18000000000011], [-80.53558499999987, 28.47213], [-80.529999999999774, 28.04], [-80.056539284977532, 26.88000000000013], [-80.088015, 26.205765], [-80.131559999999837, 25.816775], [-80.38103, 25.20616], [-80.679999999999879, 25.08], [-81.17213, 25.201260000000126], [-81.33, 25.64], [-81.709999999999795, 25.87], [-82.239999999999895, 26.730000000000125], [-82.70515, 27.49504], [-82.85526, 27.88624], [-82.65, 28.550000000000146], [-82.929999999999865, 29.100000000000129], [-83.70959, 29.93656], [-84.1, 30.090000000000114], [-85.10882, 29.63615], [-85.28784, 29.686120000000127], [-85.7731, 30.152610000000116], [-86.399999999999878, 30.400000000000112], [-87.530359999999831, 30.27433], [-88.41782, 30.3849], [-89.180489999999836, 30.31598], [-89.593831178419748, 30.159994004836843], [-89.413735, 29.89419], [-89.43, 29.48864], [-89.21767, 29.29108], [-89.40823, 29.15961], [-89.77928, 29.307140000000135], [-90.15463, 29.11743], [-90.880224999999896, 29.148535000000116], [-91.626784999999842, 29.677000000000127], [-92.49906, 29.5523], [-93.22637, 29.78375], [-93.84842, 29.71363], [-94.69, 29.480000000000125], [-95.60026, 28.73863], [-96.59404, 28.30748], [-97.139999999999802, 27.83], [-97.37, 27.38], [-97.379999999999853, 26.69], [-97.33, 26.210000000000115], [-97.139999999999802, 25.87], [-97.529999999999859, 25.84], [-98.239999999999895, 26.060000000000109], [-99.019999999999854, 26.37], [-99.3, 26.84], [-99.52, 27.54], [-100.11, 28.11000000000012], [-100.45584, 28.696120000000118], [-100.957599999999886, 29.380710000000125], [-101.6624, 29.779300000000113], [-102.48, 29.76], [-103.11, 28.97], [-103.94, 29.27], [-104.456969999999814, 29.57196], [-104.705749999999895, 30.12173], [-105.03737, 30.64402], [-105.63159, 31.083830000000113], [-106.1429, 31.39995], [-106.507589999999794, 31.75452], [-108.24, 31.754853718166398], [-108.24194, 31.34222], [-109.035, 31.341940000000161], [-111.02361, 31.33472], [-113.30498, 32.03914], [-114.815, 32.52528], [-114.721389999999829, 32.72083], [-115.991349999999869, 32.61239000000014], [-117.127759999999753, 32.53534], [-117.295937691273863, 33.04622461520389], [-117.944, 33.621236431201389], [-118.410602275897475, 33.740909223124497], [-118.519894822799685, 34.027781577575745], [-119.081, 34.078], [-119.438840642016658, 34.348477178284291], [-120.36778, 34.44711], [-120.62286, 34.60855], [-120.74433, 35.156860000000101], [-121.714569999999853, 36.16153], [-122.54747, 37.551760000000101], [-122.51201, 37.783390000000132], [-122.95319, 38.113710000000104], [-123.7272, 38.951660000000111], [-123.865169999999878, 39.766990000000128], [-124.39807, 40.3132], [-124.17886, 41.142020000000109], [-124.2137, 41.999640000000134], [-124.532839999999894, 42.76599], [-124.14214, 43.70838], [-124.020535, 44.615895], [-123.898929999999893, 45.52341], [-124.079635, 46.86475], [-124.395669999999896, 47.72017], [-124.687210083007812, 48.184432983398537], [-124.566101074218736, 48.379714965820384], [-123.12, 48.04], [-122.587359999999876, 47.096], [-122.34, 47.36], [-122.5, 48.18], [-122.84, 49.0], [-120.0, 49.0], [-117.03121, 49.0], [-116.04818, 49.0], [-112.999999999999872, 49.0], [-110.049999999999812, 49.0], [-107.049999999999898, 49.0], [-104.04826, 48.99986], [-100.65, 49.0], [-97.228720000004699, 49.0007], [-95.159069509171943, 49.0], [-95.15609, 49.38425], [-94.81758, 49.38905]]], [[[-153.006314053336837, 57.115842190165878], [-154.0050902984581, 56.734676825581047], [-154.516402757770067, 56.992748928446687], [-154.670992804971092, 57.461195787172493], [-153.762779507441451, 57.816574612043773], [-153.228729417921073, 57.968968410872421], [-152.564790615835108, 57.901427313866961], [-152.141147223906273, 57.591058661521977], [-153.006314053336837, 57.115842190165878]]], [[[-165.579164191733554, 59.909986884187539], [-166.192770148767238, 59.754440822988961], [-166.848337368821944, 59.941406155020942], [-167.455277066090048, 60.213069159579376], [-166.467792121424566, 60.384169826897775], [-165.674429694663644, 60.293606879306232], [-165.579164191733554, 59.909986884187539]]], [[[-171.731656867539357, 63.782515367275906], [-171.114433560245175, 63.592191067144981], [-170.491112433940657, 63.694975490973505], [-169.682505459653555, 63.431115627691142], [-168.689439460300662, 63.297506212000584], [-168.77194088445458, 63.188598130945437], [-169.529439867204985, 62.976931464277882], [-170.290556200215917, 63.194437567794452], [-170.671385667990847, 63.375821845138965], [-171.553063117538642, 63.317789211675077], [-171.791110602891166, 63.40584585230048], [-171.731656867539357, 63.782515367275906]]], [[[-155.067790290324211, 71.147776394323685], [-154.344165208941206, 70.696408596470192], [-153.900006273392563, 70.889988511835682], [-152.210006069935275, 70.829992173944831], [-152.270002407826127, 70.60000621202984], [-150.739992438744508, 70.430016588005699], [-149.720003018167489, 70.530010484490433], [-147.613361579357047, 70.214034939241785], [-145.689989800225248, 70.120009670686741], [-144.920010959076393, 69.989991767040479], [-143.58944618042517, 70.152514146598307], [-142.072510348713365, 69.851938178172631], [-140.985987521560702, 69.711998399526365], [-140.985988329004869, 69.711998399526365], [-140.992498752029377, 66.000028591568665], [-140.997769748123119, 60.306396796298593], [-140.012997816153074, 60.276837877027575], [-139.03900042031583, 60.000007229240012], [-138.340889999999888, 59.562110000000146], [-137.4525, 58.905000000000101], [-136.47972, 59.46389], [-135.47583, 59.78778], [-134.945, 59.270560000000117], [-134.27111, 58.86111], [-133.355548882207188, 58.410285142645151], [-132.73042, 57.692890000000105], [-131.707809999999853, 56.55212], [-130.00778, 55.91583], [-129.979994263358265, 55.284997870497207], [-130.536110189467223, 54.802753404349389], [-131.08581823797212, 55.178906155002025], [-131.967211467142278, 55.497775580459049], [-132.250010742859445, 56.369996242897443], [-133.539181084356386, 57.178887437562125], [-134.07806292029602, 58.123067531966889], [-135.038211032279037, 58.187714748763931], [-136.628062309954629, 58.212209377670447], [-137.800006279686016, 58.499995429103777], [-139.867787041412981, 59.537761542389134], [-140.825273817133024, 59.72751740176507], [-142.574443535564427, 60.084446519604981], [-143.958880994879848, 59.99918040632339], [-145.925556816827822, 60.458609727614274], [-147.114373949146625, 60.884656073644628], [-148.224306200127643, 60.672989406977152], [-148.018065558850736, 59.978328965893631], [-148.570822516860858, 59.914172675203297], [-149.727857835875824, 59.705658270905545], [-150.608243374616421, 59.368211168039487], [-151.716392788683294, 59.155821031319974], [-151.859433153267105, 59.74498403587959], [-151.40971900124714, 60.725802720779392], [-150.346941494732505, 61.033587551509854], [-150.621110806256951, 61.284424953854447], [-151.895839199816834, 60.727197984451273], [-152.578329841095581, 60.061657212964285], [-154.019172126257558, 59.350279446034264], [-153.287511359653166, 58.864727688219787], [-154.232492438758442, 58.146373602930531], [-155.307491421510207, 57.727794501366319], [-156.308334723923082, 57.422774359763636], [-156.556097378546298, 56.979984849670636], [-158.117216559867728, 56.463608099994175], [-158.433321296197136, 55.994153550838533], [-159.603327399717415, 55.566686102920116], [-160.289719611634183, 55.643580634170561], [-161.223047655257773, 55.364734605523481], [-162.23776607974105, 55.024186916720097], [-163.069446581046378, 54.689737046927171], [-164.785569221027174, 54.40417308208216], [-164.942226325520011, 54.572224839895327], [-163.84833960676562, 55.039431464246107], [-162.870001390615897, 55.348043117893198], [-161.804174974596009, 55.894986477270429], [-160.563604702781134, 56.008054511125025], [-160.070559862284483, 56.418055324928744], [-158.684442918919416, 57.016675116597852], [-158.461097378553944, 57.216921291728866], [-157.722770352183858, 57.570000515363056], [-157.550274421193564, 58.328326321030218], [-157.041674974576949, 58.918884589261708], [-158.194731208305427, 58.615802313869828], [-158.517217984023034, 58.787781480537305], [-159.058606126928709, 58.424186102931671], [-159.711667040017318, 58.931390285876333], [-159.981288825500144, 58.572549140041623], [-160.355271165996498, 59.071123358793628], [-161.355003425115001, 58.670837714260742], [-161.968893602526293, 58.671664537177371], [-162.054986538724648, 59.266925360747436], [-161.874170702135331, 59.633621324290587], [-162.518059048492034, 59.989723619213905], [-163.818341437820123, 59.798055731843377], [-164.662217577146407, 60.267484442782639], [-165.346387702474772, 60.507495632562396], [-165.350831875651835, 61.073895168697497], [-166.121379157555907, 61.500019029376212], [-165.734451870770471, 62.074996853271792], [-164.919178636717788, 62.633076483807919], [-164.562507901039339, 63.146378485763044], [-163.753332485996964, 63.219448961023758], [-163.067224494457832, 63.05945872664801], [-162.260555386381697, 63.541935736741159], [-161.534449836248569, 63.455816962326757], [-160.772506680321101, 63.76610810002326], [-160.958335130842528, 64.222798570402759], [-161.518068407212184, 64.402787584075313], [-160.777777676414729, 64.788603827566405], [-161.391926235987597, 64.777235012462327], [-162.453050096668818, 64.559444688568206], [-162.757786017894034, 64.338605455168803], [-163.54639421288428, 64.559160468190484], [-164.960829841145141, 64.446945095468848], [-166.425288255864473, 64.686672064870706], [-166.845004238939026, 65.088895575614529], [-168.110560065767146, 65.669997056736733], [-166.70527116602193, 66.088317776139391], [-164.474709642575448, 66.576660061297488], [-163.652511766595637, 66.576660061297488], [-163.788601651036117, 66.077207343196662], [-161.677774421210131, 66.116119696712403], [-162.489714525379981, 66.735565090595102], [-163.719716966791083, 67.116394558370089], [-164.430991380856511, 67.616338202577779], [-165.390286831706703, 68.042772121850234], [-166.764440680995989, 68.35887685817967], [-166.204707404626561, 68.883030910916162], [-164.430810513343431, 68.915535386827727], [-163.168613654614489, 69.371114813912882], [-162.930566169261965, 69.858061835399255], [-161.908897264635499, 70.333329983187625], [-160.93479651593367, 70.447689927849567], [-159.039175788387126, 70.891642157668926], [-158.119722866833939, 70.824721177851032], [-156.580824551398024, 71.357763576941736], [-155.067790290324211, 71.147776394323685]]]] } },
+            { "type": "Feature", "properties": { "admin": "Uzbekistan", "name": "Uzbekistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[66.518606805288655, 37.362784328758785], [66.546150343700205, 37.974684963526855], [65.215998976507379, 38.402695013984292], [64.170223016216752, 38.892406724598231], [63.518014764261018, 39.363256537425627], [62.374260288344992, 40.053886216790382], [61.882714064384679, 41.084856879229392], [61.547178989513547, 41.2663703476546], [60.46595299667068, 41.22032664648254], [60.083340691981654, 41.425146185871391], [59.976422153569771, 42.223081976890199], [58.629010857991453, 42.751551011723045], [57.786529982337065, 42.170552883465511], [56.93221520368779, 41.82602610937559], [57.096391229079089, 41.32231008561056], [55.968191359282898, 41.308641669269356], [55.928917270741081, 44.995858466159099], [58.503127068928457, 45.586804307632818], [58.689989048095882, 45.500013739598621], [60.239971958258316, 44.784036770194717], [61.05831994003244, 44.405816962250505], [62.013300408786236, 43.504476630215642], [63.185786981056559, 43.650074978197999], [64.900824415959264, 43.728080552742576], [66.098012322865074, 42.997660020513088], [66.023391554635609, 41.994646307943974], [66.510648634715707, 41.987644151368436], [66.714047072216502, 41.168443508461493], [67.985855747351806, 41.135990708982213], [68.259895867795606, 40.662324530594894], [68.632482944620008, 40.668680731766798], [69.070027296835306, 41.384244289712363], [70.388964878220776, 42.081307684897439], [70.96231489449913, 42.266154283205481], [71.259247674448218, 42.167710679689456], [70.420022414028196, 41.519998277343134], [71.157858514291576, 41.143587144529107], [71.870114780570447, 41.392900092121259], [73.055417108049156, 40.86603302668945], [71.774875115856545, 40.145844428053763], [71.014198032520156, 40.244365546218226], [70.601406691372674, 40.218527330072284], [70.458159621059608, 40.49649485937028], [70.666622348925031, 40.960213324541407], [69.329494663372813, 40.727824408524839], [69.011632928345477, 40.086158148756653], [68.536416456989414, 39.533452867178923], [67.701428664017342, 39.580478420564518], [67.442219679641298, 39.140143541005479], [68.176025018185911, 38.901553453113898], [68.392032505165943, 38.157025254868728], [67.829999627559502, 37.144994004864678], [67.075782098259609, 37.35614390720928], [66.518606805288655, 37.362784328758785]]] } },
+            { "type": "Feature", "properties": { "admin": "Venezuela", "name": "Venezuela", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-71.331583624950284, 11.776284084515805], [-71.36000566271079, 11.53999359786121], [-71.947049933546495, 11.423282375530018], [-71.620868292920164, 10.969459947142791], [-71.633063930941063, 10.446494452349027], [-72.074173956984495, 9.865651353388369], [-71.695644090446521, 9.072263088411246], [-71.26455929226772, 9.137194525585981], [-71.039999355743376, 9.859992784052407], [-71.350083787710773, 10.211935126176213], [-71.400623338492224, 10.968969021036013], [-70.155298834906503, 11.375481675660039], [-70.293843349881016, 11.846822414594211], [-69.943244594996813, 12.162307033736095], [-69.584300096297454, 11.459610907431211], [-68.882999233664435, 11.44338450769156], [-68.233271450458716, 10.885744126829945], [-68.194126552997616, 10.554653225135921], [-67.296248541926317, 10.545868231646306], [-66.227864142507983, 10.648626817258684], [-65.655237596281737, 10.20079885501732], [-64.890452236578156, 10.077214667191296], [-64.329478725833724, 10.389598700395679], [-64.318006557864933, 10.641417954953978], [-63.079322475828725, 10.701724351438598], [-61.880946010980182, 10.7156253117251], [-62.730118984616396, 10.420268662960904], [-62.388511928950969, 9.948204453974636], [-61.588767462801918, 9.873066921422263], [-60.830596686431711, 9.38133982994894], [-60.671252407459718, 8.580174261911877], [-60.150095587796166, 8.602756862823425], [-59.758284878159181, 8.367034816924045], [-60.550587938058186, 7.779602972846178], [-60.637972785063752, 7.414999904810853], [-60.295668097562377, 7.043911444522918], [-60.543999192940966, 6.856584377464881], [-61.159336310456467, 6.696077378766317], [-61.139415045807937, 6.234296779806142], [-61.410302903881941, 5.959068101419616], [-60.733574184803707, 5.2002772078619], [-60.601179165271922, 4.918098049332129], [-60.966893276601517, 4.536467596856638], [-62.085429653559125, 4.162123521334308], [-62.804533047116692, 4.006965033377951], [-63.093197597899092, 3.770571193858784], [-63.888342861574145, 4.020530096854571], [-64.628659430587533, 4.14848094320925], [-64.816064012294007, 4.056445217297422], [-64.368494432214092, 3.797210394705246], [-64.408827887617903, 3.126786200366623], [-64.269999152265783, 2.497005520025566], [-63.422867397705105, 2.411067613124174], [-63.368788011311644, 2.200899562993129], [-64.083085496666072, 1.91636912679408], [-64.199305792890499, 1.49285492594602], [-64.611011928959854, 1.328730576987041], [-65.354713304288353, 1.0952822941085], [-65.548267381437554, 0.78925446207603], [-66.325765143484944, 0.724452215982012], [-66.876325853122566, 1.253360500489336], [-67.181294318293041, 2.250638129074062], [-67.447092047786299, 2.600280869960869], [-67.809938117123693, 2.820655015469569], [-67.303173183853417, 3.31845408773718], [-67.33756384954367, 3.542342230641721], [-67.621835903581271, 3.839481716319994], [-67.823012254493534, 4.503937282728898], [-67.744696621355203, 5.221128648291667], [-67.521531948502741, 5.556870428891968], [-67.34143958196556, 6.095468044454021], [-67.695087246355001, 6.267318020040645], [-68.265052456318216, 6.153268133972473], [-68.985318569602327, 6.206804917826856], [-69.389479946557103, 6.099860541198835], [-70.093312954372408, 6.960376491723109], [-70.674233567981503, 7.087784735538717], [-71.960175747348629, 6.991614895043538], [-72.19835242378187, 7.340430813013682], [-72.444487270788059, 7.42378489830048], [-72.479678921178831, 7.632506008327352], [-72.360900641555958, 8.002638454617893], [-72.439862230097944, 8.405275376820027], [-72.660494757768092, 8.62528778730268], [-72.788729824500379, 9.085027167187331], [-73.304951544880026, 9.151999823437604], [-73.027604132769554, 9.736770331252441], [-72.905286017534692, 10.45034434655477], [-72.614657762325194, 10.821975409381777], [-72.227575446242923, 11.108702093953237], [-71.973921678338272, 11.608671576377116], [-71.331583624950284, 11.776284084515805]]] } },
+            { "type": "Feature", "properties": { "admin": "Vietnam", "name": "Vietnam", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[108.050180291782908, 21.552379869060111], [106.715067987090066, 20.696850694252014], [105.881682163519002, 19.752050482659694], [105.662005649846279, 19.058165188060567], [106.426816847765991, 18.004120998603224], [107.36195356651973, 16.697456569887049], [108.269495070429599, 16.079742336486145], [108.877106561317447, 15.276690578670436], [109.335269810017209, 13.42602834721772], [109.200135939573954, 11.666859239137761], [108.366129998815424, 11.00832062422627], [107.22092858279521, 10.36448395430183], [106.4051127462034, 9.530839748569317], [105.158263787865081, 8.599759629750492], [104.795185174582372, 9.2410383162765], [105.076201613385592, 9.918490505406806], [104.334334751403446, 10.486543687375228], [105.199914992292321, 10.889309800658094], [106.249670037869436, 10.961811835163585], [105.810523716253101, 11.567614650921225], [107.491403029410861, 12.337205918827944], [107.614547967562402, 13.535530707244202], [107.382727492301058, 14.202440904186968], [107.564525181103875, 15.202173163305554], [107.312705926545576, 15.908538316303177], [106.55600792849566, 16.604283962464802], [105.925762160264, 17.485315456608955], [105.094598423281496, 18.666974595611073], [103.896532017026701, 19.265180975821799], [104.183387892678908, 19.624668077060214], [104.822573683697073, 19.886641750563879], [104.435000441508024, 20.758733221921528], [103.203861118586431, 20.766562201413745], [102.754896274834636, 21.675137233969462], [102.170435825613552, 22.464753119389297], [102.706992222100084, 22.708795070887668], [103.504514601660546, 22.703756618739202], [104.476858351664447, 22.819150092046961], [105.329209425886603, 23.352063300056908], [105.811247186305209, 22.976892401617899], [106.725403273548451, 22.794267889898414], [106.567273390735295, 22.218204860924768], [107.043420037872608, 21.811898912029907], [108.050180291782908, 21.552379869060111]]] } },
+            { "type": "Feature", "properties": { "admin": "Vanuatu", "name": "Vanuatu", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[167.844876743845077, -16.466333103097153], [167.515181105822847, -16.597849623279966], [167.180007765977791, -16.159995212470957], [167.2168013857696, -15.891846205308449], [167.844876743845077, -16.466333103097153]]], [[[167.107712437201485, -14.933920179913951], [167.2700281110302, -15.74002084723487], [167.001207310247935, -15.614602146062492], [166.79315799384085, -15.668810723536719], [166.649859247095549, -15.392703545801192], [166.629136997746429, -14.6264970842096], [167.107712437201485, -14.933920179913951]]]] } },
+            { "type": "Feature", "properties": { "admin": "Yemen", "name": "Yemen", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[53.108572625547502, 16.651051133688949], [52.385205926325874, 16.38241120041965], [52.191729363825075, 15.938433132384018], [52.168164910699986, 15.597420355689945], [51.172515089732471, 15.175249742081489], [49.574576450403136, 14.708766587782746], [48.679230584514151, 14.003202419485657], [48.238947381387412, 13.948089504446369], [47.938914015500771, 14.007233181204423], [47.354453566279702, 13.592219753468379], [46.71707645039173, 13.399699204965016], [45.877592807810252, 13.347764390511681], [45.625050083199874, 13.290946153206759], [45.406458774605241, 13.02690542241143], [45.144355910020849, 12.953938300015306], [44.9895333188744, 12.699586900274708], [44.494576450382844, 12.721652736863344], [44.175112745954486, 12.585950425664873], [43.48295861183712, 12.63680003504008], [43.222871128112118, 13.220950425667422], [43.251448195169516, 13.767583726450848], [43.087943963398047, 14.062630316621306], [42.892245314308717, 14.802249253798745], [42.604872674333606, 15.213335272680592], [42.805015496600042, 15.261962795467252], [42.702437778500652, 15.718885809791995], [42.823670688657408, 15.911742255105263], [42.779332309750963, 16.34789134364868], [43.218375278502734, 16.666889960186406], [43.115797560403351, 17.088440456607369], [43.380794305196098, 17.579986680567668], [43.791518589051904, 17.319976711491105], [44.062613152855072, 17.410358791569589], [45.216651238797184, 17.43332896572333], [45.399999220568752, 17.333335069238554], [46.366658563020529, 17.233315334537632], [46.749994337761642, 17.283338120996174], [47.000004917189749, 16.949999294497438], [47.466694777217626, 17.116681626854877], [48.183343540241324, 18.166669216377311], [49.116671583864857, 18.616667588774941], [52.000009800022227, 19.000003363516054], [52.782184279192037, 17.349742336491229], [53.108572625547502, 16.651051133688949]]] } },
+            { "type": "Feature", "properties": { "admin": "South Africa", "name": "South Africa", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.521001417778869, -29.257386976846245], [31.325561150850994, -29.401977634398907], [30.901762729625336, -29.909956963828034], [30.622813348113816, -30.423775730106122], [30.055716180142774, -31.140269463832951], [28.925552605919535, -32.172041110972494], [28.219755893677092, -32.771952813448848], [27.464608188595967, -33.226963799778794], [26.419452345492818, -33.614950453426175], [25.909664340933482, -33.667040297176392], [25.78062828950069, -33.944646091448334], [25.172861769315965, -33.796851495093577], [24.67785322439212, -33.987175795224537], [23.594043409934635, -33.794474379208147], [22.988188917744729, -33.916430759416976], [22.574157342222232, -33.864082533505304], [21.542799106541022, -34.258838799782922], [20.689052768646999, -34.417175388325226], [20.071261020597628, -34.795136814107984], [19.616405063564567, -34.819166355123706], [19.193278435958714, -34.462598972309777], [18.855314568769867, -34.444305515278458], [18.424643182049376, -33.997872816708963], [18.377410922934612, -34.13652068454806], [18.244499139079917, -33.867751560198023], [18.250080193767442, -33.281430759414434], [17.925190463948436, -32.61129078545342], [18.247909783611185, -32.429131361624563], [18.221761508871477, -31.661632989225662], [17.566917758868861, -30.72572112398754], [17.0644161312627, -29.878641045859158], [17.06291751472622, -29.875953871379977], [16.344976840895239, -28.576705010697697], [16.824017368240899, -28.082161553664466], [17.218928663815401, -28.355943291946804], [17.387497185951499, -28.783514092729774], [17.836151971109526, -28.856377862261311], [18.464899122804745, -29.045461928017271], [19.002127312911082, -28.972443129188857], [19.89473432788861, -28.461104831660769], [19.895767856534427, -24.767790215760588], [20.165725538827186, -24.917961928000768], [20.758609246511831, -25.868136488551446], [20.666470167735437, -26.477453301704916], [20.889609002371731, -26.828542982695907], [21.60589603036939, -26.726533705351748], [22.105968865657864, -26.28025603607913], [22.579531691180584, -25.979447523708142], [22.824271274514896, -25.500458672794768], [23.312096795350179, -25.268689873965712], [23.733569777122703, -25.39012948985161], [24.211266717228792, -25.670215752873567], [25.025170525825782, -25.719670098576891], [25.664666375437712, -25.486816094669706], [25.765848829865206, -25.174845472923671], [25.941652052522151, -24.696373386333214], [26.485753208123292, -24.616326592713097], [26.78640669119741, -24.240690606383478], [27.119409620886238, -23.574323011979772], [28.017235955525244, -22.827753594659072], [29.432188348109033, -22.091312758067584], [29.839036899542965, -22.102216485281172], [30.322883335091767, -22.271611830333931], [30.659865350067083, -22.151567478119912], [31.191409132621278, -22.251509698172395], [31.670397983534645, -23.658969008073861], [31.930588820124242, -24.369416599222532], [31.752408481581874, -25.484283949487406], [31.837777947728057, -25.843331801051342], [31.333157586397899, -25.660190525008943], [31.044079624157146, -25.731452325139436], [30.949666782359905, -26.022649021104144], [30.676608514129633, -26.398078301704604], [30.685961948374477, -26.743845310169526], [31.282773064913325, -27.285879408478991], [31.868060337051073, -27.17792734142127], [32.071665480281062, -26.733820082304902], [32.830120477028878, -26.74219166433619], [32.580264926897677, -27.470157566031808], [32.462132602678444, -28.30101124442055], [32.203388706193032, -28.752404880490065], [31.521001417778869, -29.257386976846245]], [[28.978262566857236, -28.955596612261708], [28.541700066855491, -28.647501722937562], [28.07433841320778, -28.851468601193581], [27.532511020627471, -29.242710870075353], [26.999261915807629, -29.875953871379977], [27.749397006956478, -30.645105889612214], [28.107204624145421, -30.545732110314944], [28.291069370239903, -30.226216729454293], [28.848399692507734, -30.070050551068245], [29.018415154748016, -29.743765557577362], [29.325166456832587, -29.257386976846245], [28.978262566857236, -28.955596612261708]]] } },
+            { "type": "Feature", "properties": { "admin": "Zambia", "name": "Zambia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[32.759375441221316, -9.230599053589058], [33.231387973775291, -9.676721693564799], [33.485687697083584, -10.525558770391111], [33.315310499817279, -10.796549981329695], [33.114289178201908, -11.607198174692311], [33.306422153463068, -12.435778090060214], [32.991764357237876, -12.783870537978272], [32.688165317523122, -13.712857761289273], [33.214024692525207, -13.97186003993615], [30.179481235481827, -14.796099134991525], [30.274255812305103, -15.507786960515208], [29.51683434420314, -15.644677829656386], [28.947463413211256, -16.043051446194436], [28.825868768028492, -16.389748630440611], [28.467906121542676, -16.468400160388843], [27.598243442502753, -17.290830580314005], [27.044427117630729, -17.938026218337427], [26.706773309035633, -17.961228936436477], [26.381935255648919, -17.846042168857892], [25.264225701608005, -17.736539808831413], [25.084443393664564, -17.661815687737366], [25.076950310982255, -17.578823337476617], [24.6823490740015, -17.35341073981947], [24.033861525170771, -17.29584319424632], [23.215048455506057, -17.52311614346598], [22.562478468524255, -16.89845142992181], [21.887842644953867, -16.080310153876876], [21.933886346125913, -12.898437188369357], [24.016136508894672, -12.91104623784857], [23.930922072045373, -12.565847670138854], [24.079905226342838, -12.191296888887361], [23.904153680118181, -11.722281589406318], [24.017893507592586, -11.237298272347088], [23.912215203555714, -10.926826267137512], [24.257155389103982, -10.951992689663655], [24.314516228947948, -11.262826429899269], [24.783169793402948, -11.238693536018962], [25.418118116973197, -11.330935967659958], [25.752309604604726, -11.784965101776356], [26.55308759939961, -11.924439792532125], [27.164419793412456, -11.608748467661071], [27.38879886242378, -12.132747491100663], [28.15510867687998, -12.272480564017894], [28.52356163912102, -12.698604424696679], [28.934285922976834, -13.248958428605132], [29.699613885219485, -13.257226657771827], [29.616001417771223, -12.178894545137307], [29.341547885869087, -12.36074391037241], [28.642417433392346, -11.971568698782312], [28.372253045370421, -11.793646742401389], [28.496069777141763, -10.789883721564044], [28.673681674928922, -9.605924981324931], [28.449871046672818, -9.164918308146083], [28.734866570762495, -8.526559340044576], [29.002912225060467, -8.40703175215347], [30.34608605319081, -8.238256524288216], [30.740015496551781, -8.340007419470913], [31.157751336950042, -8.594578747317362], [31.55634809746649, -8.76204884199864], [32.191864861791963, -8.930358981973276], [32.759375441221316, -9.230599053589058]]] } },
+            { "type": "Feature", "properties": { "admin": "Zimbabwe", "name": "Zimbabwe", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.191409132621278, -22.251509698172395], [30.659865350067083, -22.151567478119912], [30.322883335091767, -22.271611830333931], [29.839036899542965, -22.102216485281172], [29.432188348109033, -22.091312758067584], [28.794656202924209, -21.639454034107445], [28.02137007010861, -21.485975030200578], [27.727227817503252, -20.851801853114711], [27.724747348753247, -20.499058526290387], [27.296504754350501, -20.391519870690995], [26.164790887158478, -19.293085625894935], [25.850391473094724, -18.714412937090533], [25.649163445750155, -18.536025892818987], [25.264225701608005, -17.736539808831413], [26.381935255648919, -17.846042168857892], [26.706773309035633, -17.961228936436477], [27.044427117630729, -17.938026218337427], [27.598243442502753, -17.290830580314005], [28.467906121542676, -16.468400160388843], [28.825868768028492, -16.389748630440611], [28.947463413211256, -16.043051446194436], [29.51683434420314, -15.644677829656386], [30.274255812305103, -15.507786960515208], [30.338954705534537, -15.880839125230242], [31.173063999157673, -15.860943698797868], [31.636498243951188, -16.071990248277881], [31.852040643040592, -16.319417006091374], [32.328238966610222, -16.392074069893749], [32.847638787575839, -16.713398125884613], [32.849860874164385, -17.979057305577175], [32.654885695127142, -18.672089939043492], [32.611994256324884, -19.419382826416268], [32.772707960752619, -19.715592136313294], [32.659743279762573, -20.30429005298231], [32.508693068173436, -20.395292250248303], [32.244988234188007, -21.116488539313689], [31.191409132621278, -22.251509698172395]]] } }
+        ]
+    };
+
+var randomcountriesData1 = [
+    { country: "Iran", "continent": "Asia", "CategoryName": "Books", "Sales": 550 },
+    { country: "Benin", "continent": "Africa", "CategoryName": "Books", "Sales": 1000 },
+    { country: "China", "continent": "Asia", "CategoryName": "Books", "Sales": 420 },
+    { country: "Chile", "continent": "South America", "CategoryName": "Books", "Sales": 1100 },
+    { country: "Cuba", "continent": "North America", "CategoryName": "Books", "Sales": 450 },
+    { country: "Spain", "continent": "Europe", "CategoryName": "Books", "Sales": 1200 },
+    { country: "Fiji", "continent": "Oceania", "CategoryName": "Books", "Sales": 618.0 },
+];
+
+module mapcomponenet {
+    $(function () {
+        var mapsample = new ej.datavisualization.Map($("#map"), {
+            enableAnimation: true,
+            navigationControl: {
+                enableNavigation: true,
+                orientation: 'vertical',
+                absolutePosition: { x: 5, y: 15 },
+                dockPosition: 'none'
+            },
+            layers: [
+                {
+                    layerType: 'geometry',
+                    enableMouseHover: false,
+                    enableSelection: false,
+                    shapeSettings: {
+                        fill: "#626171",
+                        autoFill: false,
+                        highlightStroke: "white",
+                        stroke: "white",
+                        strokeThickness: 0.5,
+                        highlightColor: "#BFBFBF"
+                    },
+                    shapeData: world_map,
+                    legendSettings: { dockOnMap: false }
+                }
+            ]
+        });
+    });
+}
+
+
+
+
+
+
+
+module MenuComponent {
+    $(function () {
+        var sample = new ej.Menu($("#syncfusionProducts"),{
+            width: "100%",
+            animationType: ej.AnimationType.Default,
+            cssClass: 'gradient-lime ',
+            enableAnimation: true,
+            enableSeparator: true,
+            height: 40,
+            htmlAttributes: { "aria-label": "menu" },
+            menuType: "normalmenu",
+            orientation: ej.Orientation.Horizontal,
+            showRootLevelArrows: true,
+            showSubLevelArrows: true,
+            subMenuDirection: ej.Direction.Right,
+            titleText: "Menu",
+
+        });
+    });
+
+}
+
+
+
+
+
+
+ 
+
+module NavigationDrawerComponent {
+    $(function () {
+        var navigationdrawerInstance = new ej.NavigationDrawer($("#navpane"), {
+           targetId: "butdrawer",
+            contentId: "content_container",
+            type: "overlay",
+            direction: "left",
+            enableListView: true,
+            listViewSettings: {
+                width: 300,
+                selectedItemIndex: 0
+            },
+            position: "normal"
+        });
+		$("#navpane_listview").click(function(e: any) {
+            var text=e.target["text"]||$(e.target).closest("li.e-list").text();
+            $("#butdrawer").parent().children("h2").text(text);
+        });
+    });
+}
+
+
+
+module PDFViewerComponent {
+    $(function () {
+        var pdfviewerControl = new ej.PdfViewer($("#pdfviewer"), {
+            serviceUrl:(<any>window).baseurl+ "api/PdfViewer",
+            isResponsive: true
+        });
+    });
+}
+
+
+
+module PivotChartOlap {
+    $(function () {
+        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"
+        });
+    });
+}
+
+
+
+var pivot_dataset = [
+    { Amount: 100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Alberta" },
+    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 3, State: "British Columbia" },
+    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
+    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
+    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
+    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
+    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
+    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
+    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
+    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
+    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
+    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
+    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
+    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
+    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
+    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
+    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
+    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
+    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
+    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
+    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
+    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
+]
+
+module PivotChartRelational {
+
+    $(function () {
+        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"
+        });
+    });
+}
+
+
+
+module PivotGaugeOlap {
+
+    $(function () {
+        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:[]
+			},
+            enableTooltip: true, isResponsive: true,
+            labelFormatSettings: { decimalPlaces: 2 },
+			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
+                },
+				{		
+					type: "marker",
+					markerType: "diamond",
+					distanceFromScale: 5,
+					placement: "center",
+					backgroundColor: "#29A4D9",
+					length: 25,
+					width: 15
+				}],
+                ticks: [{
+					type: "major",
+                    distanceFromScale: 2,
+					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"
+                },
+				{
+					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"
+                }]
+            }]
+        });
+    });	
+}
+
+
+
+var pivot_dataset = [
+    { Amount: 100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Alberta" },
+    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 3, State: "British Columbia" },
+    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
+    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
+    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
+    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
+    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
+    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
+    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
+    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
+    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
+    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
+    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
+    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
+    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
+    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
+    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
+    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
+    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
+    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
+    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
+    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
+]
+
+module PivotGaugeRelational {
+    $(function () {
+        var sample = new ej.PivotGauge($("#PivotGauge"),{
+            dataSource: {
+				data: pivot_dataset,
+				rows: [
+					{
+						fieldName: "Country",
+					},
+					{
+						fieldName: "State",
+					}
+				],
+				columns: [
+					{
+						fieldName: "Product",
+					}
+				],
+                values: [
+					{
+						fieldName: "Amount",
+					},
+					{
+						fieldName: "Quantity",
+					}
+				]
+			},
+            enableTooltip: true, isResponsive: true,
+            labelFormatSettings: { decimalPlaces: 2 },
+			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
+                },
+				{		
+					type: "marker",
+					markerType: "diamond",
+					distanceFromScale: 5,
+					placement: "center",
+					backgroundColor: "#29A4D9",
+					length: 25,
+					width: 15
+				}],
+                ticks: [{
+					type: "major",
+                    distanceFromScale: 2,
+					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"
+                },
+				{
+					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"
+                }]
+            }]
+        });
+    });	
+}
+
+
+
+module PivotGridOlap {
+
+    $(function () {
+        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"
+        });
+        $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
+    });
+}
+
+
+
+var pivot_dataset = [
+    { Amount: 100, Country: "Canada", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Alberta" },
+    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Van", Quantity: 3, State: "British Columbia" },
+    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
+    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
+    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
+    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
+    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
+    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
+    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
+    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
+    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
+    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
+    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
+    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
+    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
+    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
+    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
+    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
+    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
+    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
+    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
+    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
+]
+
+module PivotGridRelational {
+    $(function () {
+        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"
+        });
+       $("#PivotSchemaDesigner").ejPivotSchemaDesigner(); 
+
+    });
+}
+
+
+
+module PivotTreeMap {
+    $(function () {
+        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:[]
+		}
+        });
+    });
+}
+
+
+
+module ProgressBarComponent {
+    $(function () {
+        var sample = new ej.ProgressBar($("#progressBar"),{
+            width: 200,
+            value: 45,
+            height: 20,
+            enablePersistence: true,
+            maxValue: 200,
+            minValue: 0,
+            showRoundedCorner: true,
+            text: 'loading...'
+        });
+    });
+
+}
+
+
+
+
+declare var rteObj: any;
+declare var data: any;
+var radialEle = $('#defaultradialmenu'), action = 0, forRedo = 0;
+var rteEle = $("#rteSample1");
+module RadialMenuComponent {
+    $(function () {
+
+        if (!(ej.browserInfo().name == "msie" && parseInt(ej.browserInfo().version) < 9)) {
+            var radialmenuInstance = new ej.RadialMenu($("#defaultradialmenu"), {
+                imageClass: "imageclass",
+                backImageClass: "backimageclass",
+                targetElementId: "radialtarget1"
+            });
+			$("#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" });
+        }
+        var rteInstance = new ej.RTE($("#rteSample1"), {
+            width: "100%",
+            minWidth: "10px",
+            change: (e) => { radialEle.ejRadialMenu("enableItem", "Undo"); },
+            select: (e) => {
+                var target = $("#radialtarget1"), radialRadius = 150, radialDiameter = 2 * radialRadius,
+                    // To get Iframe positions
+                    iframeY = e.event.clientY, iframeX = e.event.clientX,
+                    // To set Radial Menu position within target
+                    x = iframeX > target.width() - radialRadius ? target.width() - radialDiameter : (iframeX > radialRadius ? iframeX - radialRadius : 0),
+                    y = iframeY > target.height() - radialRadius ? target.height() - radialDiameter : (iframeY > radialRadius ? iframeY - radialRadius : 0);
+                radialEle.ejRadialMenu("setPosition", x, y);
+                radialEle.focus();
+                $('iframe').contents().find('body').blur();
+            },
+            showToolbar: false,
+            showContextMenu: false
+        });
+        $(window).resize(function () {
+            if (ej.isMobile() && ej.isPortrait())
+                $('#defaultradialmenu').css({ "left": 25 });
+        });
+    });
+}
+
+
+function bold(e: any) {
+
+    rteObj = rteEle.data("ejRTE");
+    rteObj.executeCommand("bold");
+    data = rteObj._getSelectedHtmlString() ? true : false;
+    if (data) action += 1;
+    forRedo = action;
+    radialEle.focus();
+}
+function italic(e: any) {
+    rteObj = rteEle.data("ejRTE");
+    rteObj.executeCommand("italic");
+    data = rteObj._getSelectedHtmlString() ? true : false;
+    if (data) action += 1;
+    forRedo = action;
+    radialEle.focus();
+}
+function undo(e: any) {
+    rteObj = rteEle.data("ejRTE");
+    rteObj.executeCommand("undo");
+    action -= 1;
+    if (action == 0)
+        radialEle.ejRadialMenu("disableItem", "Undo");
+    radialEle.ejRadialMenu("enableItem", "Redo");
+    radialEle.focus();
+}
+function redo(e: any) {
+    rteObj = rteEle.data("ejRTE");
+    rteObj.executeCommand("redo");
+    action += 1;
+    if (forRedo == action) radialEle.ejRadialMenu("disableItem", "Redo");
+    radialEle.ejRadialMenu("enableItem", "Undo");
+    radialEle.focus();
+}
+
+
+ 
+
+module RadialSliderComponent {
+    $(function () {
+        var radialsliderInstance = new ej.RadialSlider($("#radialSlider"), {
+           innerCircleImageUrl: "images/radialslider/chevron-right.png"
+        });
+    });
+}
+
+
+module rangecomponent {
+    $(function () {
+        var linearsample = new ej.datavisualization.RangeNavigator($("#RangeNavigator"), {
+            enableDeferredUpdate: true,
+            padding: "15",
+            allowSnapping: true,
+            selectedRangeSettings: {
+                start: "2010/5/1", end: "2011/10/1"
+            },
+            isResponsive: true,
+            tooltipSettings: {
+                visible: true, labelFormat: "MM/dd/yyyy", backgroundColor: "gray", tooltipDisplayMode: "ondemand"
+            },
+            load: () => {
+                var rn = $("#RangeNavigator").data("ejRangeNavigator");
+                rn.model.series = [
+                    {
+                        type: 'line',
+                        dataSource: data.Open, xName: "XValue", yName: "YValue",
+                        fill: '#69D2E7'
+                    }
+                ];
+            },
+            loaded: function () {
+                var sender = $("#RangeNavigator").data("ejRangeNavigator");
+                var theme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
+                if (theme) {
+                    switch (theme) {
+                        case "flatazurelight":
+                            theme = "azurelight";
+                            break;
+                        case "flatlimelight":
+                            theme = "limelight";
+                            break;
+                        case "flatsaffronlight":
+                            theme = "saffronlight";
+                            break;
+                        case "gradientazurelight":
+                            theme = "gradientazure";
+                            break;
+                        case "gradientlimelight":
+                            theme = "gradientlime";
+                            break;
+                        case "gradientsaffronlight":
+                            theme = "gradientsaffron";
+                            break;
+                        case "flatazuredark":
+                            theme = "azuredark";
+                            break;
+                        case "flatlimedark":
+                            theme = "limedark";
+                            break;
+                        case "flatsaffrondark":
+                            theme = "saffrondark";
+                            break;
+                        case "gradientazuredark":
+                            theme = "gradientazuredark";
+                            break;
+                        case "gradientlimedark":
+                            theme = "gradientlimedark";
+                            break;
+                        case "gradientsaffrondark":
+                            theme = "gradientsaffrondark";
+                            break;
+                        case "flathigh-contrast-01dark":
+                            theme = "highcontrast01";
+                            break;
+                        case "flathigh-contrast-02dark":
+                            theme = "highcontrast02";
+                            break;
+                        case "flatmateriallight":
+                            theme = "material";
+                            break;
+                        case "flatoffice-365light":
+                            theme = "office";
+                            break;
+                        default:
+                            theme = "flatlight";
+                            break;
+                    }
+                    sender.model.theme = theme;
+                }
+            }
+
+        });
+    });
+}
+var data;
+data = GetData();
+
+function GetData() {
+    var series1:any[]=[];
+    var series2:any[]= [];
+    var value = 100;
+    var value1 = 120;
+    for (var i = 1; i < 730; i++) {
+
+        if (Math.random() > .5) {
+            value += Math.random();
+            value1 += Math.random();
+        } else {
+            value -= Math.random();
+            value1 -= Math.random();
+        }
+        var point1 = { XValue: new Date(2010, 0, i), YValue: value };
+        var point2 = { XValue: new Date(2010, 0, i), YValue: value1 };
+        series1.push(point1);
+        series2.push(point2);
+    }
+
+    data = { Open: series1, Close: series2 };
+    return data;
+};
+
+
+
+module RatingComponent {
+    $(function () {
+
+        var sample1 = new ej.Rating($("#fullRating"),{
+            value: 4,
+            precision: ej.Rating.Precision.Full,
+            allowReset: true,
+            cssClass: "gradient-lime",
+            enabled: true,
+            enablePersistence: true,
+            incrementStep: 2,
+            maxValue: 10,
+            minValue: 0,
+            orientation: ej.Orientation.Horizontal,
+            shapeHeight: 25,
+            shapeWidth: 25,
+            showTooltip: true
+        });
+		
+        var sample2 = new ej.Rating($("#halfRating"),{
+            precision: ej.Rating.Precision.Half,
+            value: 3.5,
+            allowReset: true,
+            cssClass: "gradient-lime",
+            enabled: true,
+            enablePersistence: true,
+            incrementStep: 2,
+            maxValue: 10,
+            minValue: 0,
+            orientation: "horizontal",
+            shapeHeight: 25,
+            shapeWidth: 25,
+            showTooltip: true
+        });
+
+        var sample3 = new ej.Rating($("#exactRating"),{
+            precision: ej.Rating.Precision.Exact,
+            value: 3.7,
+            allowReset: true,
+            cssClass: "gradient-lime",
+            enabled: true,
+            enablePersistence: true,
+            incrementStep: 2,
+            maxValue: 10,
+            minValue: 0,
+            orientation: "horizontal",
+            shapeHeight: 25,
+            shapeWidth: 25,
+            showTooltip: true
+        }); 
+    });
+
+}
+
+
+
+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
+		});
+	});
+}
+
+
+
+var fontfamily = ["Segoe UI", "Arial", "Times New Roman", "Tahoma", "Helvetica"], fontsize = ["1pt", "2pt", "3pt", "4pt", "5pt"], action1 = ["New", "Clear"], action2 = ["Bold", "Italic", "Underline", "strikethrough", "superscript", "subscript", "JustifyLeft", "JustifyCenter", "JustifyRight", "JustifyFull", "Undo", "Redo"];
+module RibbonComponent {
+    $(function () {
+        var sample = new ej.Ribbon($("#defaultRibbon"), {
+            width: "100%",
+            expandPinSettings: {
+                toolTip: "Collapse the Ribbon"
+            },
+            collapsePinSettings: {
+                toolTip: "Pin the Ribbon"
+            },
+            applicationTab: {
+                 type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false } 
+            },
+            tabs: [{
+                id: "home", text: "HOME", groups: [{
+                    text: "New", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                        groups: [{
+                            id: "new",
+                            text: "New",
+                            toolTip: "New",
+                            buttonSettings: {
+                                contentType: ej.ContentType.ImageOnly,
+                                imagePosition: ej.ImagePosition.ImageTop,
+                                prefixIcon: "e-icon e-ribbon e-new",
+                                click: "onClick"
+                            }
+                        }
+                        ],
+                        defaults: {
+                            type: "button",
+                            width: 60,
+                            height: 70
+                        }
+                    }]
+                },
+                {
+                        text: "Clipboard", alignType: ej.Ribbon.AlignType.Columns, content: [{
+                            groups: [{
+                                id: "paste",
+                                text: "paste",
+                                toolTip: "Paste",
+                                splitButtonSettings: {
+                                    contentType: ej.ContentType.ImageOnly,
+                                    prefixIcon: "e-icon e-ribbon e-ribbonpaste",
+                                    targetID: "pasteSplit",
+                                    buttonMode: "dropdown",
+                                    click: "onClick",
+                                    arrowPosition: ej.ArrowPosition.Bottom
+                                }
+                            }
+                            ],
+                            defaults: {
+                                type: "splitbutton",
+                                width: 50,
+                                height: 70
+                            }
+                        },
+                        {
+                             groups: [{
+                                    id: "cut",
+                                    text: "Cut",
+                                    toolTip: "Cut",
+                                    buttonSettings: {
+                                        contentType: ej.ContentType.TextAndImage,
+                                        click: "onClick",
+                                        prefixIcon: "e-icon e-ribbon e-ribboncut"
+                                    }
+                                },
+                                    {
+                                        id: "copy",
+                                        text: "Copy",
+                                        toolTip: "Copy",
+                                        buttonSettings: {
+                                            contentType: ej.ContentType.TextAndImage,
+                                            click: "onClick",
+                                            prefixIcon: "e-icon e-ribbon e-ribboncopy"
+                                        }
+                                    },
+                                    {
+                                        id: "clear",
+                                        text: "Clear",
+                                        toolTip: "Clear All",
+                                        buttonSettings: {
+                                            contentType: ej.ContentType.TextAndImage,
+                                            click: "onClick",
+                                            prefixIcon: "e-icon e-ribbon clearAll"
+                                        }
+                                    }],
+                                     defaults: {
+                                    type: "button",
+                                    width: 60,
+                                    isBig: false
+                                }
+                            }] 
+                },
+                {
+                        text: "Font", alignType: "rows", content: [{
+                            groups: [{
+                                id: "fontfamily",
+                                toolTip: "Font",
+                                dropdownSettings: {
+                                    dataSource: fontfamily,
+                                    text: "Segoe UI",
+                                    select: "onClick",
+                                    width: 150
+                                }
+                            },
+                                {
+                                    id: "fontsize",
+                                    toolTip: "FontSize",
+                                    dropdownSettings: {
+                                        dataSource: fontsize,
+                                        text: "1pt",
+                                        select: "onClick",
+                                        width: 65
+                                    }
+                                }],
+                            defaults: {
+                                type: "dropdownlist",
+                                height: 28
+                            }
+                        },
+                            {
+                                groups: [{
+                                    id: "bold",
+                                    toolTip: "Bold",
+                                    type: ej.Ribbon.Type.ToggleButton,
+                                    toggleButtonSettings: {
+                                        contentType: ej.ContentType.ImageOnly,
+                                        defaultText: "Bold",
+                                        activeText: "Bold",
+                                        click: "onClick",
+                                        defaultPrefixIcon: "e-icon e-ribbon bold",
+                                        activePrefixIcon: "e-icon e-ribbon bold"
+                                    }
+                                },
+                                    {
+                                        id: "italic",
+                                        toolTip: "Italic",
+                                        type: ej.Ribbon.Type.ToggleButton,
+                                        toggleButtonSettings: {
+                                            contentType: ej.ContentType.ImageOnly,
+                                            defaultText: "Italic",
+                                            activeText: "Italic",
+                                            click: "onClick",
+                                            defaultPrefixIcon: "e-icon e-ribbon e-ribbonitalic",
+                                            activePrefixIcon: "e-icon e-ribbon e-ribbonitalic"
+                                        }
+                                    },
+                                    {
+                                        id: "underline",
+                                        text: "Underline",
+                                        toolTip: "Underline",
+                                        type: ej.Ribbon.Type.ToggleButton,
+                                        toggleButtonSettings: {
+                                            contentType: ej.ContentType.ImageOnly,
+                                            defaultText: "Underline",
+                                            activeText: "Underline",
+                                            click: "onClick",
+                                            defaultPrefixIcon: "e-icon e-ribbon e-ribbonunderline",
+                                            activePrefixIcon: "e-icon e-ribbon e-ribbonunderline"
+                                        }
+                                    },
+                                    {
+                                        id: "strikethrough",
+                                        text: "strikethrough",
+                                        toolTip: "Strikethrough",
+                                        type: ej.Ribbon.Type.ToggleButton,
+                                        toggleButtonSettings: {
+                                            contentType: ej.ContentType.ImageOnly,
+                                            defaultText: "Strikethrough",
+                                            activeText: "Strikethrough",
+                                            click: "onClick",
+                                            defaultPrefixIcon: "e-icon e-ribbon strikethrough",
+                                            activePrefixIcon: "e-icon e-ribbon strikethrough"
+                                        }
+                                    },
+                                    {
+                                        id: "superscript",
+                                        text: "superscript",
+                                        toolTip: "Superscript",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-superscripticon"
+                                        }
+                                    },
+                                    {
+                                        id: "subscript",
+                                        text: "subscript",
+                                        toolTip: "Subscript",
+                                        enableSeparator: true,
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-subscripticon"
+                                        }
+                                    },
+                                    {
+                                        id: "fontcolor",
+                                        text: "Font Color",
+                                        toolTip: "Font Color",
+                                        type: ej.Ribbon.Type.Custom,
+                                        contentID: "fontcolor"
+                                    },
+                                    {
+                                        id: "fillcolor",
+                                        text: "Fill Color",
+                                        toolTip: "Fill Color",
+                                        type: ej.Ribbon.Type.Custom,
+                                        contentID: "fillcolor"
+                                    }
+                                ],
+                                defaults: {
+                                    isBig: false
+                                }
+                            }]
+                    },
+                    {
+                        text: "Alignment", alignType: ej.Ribbon.AlignType.Rows, content: [
+                            {
+                                groups: [{
+                                    id: "bullet",
+                                    text: "Bullet Format",
+                                    toolTip: "Bullets",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.ImageOnly,
+                                        prefixIcon: "e-icon e-ribbon e-bullet"
+                                    }
+                                },
+                                    {
+                                        id: "number",
+                                        text: "Number Format",
+                                        toolTip: "Numbering",
+                                        enableSeparator: true,
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-numbericon"
+                                        }
+                                    },
+                                    {
+                                        id: "textindent",
+                                        text: "Indent",
+                                        toolTip: "Text Indent",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-indent"
+                                        }
+                                    },
+                                    {
+                                        id: "textoudent",
+                                        text: "Outdent",
+                                        toolTip: "Text Outdent",
+                                        enableSeparator: true,
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-outdent"
+                                        }
+                                    },
+                                    {
+                                        id: "sortascending",
+                                        text: "Sort",
+                                        toolTip: "Sort",
+                                        enableSeparator: true,
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-sort"
+                                        }
+                                    },
+                                    {
+                                        id: "border",
+                                        text: "Border",
+                                        toolTip: "Border",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-border"
+                                        }
+                                    }],
+                                defaults: {
+                                    type: "button",
+                                    isBig: false
+                                }
+                            },
+                            {
+                                groups: [{
+                                    id: "alignleft",
+                                    text: "JustifyLeft",
+                                    toolTip: "Align Left",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.ImageOnly,
+                                        prefixIcon: "e-icon e-ribbon alignleft"
+                                    }
+                                },
+                                    {
+                                        id: "aligncenter",
+                                        text: "JustifyCenter",
+                                        toolTip: "Align Center",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon aligncenter"
+                                        }
+                                    },
+                                    {
+                                        id: "alignright",
+                                        text: "JustifyRight",
+                                        toolTip: "Align Right",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon alignright"
+                                        }
+                                    },
+                                    {
+                                        id: "justify",
+                                        text: "JustifyFull",
+                                        toolTip: "Justify",
+                                        enableSeparator: true,
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon justify"
+                                        }
+                                    },
+                                    {
+                                        id: "uppercase",
+                                        text: "Upper Case",
+                                        toolTip: "Upper Case",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-uppercase"
+                                        }
+                                    },
+                                    {
+                                        id: "lowercase",
+                                        text: "Lower Case",
+                                        toolTip: "Lower Case",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-lowercase"
+                                        }
+                                    }],
+                                defaults: {
+                                    type: "button",
+                                    isBig: false
+                                }
+                            }]
+                    },
+                    {
+                        text: "Actions", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                            groups: [{
+                                id: "undo",
+                                text: "Undo",
+                                toolTip: "Undo",
+                                buttonSettings: {
+                                    click: "onClick",
+                                    contentType: ej.ContentType.TextAndImage,
+                                    imagePosition: ej.ImagePosition.ImageTop,
+                                    prefixIcon: "e-icon e-ribbon e-undo"
+                                }
+                            },
+                                {
+                                    id: "redo",
+                                    text: "Redo",
+                                    toolTip: "Redo",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-redo"
+                                    }
+                                }
+                            ],
+                            defaults: {
+                                type: "button",
+                                width: 40,
+                                height: 70
+                            }
+                        }]
+                    },
+                    {
+                        text: "View", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                            groups: [{
+                                id: "zoomin",
+                                text: "Zoom In",
+                                toolTip: "Zoom In",                                
+                                buttonSettings: {
+                                    width: 58,
+                                    click: "onClick",
+                                    contentType: ej.ContentType.TextAndImage,
+                                    imagePosition: ej.ImagePosition.ImageTop,
+                                    prefixIcon: "e-icon e-ribbon e-zoomin"
+                                }
+                            },
+                                {
+                                    id: "zoomout",
+                                    text: "Zoom Out",
+                                    toolTip: "Zoom Out",                                    
+                                    buttonSettings: {
+                                        width: 70,
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-zoomout"
+                                    }
+                                },
+                                {
+                                    id: "fullscreen",
+                                    text: "Full Screen",
+                                    toolTip: "Full Screen",                                    
+                                    buttonSettings: {
+                                        width: 73,
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-fullscreen"
+                                    }
+                                }
+                            ],
+                            defaults: {
+                                type: "button",
+                                height: 70
+                            }
+                        }]
+                    }]
+            },{
+                    id: "insert", text: "INSERT", groups: [{
+                        text: "Tables", alignType: ej.Ribbon.AlignType.Columns, content: [{
+                            groups: [{
+                                id: "tables",
+                                text: "Tables",
+                                toolTip: "Tables",
+                                buttonSettings: {
+                                    click: "onClick",
+                                    contentType: ej.ContentType.TextAndImage,
+                                    imagePosition: ej.ImagePosition.ImageTop,
+                                    prefixIcon: "e-icon e-ribbon e-table"
+                                }
+                            }
+                            ],
+                            defaults: {
+                                type: "button",
+                                width: 50,
+                                height: 70
+                            }
+                        }]
+                    },
+                        {
+                            text: "Illustrations", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "pictures",
+                                    text: "Pictures",
+                                    toolTip: "Pictures",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-picture"
+                                    }
+                                },
+                                    {
+                                        id: "videos",
+                                        text: "Videos",
+                                        toolTip: "Videos",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.TextAndImage,
+                                            imagePosition: ej.ImagePosition.ImageTop,
+                                            prefixIcon: "e-icon e-ribbon e-video"
+                                        }
+                                    },
+                                    {
+                                        id: "shapes",
+                                        text: "Shapes",
+                                        toolTip: "Shapes",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.TextAndImage,
+                                            imagePosition: ej.ImagePosition.ImageTop,
+                                            prefixIcon: "e-icon e-ribbon e-shape"
+                                        }
+                                    },
+                                    {
+                                        id: "charts",
+                                        text: "Charts",
+                                        toolTip: "Charts",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.TextAndImage,
+                                            imagePosition: ej.ImagePosition.ImageTop,
+                                            prefixIcon: "e-icon e-ribbon e-chart"
+                                        }
+                                    }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 56,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Comments", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "comments",
+                                    text: "Comments",
+                                    toolTip: "Comments",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-comment"
+                                    }
+                                }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 70,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Text", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "text",
+                                    text: "Text",
+                                    toolTip: "Text",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-text",
+                                        width: 50
+                                    }
+                                },
+                                    {
+                                        id: "datetime",
+                                        text: "Date Time",
+                                        toolTip: "DateTime",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.TextAndImage,
+                                            imagePosition: ej.ImagePosition.ImageTop,
+                                            prefixIcon: "e-icon e-ribbon e-datetimenew"
+                                        }
+                                    }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 70,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Hyperlink", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "hyperlink",
+                                    text: "Hyperlink",
+                                    toolTip: "Hyperlink",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-hyperlink"
+                                    }
+                                }
+                                ],
+                                defaults: {
+                                   type: "button",
+                                    width: 70,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Equation", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "equation",
+                                    text: "Equation",
+                                    toolTip: "Equation",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-equation"
+                                    }
+                                }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 60,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Print Layout", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "printlayout",
+                                    text: "Print Layout",
+                                    toolTip: "Print Layout",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-printlayout"
+                                    }
+                                }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 80,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Save", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "print",
+                                    text: "Print",
+                                    toolTip: "Print",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-print"
+                                    }
+                                },
+                                    {
+                                        id: "save",
+                                        text: "Save",
+                                        toolTip: "Save",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.TextAndImage,
+                                            imagePosition: ej.ImagePosition.ImageTop,
+                                            prefixIcon: "e-icon e-ribbon e-save"
+                                        }
+                                    }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 50,
+                                    height: 70
+                                }
+                            }]
+                        }
+                    ]
+                }
+            ],   
+            create: function createControl(args) {
+                var ribbon = $("#defaultRibbon").data("ejRibbon");
+                $("#fontcolor").ejColorPicker({ value: "#FFFF00", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fontcoloricon", select: colorHandler });
+                $("#fillcolor").ejColorPicker({ value: "#FF0000", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fillcoloricon", select: colorHandler });
+            }
+        });
+    });
+}
+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) {
+    var val, prop = args.text;
+    val = (ej.isNullOrUndefined(args.model.text)) ? args.model.activeText : args.model.text;
+    if (action1.indexOf(val) != -1)
+        $("#contenteditor").empty();
+    else if (action2.indexOf(val) != -1)
+        document.execCommand(val, false, null);
+    else if (fontfamily.indexOf(prop) != -1)
+        document.execCommand("FontName", false, prop);
+    else if (fontsize.indexOf(prop) != -1)
+        document.execCommand("FontSize", false, prop.replace("pt", ""));
+    else
+        $("#contenteditor").append("<p> Action: " + val + " Triggered </p>");
+}
+
+
+
+
+ 
+
+module RotatorComponent {
+    $(function () {
+        var rotatorInstance = new ej.Rotator($("#sliderContent"), {
+            slideWidth: "100%",
+            frameSpace: "0px",
+            slideHeight: "auto",
+            displayItemsCount: "1",
+            navigateSteps: "1",
+            pagerPosition:"outside",
+            orientation: "horizontal",
+            showPager: true,
+            enabled: true,
+            showCaption: true,
+            allowKeyboardNavigation: true,
+            showPlayButton: true,
+            isResponsive:true,
+            animationType: "slide",
+        });
+    });
+}
+
+
+
+module RTEComponent {
+    $(function () {
+        var sample = new ej.RTE($("#rteSample"),{
+            width: "100%",
+            minWidth: "150px",
+            showFooter: true,
+            showHtmlSource: true,
+            allowEditing: true,
+            allowKeyboardNavigation: true,
+            autoFocus: true,
+            autoHeight: true,
+            colorPaletteColumns: 10,
+            colorPaletteRows: 5,
+            cssClass: 'gradient-lime',
+            enableResize: true,
+            enableTabKeyNavigation: true,
+            fileBrowser: {
+                filePath: (<any>window).baseurl + "Content/FileBrowser/",
+                extensionAllow: "*.png, *.doc, *.pdf, *.txt, *.docx",
+                ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
+            },
+            imageBrowser: {
+                filePath: (<any>window).baseurl + "Content/FileBrowser/",
+                extensionAllow: "*.png, *.gif, *.jpg, *.jpeg, *.docx",
+                ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
+            },
+            isResponsive: true,
+            showClearAll: true,
+            showClearFormat: true,
+            showDimensions: true,
+            showCharCount: true,
+            tools: {
+                formatStyle: ["format"],
+                edit: ["findAndReplace"],
+                font: ["fontName", "fontSize", "fontColor", "backgroundColor"],
+                style: ["bold", "italic", "underline", "strikethrough"],
+                alignment: ["justifyLeft", "justifyCenter", "justifyRight", "justifyFull"],
+                lists: ["unorderedList", "orderedList"],
+                clipboard: ["cut", "copy", "paste"],
+                doAction: ["undo", "redo"],
+                indenting: ["outdent", "indent"],
+                clear: ["clearFormat", "clearAll"],
+                links: ["createLink", "removeLink"],
+                images: ["image"],
+                media: ["video"],
+                tables: ["createTable", "addRowAbove", "addRowBelow", "addColumnLeft", "addColumnRight", "deleteRow", "deleteColumn", "deleteTable"],
+                effects: ["superscript", "subscript"],
+                casing: ["upperCase", "lowerCase"],
+                view: ["fullScreen", "zoomIn", "zoomOut"],
+                print: ["print"],
+                customUnorderedList: [{
+                    name: "unOrderInsert",
+                    tooltip: "Custom UnOrderList",
+                    css: "e-rte-toolbar-icon e-rte-unlistitems customUnOrder",
+                    text: "Smiley",
+                    listImage: "url('../content/images/rte/Smiley-GIF.gif')"
+                }],
+                customOrderedList: [{
+                    name: "orderInsert",
+                    tooltip: "Custom OrderList",
+                    css: "e-rte-toolbar-icon e-rte-listitems customOrder",
+                    text: "Lower-Greek",
+                    listStyle: "lower-greek"
+                }]
+            }
+        });
+    });
+
+}
+
+
+
+module ScheduleComponent {
+    $(function () {
+        var sample = new ej.Schedule($("#Schedule1"), {
+            width: "100%",
+            height: "525px",
+            currentDate: new Date(2017, 5, 5),
+            timeScale: {
+                minorSlotCount: 4,
+                majorSlot: 60
+            },
+            contextMenuSettings: {
+                enable: true,
+                menuItems: {
+                    appointment: [
+                        { id: "open", text: "Open Appointment" },
+                        { id: "delete", text: "Delete Appointment" },
+                        { id: "customMenu3", text: "Menu Item 3" },
+                        { id: "customMenu4", text: "Menu Item 4" }
+                    ],
+                    cells: [
+                        { id: "new", text: "New Appointment" },
+                        { id: "recurrence", text: "New Recurring Appointment" },
+                        { id: "today", text: "Today" },
+                        { id: "gotodate", text: "Go to date" },
+                        { id: "settings", text: "Settings" },
+                        { id: "view", text: "View", parentId: "settings" },
+                        { id: "timemode", text: "TimeMode", parentId: "settings" },
+                        { id: "view_Day", text: "Day", parentId: "view" },
+                        { id: "view_Week", text: "Week", parentId: "view" },
+                        { id: "view_Workweek", text: "Workweek", parentId: "view" },
+                        { id: "view_Month", text: "Month", parentId: "view" },
+                        { id: "timemode_Hour12", text: "12 Hours", parentId: "timemode" },
+                        { id: "timemode_Hour24", text: "24 Hours", parentId: "timemode" },
+                        { id: "workhours", text: "Work Hours", parentId: "settings" },
+                        { id: "customMenu1", text: "Menu Item 1" },
+                        { id: "customMenu2", text: "Menu Item 2" }
+                    ]
+                }
+            },
+            resources: [{
+                field: "ownerId",
+                title: "Owner",
+                name: "Owners", allowMultiple: true,
+                resourceSettings: {
+                    dataSource: [
+                        { text: "Nancy", id: 1, groupId: 1, color: "#f8a398" },
+                        { text: "Steven", id: 3, groupId: 2, color: "#56ca85" },
+                        { text: "Michael", id: 5, groupId: 1, color: "#51a0ed" }
+                    ],
+                    text: "text", id: "id", groupId: "groupId", color: "color"
+                }
+            }],
+            appointmentSettings: {
+                dataSource: new ej.DataManager((<any>window).ResourcesData).executeLocal(new ej.Query().take(10)),
+                id: "Id",
+                subject: "Subject",
+                startTime: "StartTime",
+                endTime: "EndTime",
+                description: "Description",
+                allDay: "AllDay",
+                recurrence: "Recurrence",
+                recurrenceRule: "RecurrenceRule",
+                resourceFields: "ownerId"
+            }
+        });
+    });
+}   
+
+
+
+module ScrollerComponent {
+    $(function () {
+        var scrollerSample = new ej.Scroller($("#scrollcontent"), {
+            height: "300px",
+            width: "100%"
+        });
+        $(window).bind('resize', function () {
+            scrollerSample.refresh();
+        });

+    });
+}
+
+
+
+module SignatureComponent {
+    $(function () {
+        var basicSignature = new ej.Signature($("#signature"), {
+            height: "400px",
+            isResponsive: true,
+            strokeWidth: 3
+        });
+    });
+}
+
+
+
+
+module SliderComponent {
+    $(function () {
+        var slider = new ej.Slider($("#minSlider"), {
+            sliderType: "MinRange",
+            value: 60,
+            minValue: 0,
+            maxValue: 100
+        });
+        var rangeslider = new ej.Slider($("#rangeSlider"), {
+            sliderType: "Range",
+            values: [30, 60],
+            minValue: 0
+        });
+
+    });
+}
+
+
+
+
+
+
+module linesparkline {
+    $(function () {
+
+        var sparklinesample = new ej.Sparkline($("#line"), {
+            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" }
+            },
+            type: "line",
+            size: { height: "40", width:"170" },
+        });
+    });
+}
+
+module columnsparkline {
+    $(function () {
+        var sparkcolumnsample = new ej.Sparkline($("#column"), {
+            dataSource: [2, 6, -1, 1, 12, 5, -2, 7, -3, 5, 8, 10,],
+            negativePointColor: "red",
+            highPointColor: "blue",
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            type: "column",
+            size: { height: "100", width: "150" },
+        });
+    });
+}
+
+module areasparkline {
+    $(function () {
+        var sparkareasample = new ej.Sparkline($("#area"), {
+            dataSource: [12, -10, 11, 8, 17, 6, 2, -17, 13, -6, 8, 10,],
+            markerSettings: { visible: true },
+            highPointColor: "blue",
+            lowPointColor: "orange",
+            type: "area",
+            opacity: 0.5,
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            size: { height: "100", width: "150" },
+        });
+    });
+}
+
+module windlosssparkline {
+    $(function () {
+        var sparkwinlosssample = new ej.Sparkline($("#winloss"), {
+            dataSource: [12, 15, -11, 13, 17, 0, -12, 17, 13, -15, 8, 10,],
+            type: "winloss",
+            size: { height: "100", width: "150" },
+        });
+    });
+}
+
+module piesparkline1 {
+    $(function () {
+        var sparkpiesample1 = new ej.Sparkline($("#pie1"), {
+            dataSource: [4, 6, 7],
+            type: "pie",
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            size: { height: "40", width: "40" },
+        });
+    });
+}
+
+module piesparkline2 {
+    $(function () {
+        var sparkpiesample2 = new ej.Sparkline($("#pie2"), {
+            dataSource: [8, 9, 1,],
+            type: "pie",
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            size: { height: "40", width: "40" },
+        });
+    });
+}
+
+module piesparkline3 {
+    $(function () {
+        var sparkpiesample3 = new ej.Sparkline($("#pie3"), {
+            dataSource: [2, 3, 5],
+            type: "pie",
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            size: { height: "40", width: "40" },
+        });
+    });
+}
+
+module piesparkline4 {
+    $(function () {
+        var sparkpiesample4 = new ej.Sparkline($("#pie4"), {
+            dataSource: [10, 12, 11],
+            type: "pie",
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            size: { height: "40", width: "40" },
+        });
+    });
+}
+
+	
+
+ 
+
+
+module SplitterComponent {
+    $(function () {
+        var splitterInstance = new ej.Splitter($("#outterSpliter"), {
+            height: "250px",
+            width: "50%",
+            orientation: ej.Orientation.Vertical,
+            properties: [{}, { paneSize: 80 }],
+            isResponsive:true
+        });
+        var splitterInstance1 = new ej.Splitter($("#innerSpliter"), {
+            isResponsive:true,
+        });
+    });
+}
+
+
+
+module SpreadsheetComponent {
+$(function () {
+        var sample = new ej.Spreadsheet($("#basicSpreadsheet"), {
+            scrollSettings: {
+                height: 550,
+            },
+            importSettings: {
+                importMapper: (<any>window).baseurl + "api/Spreadsheet/Import"
+            },
+            exportSettings: {
+                excelUrl: (<any>window).baseurl + "api/Spreadsheet/ExcelExport",
+                csvUrl: (<any>window).baseurl + "api/Spreadsheet/CsvExport",
+                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();
+    }}
+        });
+    });
+}
+
+
+
+
+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  }
+];
+
+module sunburstcomponent {
+    $(function () {
+        var sunburstsample = new ej.SunburstChart($("#Sunburst"), {
+            valueMemberPath: "EmployeesCount",           
+            levels: [
+                {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,
+            load: function () {
+                var sender = $("#Sunburst").data("ejSunburstChart");
+                var SunBurstTheme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
+                SunBurstTheme = SunBurstTheme.toString();
+                if (SunBurstTheme.indexOf("dark") > -1 || SunBurstTheme.indexOf("contrast") > -1)
+                    SunBurstTheme = "flatdark";
+                else
+                    SunBurstTheme = "flatlight";
+                sender.model.theme = SunBurstTheme;
+            },
+			title:{text:"Employees Count"},
+			zoomSettings:{enable:false},
+			legend:{visible:true,position:'top'}
+			// load:"loadTheme"
+        });
+    });
+}
+
+
+
+
+module TabComponent {
+    $(function () {
+        var sample = new ej.Tab($("#defaultTab"),{
+            width: "500px",
+            collapsible: true,
+            events: "click",
+            heightAdjustMode: ej.Tab.HeightAdjustMode.Content,
+            showCloseButton: true,
+            showRoundedCorner: false
+        });
+    });
+}
+
+
+
+module TagCloudComponent {
+    
+    
+    var websiteCollection = [
+        { text: "Google", url: "http://www.google.com", frequency: 12 },
+        { text: "All Things Digital", url: "http://allthingsd.com/", frequency: 3 },
+        { text: "Arts Technica", url: "http://arstechnica.com/", frequency: 8 },
+        { text: "Business Week", url: "http://www.businessweek.com/", frequency: 2 },
+        { text: "Yahoo", url: "http://in.yahoo.com/", frequency: 12 },
+        { text: "Center Networks", url: "http://www.centernetworks.com/", frequency: 5 },
+        { text: "Crave", url: "http://news.cnet.com/crave/", frequency: 8 },
+        { text: "Crunch Gear", url: "http://techcrunch.com/gadgets/", frequency: 20 },
+        { text: "Daily Tech", url: "http://www.dailytech.com/", frequency: 1 },
+        { text: "Electronista", url: "http://www.electronista.com/", frequency: 3 },
+        { text: "Engadget", url: "http://www.engadget.com/", frequency: 5 },
+        { text: "Gearlog", url: "http://www.gearlog.com/", frequency: 9 },
+        { text: "Information Week", url: "http://www.informationweek.com/", frequency: 0 },
+        { text: "PCWorld", url: "http://www.pcworld.com/", frequency: 11 },
+        { text: "Tech Republic", url: "http://techrepublic.com/", frequency: 3 },
+        { text: "Valleywag", url: "http://valleywag.gawker.com/", frequency: 6 },
+        { text: "Rediff", url: "http://in.rediff.com/", frequency: 9 },
+        { text: "WebProNews", url: "http://www.webpronews.com/", frequency: 2 }
+    ];
+
+    $(function () {
+        var sample = new ej.TagCloud($("#techWebList"), {
+            titleText: "Tech Sites",
+            dataSource: websiteCollection,
+            cssClass: "gradient-lime",
+            fields: {
+                text: "text", url: "url", frequency: "frequency"
+            }
+        });
+            
+    });
+}
+
+
+
+module EditorComponent {
+    $(function () {
+        var num = new ej.NumericTextbox($("#numeric"), {
+            value: 30,
+            minValue: 1,
+            maxValue: 100,
+            name: "numeric",
+            width: "100%"
+        });
+        var per = new ej.PercentageTextbox($("#percent"), {
+            value: 60,
+            minValue: 10,
+            maxValue: 1000,
+            name: "percent",
+            width: "100%"
+        });
+        var cur = new ej.CurrencyTextbox($("#currency"), {
+            value: 100,
+            minValue: 10,
+            maxValue: 1000,
+            name: "currency",
+            width: "100%"
+        });
+        var mask = new ej.MaskEdit($("#maskedit"), {
+            name: "mask",
+            value: "4242422424",
+            maskFormat: "99 999-99999",
+            width: "100%"
+        })
+    });
+}
+
+
+
+ 
+
+module TileViewComponent {
+    $(function () {
+        var tile1 = new ej.Tile($("#tile1"), {
+            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 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 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 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 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 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 tile13 = new ej.Tile($("#tile13"), {
+            imagePosition:"center",
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/favs.png',
+			caption:{text:"Favorites"}
+        });
+    });
+}
+
+
+
+module TimePickerComponent {
+    $(function () {
+        var timeSample = new ej.TimePicker($("#timepick"), {
+            width: "100%"
+        });
+    });
+}
+
+
+
+
+module ToolbarComponent {
+    
+    $(function () {
+        var sample = new ej.Toolbar($("#editingToolbar"),{
+            width: "100%",
+            cssClass: "gradient-lime",
+            enableSeparator: true,
+            
+            isResponsive: true,
+            orientation: ej.Orientation.Horizontal,
+            showRoundedCorner: true
+        });
+    });
+
+}
+
+
+
+
+module TooltipComponent {
+    
+    $(function () {
+
+        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,
+            collision: "fit",
+            containment: ".frame",
+            showRoundedCorner: true,
+            showShadow: true
+        });
+
+        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: {
+                    horizontal: "right",
+                    vertical: "center"
+                },
+                target: {
+                    horizontal: "left",
+                    vertical: "center"
+                }
+            },
+            autoCloseTimeout: 5000,
+            collision: "fit",
+            containment: ".frame",
+            showRoundedCorner: true,
+            showShadow: true
+        });
+
+        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: {
+                    horizontal: "right",
+                    vertical: "center"
+                },
+                target: {
+                    horizontal: "left",
+                    vertical: "center",
+                },
+            },
+            associate: "mousefollow",
+            autoCloseTimeout: 5000,
+            collision: "fit",
+            containment: ".frame",
+            showRoundedCorner: true,
+            showShadow: true
+        });
+    });
+}
+
+
+
+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,
+    });
+});
+} 
+
+
+
+
+var population_data: Array<Object> = [
+    { Continent: "Asia", Country: "Indonesia", Growth: 3, Population: 237641326 },
+    { Continent: "Asia", Country: "Russia", Growth: 2, Population: 152518015 },
+    { Continent: "Asia", Country: "Malaysia", Growth: 1, Population: 29672000 },
+    { Continent: "North America", Country: "United States", Growth: 4, Population: 315645000 },
+    { Continent: "North America", Country: "Mexico", Growth: 2, Population: 112336538 },
+    { Continent: "North America", Country: "Canada", Growth: 1, Population: 39056064 },
+    { Continent: "South America", Country: "Colombia", Growth: 1, Population: 47000000 },
+    { Continent: "South America", Country: "Brazil", Growth: 3, Population: 193946886 },
+    { Continent: "Africa", Country: "Nigeria", Growth: 2, Population: 170901000 },
+    { Continent: "Africa", Country: "Egypt", Growth: 1, Population: 83661000 },
+    { Continent: "Europe", Country: "Germany", Growth: 1, Population: 81993000 },
+    { Continent: "Europe", Country: "France", Growth: 1, Population: 65605000 },
+    { Continent: "Europe", Country: "UK", Growth: 1, Population: 63181775 }
+];
+
+module treemapcomponent {
+    $(function () {
+        var treemapsample = new ej.datavisualization.TreeMap($("#treemap"), {
+            leafItemSettings: { showLabels: true, labelPath: "Country" },
+            rangeColorMapping: [
+                { color: "#77D8D8", legendLabel: "1% Growth", from: 0, to: 1 },
+                { color: "#AED960", from: 0, legendLabel: "2% Growth", to: 2 },
+                { color: "#FFAF51", from: 0, legendLabel: "3% Growth", to: 3 },
+                { color: "#F3D240", from: 0, legendLabel: "4% Growth", to: 4 }
+            ],
+            levels: [
+                { groupPath: "Continent", groupGap: 5, headerHeight: 25, showHeader: true, headerTemplate: 'headertemplate' }
+            ],
+            dataSource: population_data,
+            colorValuePath: "Growth",
+            weightValuePath: "Population",
+            borderThickness: 0,
+            showLegend: true
+        });
+    });
+}
+
+
+
+ 
+
+module TreeViewComponent {
+    $(function () {
+        var tree = new ej.TreeView($("#treeView"), {
+            allowEditing: true,
+            allowDragAndDrop: true,
+            allowDropChild: true,
+            allowDropSibling: true,
+        });
+    });
+}
+
+
+
+
+module UploadboxComponent {
+    
+    $(function () {
+        var sample = new ej.Uploadbox($("#UploadDefault"),{
+            saveUrl: (<any>window).baseurl + "api/uploadbox/Save",
+            removeUrl: (<any>window).baseurl + "api/uploadbox/Remove",
+            buttonText: {
+                browse: "Choose File", upload: "Upload", cancel: "Cancel"
+            },
+            cssClass: "gradient- purple",
+            dialogAction: {
+                modal: false, closeOnComplete: false, drag: true
+            },
+            extensionsAllow: ".zip",
+            multipleFilesSelection: true,
+            showFileDetails: true
+        });
+    });
+
+}
+
+
+
+
+module WaitingPopupComponent {
+    $(function () {
+        var sample = new ej.WaitingPopup($("#target"),{
+            showOnInit: true,
+            showImage: true,
+            text: 'waiting&hellip;',
+			target: "#target",
+			appendTo: "#waiting"
+        });
+    });
+
+}
diff --git a/types/ej.web.all/index.d.ts b/types/ej.web.all/index.d.ts
index c4443b3e70..ca17e3cd5f 100644
--- a/types/ej.web.all/index.d.ts
+++ b/types/ej.web.all/index.d.ts
@@ -1,21 +1,22 @@
-// Type definitions for ej.web.all 15.4
+// 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" />
 
 /*!
 *  filename: ej.web.all.d.ts
-*  version : 15.4.0.20
-*  Copyright Syncfusion Inc. 2001 - 2017. All rights reserved.
+*  version : 16.1.0.24
+*  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
 *  licensing@syncfusion.com. Any infringement will be prosecuted under
 *  applicable laws.
 */
 declare namespace ej {
+    /* tslint:disable:no-empty-interface */
     const dataUtil: dataUtil;
     function isMobile(): boolean;
     function isIOS(): boolean;
@@ -909,6 +910,7 @@ declare namespace ej {
     function parseFloat(value: string, radix?: any, culture?: string): number;
     function parseDate(value: string, format: string, culture?: string): Date;
     function getLocalizedConstants(controlName: string, culture?: string): any;
+	function findCulture(culture?: string): culture;
 
     interface globalize {
         addCulture(name: string, culture?: any): void;
@@ -918,6 +920,7 @@ declare namespace ej {
         parseFloat(value: string, radix?: any, culture?: string): number;
         parseDate(value: string, format: string, culture?: string): Date;
         getLocalizedConstants(controlName: string, culture?: string): any;
+		findCulture(culture?: string): culture;
     }
     interface culture {
         name?: string;
@@ -1857,6 +1860,11 @@ declare namespace ej {
          */
         getActiveText(): string;
 
+        /** Hides the Autocomplete suggestion list.
+         * @returns {void}
+         */
+        hide(): void;
+
         /** Search the entered text and show it in the suggestion list if available.
          * @returns {void}
          */
@@ -5108,6 +5116,11 @@ declare namespace ej {
              */
             uploadSettings?: UploadSettings;
 
+            /** Specifies the virtual item count for virtual support.
+             * @Default {0}
+             */
+            virtualItemCount?: number;
+
             /** Specifies the width of FileExplorer control.
              * @Default {850}
              */
@@ -5138,6 +5151,10 @@ declare namespace ej {
              */
             beforeUploadDialogOpen?(e: BeforeUploadDialogOpenEventArgs): void;
 
+            /** Event is fired before the upload progress is started.
+             */
+            beforeUploadSend?(e: BeforeUploadSendEventArgs): void;
+
             /** Fires when FileExplorer control was created
              */
             create?(e: CreateEventArgs): void;
@@ -5233,6 +5250,18 @@ declare namespace ej {
             /** Fires when the items from grid view or tile view or large icons view of FileExplorer control is unselected.
              */
             unselect?(e: UnselectEventArgs): void;
+
+            /** Event is fired when the file upload progress gets completed.
+             */
+            uploadComplete?(e: UploadCompleteEventArgs): void;
+
+            /** Event is fired when the file upload fails due to some error.
+             */
+            uploadError?(e: UploadErrorEventArgs): void;
+
+            /** Event is fired when the file upload progress gets succeeded.
+             */
+            uploadSuccess?(e: UploadSuccessEventArgs): void;
         }
 
         export interface BeforeAjaxRequestEventArgs {
@@ -5377,6 +5406,29 @@ declare namespace ej {
             type?: string;
         }
 
+        export interface BeforeUploadSendEventArgs {
+
+            /** if the event is cancelled; otherwise, false
+             */
+            cancel?: boolean;
+
+            /** selected FileList Object
+             */
+            files?: any;
+
+            /** returns the upload model
+             */
+            model?: any;
+
+            /** returns the name of the event
+             */
+            type?: string;
+
+            /** XHR-AJAX Object for reference
+             */
+            xhr?: any;
+        }
+
         export interface CreateEventArgs {
 
             /** Set to true when the event has to be canceled, else false.
@@ -6041,6 +6093,87 @@ declare namespace ej {
             unselectedItems?: any[];
         }
 
+        export interface UploadCompleteEventArgs {
+
+            /** AJAX event argument for reference
+             */
+            e?: any;
+
+            /** details about the error information
+             */
+            error?: string;
+
+            /** uploaded file list
+             */
+            files?: any;
+
+            /** returns the Upload model
+             */
+            model?: any;
+
+            /** response from the server
+             */
+            responseText?: string;
+
+            /** successfully uploaded files list
+             */
+            success?: any;
+
+            /** returns the name of the event
+             */
+            type?: string;
+
+            /** XHR-AJAX Object for reference
+             */
+            xhr?: any;
+        }
+
+        export interface UploadErrorEventArgs {
+
+            /** error event action details
+             */
+            action?: string;
+
+            /** details about the error information
+             */
+            error?: string;
+
+            /** returns the details of the uploaded files
+             */
+            files?: any;
+
+            /** returns the name of the event
+             */
+            type?: string;
+        }
+
+        export interface UploadSuccessEventArgs {
+
+            /** AJAX event argument for reference
+             */
+            e?: any;
+
+            /** uploaded file list
+             */
+            files?: any;
+
+            /** returns the Upload model
+             */
+            model?: any;
+
+            /** response from the server
+             */
+            responseText?: string;
+
+            /** returns the name of the event
+             */
+            type?: string;
+
+            /** XHR-AJAX Object for reference
+             */
+            xhr?: any;
+        }
+
         export interface ContextMenuSettings {
 
             /** The items property is used to configure and group the required ContextMenu items in FileExplorer control.
@@ -6094,11 +6227,6 @@ declare namespace ej {
 
         export interface UploadSettings {
 
-            /** Specifies the maximum file size allowed to upload. It accepts the value in bytes.
-             * @Default {31457280}
-             */
-            maxFileSize?: number;
-
             /** Enables or disables the multiple files upload. When it is enabled, you can upload multiple files at a time and when disabled, you can upload only one file at a time.
              * @Default {true}
              */
@@ -6108,6 +6236,26 @@ declare namespace ej {
              * @Default {false}
              */
             autoUpload?: boolean;
+
+            /** Specifies the actions for upload dialog during initialization.
+             * @Default {{ modal:false, closeOnComplete:false, content:null, drag:true }}
+             */
+            dialogAction?: any;
+
+            /** Specifies the position at which the upload dialog is displayed using X and Y values. X: Sets the left position value for dialog. Y: Sets the top position value for dialog.
+             * @Default {null}
+             */
+            dialogPosition?: any;
+
+            /** Specifies the maximum file size allowed to upload. It accepts the value in bytes.
+             * @Default {31457280}
+             */
+            maxFileSize?: number;
+
+            /** Specifies the file details which are to be displayed when selected for upload by setting the showFileDetails to true.
+             * @Default {true}
+             */
+            showFileDetails?: boolean;
         }
 
         enum layoutType {
@@ -7342,6 +7490,16 @@ declare namespace ej {
              */
             locale?: string;
 
+            /** Specifies the maximum date in the calendar that the user can select as a startDate or endDate.
+             * @Default {new Date(2099, 11, 31)}
+             */
+            maxDate?: string|Date;
+
+            /** Specifies the minimum date in the calendar that the user can select as a startDate or endDate.
+             * @Default {new Date(1900, 00, 01)}
+             */
+            minDate?: string|Date;
+
             /** Used to add the preset ranges. Added ranges using this, will show in popup in right side for easy selection of different preset ranges.
              * @Default {null}
              */
@@ -9301,6 +9459,515 @@ declare namespace ej {
         Continuous,
     }
 
+    class DropDownTree extends ej.Widget {
+        static fn: DropDownTree;
+        constructor(element: JQuery | Element, options?: DropDownTree.Model);
+        static Locale: any;
+        model: DropDownTree.Model;
+        defaults: DropDownTree.Model;
+
+        /** Checks all the nodes in the DropDownTree.
+         * @returns {void}
+         */
+        checkAll(): void;
+
+        /** Checks a node in the DropDownTree.
+         * @param {string|any|any[]}  ID of the DropDownTree node/object of the DropDownTree node/collection of the ID/object of the DropDownTree nodes.
+         * @returns {void}
+         */
+        checkNode(element: string|any|any[]): void;
+
+        /** Clears the text in the DropDownTree.
+         * @returns {void}
+         */
+        clearText(): void;
+
+        /** Destroys the DropDownTree control.
+         * @returns {void}
+         */
+        destroy(): void;
+
+        /** Returns the selected value.
+         * @returns {void}
+         */
+        getValue(): void;
+
+        /** Hides the popup in the DropDownTree.
+         * @returns {void}
+         */
+        hidePopup(): void;
+
+        /** Moves the DropDownTree node within the same DropDownTree. The new position of the given DropDownTree node will be based on destination node and index position.
+         * @param {string|any} ID of the DropDownTree node/object of the DropDownTree node.
+         * @param {string|any} ID of the DropDownTree node/object of the DropDownTree node.
+         * @param {number} New index position of the given source node.
+         * @returns {void}
+         */
+        moveNode(sourceNode: string|any, destinationNode: string|any, index: number): void;
+
+        /** Removes all the nodes in the DropDownTree.
+         * @returns {void}
+         */
+        removeAll(): void;
+
+        /** Removes a node in the DropDownTree.
+         * @param {string|any|any[]}  ID of the DropDownTree node/object of the DropDownTree node/collectionof the ID/object of the DropDownTree nodes.
+         * @returns {void}
+         */
+        removeNode(element: string|any|any[]): void;
+
+        /** Selects all the DropDownTree nodes when allowMultiSelection field is enabled in the treeViewSettings property.
+         * @returns {void}
+         */
+        selectAll(): void;
+
+        /** Selects a node in the DropDownTree control. To select the collection of nodes in the DropDownTree control, enable allowMultiSelection field of the treeViewSettings property.
+         * @param {string|any|any[]}  ID of the DropDownTree node/object of the DropDownTree node/ collection of I the D/object of the DropDownTree nodes.
+         * @returns {void}
+         */
+        selectNode(element: string|any|any[]): void;
+
+        /** Shows the DropDownTree control with the popup.
+         * @returns {void}
+         */
+        showPopup(): void;
+
+        /** Unchecks all the nodes in the DropDownTree.
+         * @returns {void}
+         */
+        unCheckAll(): void;
+
+        /** Unchecks a node in the DropDownTree.
+         * @param {string|any|any[]} ID of the DropDownTree node/object of the DropDownTree node/collection of the ID/object of the DropDownTree nodes.
+         * @returns {void}
+         */
+        unCheckNode(element: string|any|any[]): void;
+
+        /** Unselects all the DropDownTree nodes when allowMultiSelection field of the treeViewSettings property is enabled.
+         * @returns {void}
+         */
+        unselectAll(): void;
+
+        /** Unselects a node in the DropDownTree control. To unselect the collection of nodes in the DropDownTree control, enable allowMultiSelection field of the treeViewSettings property.
+         * @param {string|any|any[]}  ID of the DropDownTree node/object of the DropDownTree node/ collection of the ID/object of the DropDownTree nodes.
+         * @returns {void}
+         */
+        unselectNode(element: string|any|any[]): void;
+    }
+    export namespace DropDownTree {
+
+        export interface Model {
+
+            /** Uses the keyboard for any action, including opening and closing the drop-down tree; navigating, expanding, and collapsing nodes of the dropdown tree; and more.
+             * @Default {true}
+             */
+            allowKeyboardNavigation?: boolean;
+
+            /** Sets the root CSS class for DropDownTree that allows customization of appearance.
+             * @Default {``}
+             */
+            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
+             * character.
+             * @Default {,}
+             */
+            delimiter?: string;
+
+            /** Indicates whether the DropDownTree control responds to user interaction or not. By default, the control is in the enabled mode and can be disabled by setting this to false.
+             * @Default {true}
+             */
+            enabled?: boolean;
+
+            /** The enabled animation property uses the easeOutQuad animation to SlideDown and SlideUp the popup wrapper in 200 and 100 milliseconds, respectively.
+             * @Default {false}
+             */
+            enableAnimation?: boolean;
+
+            /** Gets or sets a value that indicates whether to continue the DropDownTree model state in the page using applicable medium, i.e., HTML5 localStorage or cookies.
+             * @Default {false}
+             */
+            enablePersistence?: boolean;
+
+            /** Sets the DropDownTree textbox direction from right to left alignment.
+             * @Default {false}
+             */
+            enableRTL?: boolean;
+
+            /** Creates footer with text or HTML elements for the dropdown items.
+             * @Default {null}
+             */
+            footerTemplate?: string;
+
+            /** Serves as a patch of the entries comprising the path (that is set in the entry area) of the selected node.
+             * @Default {'/'}
+             */
+            fullPathDelimiter?: string;
+
+            /** Creates header with text or HTML elements for the dropdown items.
+             * @Default {null}
+             */
+            headerTemplate?: string;
+
+            /** Defines the height of the DropDownTree textbox.
+             */
+            height?: string|number;
+
+            /** Allows you to set a particular country or regional language for the DropDownTree.
+             * @Default {en-US}
+             */
+            locale?: string;
+
+            /** Customizes the height and width of the popup wrapper.
+             * @Default {{height: '152px',width: 'auto',showPopupOnLoad: false}}
+             */
+            popupSettings?: PopupSettings;
+
+            /** Specifies that the DropDownTree textbox values should be read-only.
+             * @Default {false}
+             */
+            readOnly?: boolean;
+
+            /** The DropDownTree’s textbox is displayed with rounded corner style.
+             * @Default {false}
+             */
+            showRoundedCorner?: boolean;
+
+            /** Specifies the targetID for the DropDownTree’s items.
+             * @Default {null}
+             */
+            targetID?: string;
+
+            /** Specifies the delimiter between nodes (indicating their hierarchy).
+             * @Default {ej.DropDownTree.TextMode.none}
+             */
+            textMode?: ej.Textmode|string;
+
+            /** Sets the jQuery validation error message in the DropDownTree.
+             * @Default {null}
+             */
+            validationMessage?: any;
+
+            /** Sets the jQuery validation rules in the DropDownTree.
+             * @Default {null}
+             */
+            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.
+             * @Default {null}
+             */
+            value?: string;
+
+            /** Specifies a short hint that describes the expected value of the DropDownTree control.
+             * @Default {null}
+             */
+            watermarkText?: string;
+
+            /** Defines the width of the DropDownTree textbox.
+             * @Default {100%}
+             */
+            width?: string|number;
+
+            /** Defines the popup settings of the DropDownTree widget. You can use any property which are in treeview using this property.
+             * @Default {{}}
+             */
+            treeViewSettings?: any;
+
+            /** Fires the action when the DropDownTree is about to lose focus.
+             */
+            blur?(e: BlurEventArgs): void;
+
+            /** Fires the action when the DropDownTree control’s value is changed.
+             */
+            change?(e: ChangeEventArgs): void;
+
+            /** Fires the action when the list item checkbox value is changed.
+             */
+            checkChange?(e: CheckChangeEventArgs): void;
+
+            /** Fires the action once the popup is closed.
+             */
+            close?(e: CloseEventArgs): void;
+
+            /** Fires the action once the DropDownTree is created.
+             */
+            Create?(e: CreateEventArgs): void;
+
+            /** Fires the action when DropDownTree is destroyed.
+             */
+            destroy?(e: DestroyEventArgs): void;
+
+            /** When the enableFilterSearch is enabled, the filtering action is fired as soon as you start typing in the DropDownTree.
+             */
+            filtering?(e: FilteringEventArgs): void;
+
+            /** Fires the action when the DropDownTree is focused.
+             */
+            focus?(e: FocusEventArgs): void;
+
+            /** Fires the action once the popup is opened.
+             */
+            open?(e: OpenEventArgs): void;
+
+            /** Fires the action when the list of nodes in the DropDownTree is selected.
+             */
+            select?(e: SelectEventArgs): void;
+        }
+
+        export interface BlurEventArgs {
+
+            /** If the event has to be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** Event name
+             */
+            type?: string;
+
+            /** DropDownTreeView model.
+             */
+            model?: any;
+        }
+
+        export interface ChangeEventArgs {
+
+            /** If the event has to be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** Event name
+             */
+            type?: string;
+
+            /** DropDownTreeView model.
+             */
+            model?: any;
+
+            /** Selected item’s text.
+             */
+            selectedText?: string;
+
+            /** Selected item’s text.
+             */
+            text?: string;
+
+            /** Selected item’s value.
+             */
+            value?: string;
+
+            /** Selected item's ID.
+             */
+            itemId?: string;
+
+            /** Returns the selected item with checkbox checked or not.
+             */
+            isChecked?: boolean;
+        }
+
+        export interface CheckChangeEventArgs {
+
+            /** If the event has to be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** Event name
+             */
+            type?: string;
+
+            /** DropDownTreeView model.
+             */
+            model?: any;
+
+            /** Selected item’s text.
+             */
+            text?: string;
+
+            /** Selected item’s value.
+             */
+            value?: string;
+
+            /** Selected item's ID.
+             */
+            itemId?: string;
+
+            /** Returns the selected item with checkbox checked or not.
+             */
+            isChecked?: boolean;
+        }
+
+        export interface CloseEventArgs {
+
+            /** If the event has to be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** Event name
+             */
+            type?: string;
+
+            /** DropDownTreeView model.
+             */
+            model?: any;
+
+            /** Selected item’s text.
+             */
+            text?: string;
+
+            /** Selected item’s value.
+             */
+            value?: string;
+        }
+
+        export interface CreateEventArgs {
+
+            /** If the event has to be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** Event name
+             */
+            type?: string;
+
+            /** DropDownTreeView model.
+             */
+            model?: any;
+        }
+
+        export interface DestroyEventArgs {
+
+            /** If the event has to be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** Event name
+             */
+            type?: string;
+
+            /** DropDownTreeView model.
+             */
+            model?: any;
+        }
+
+        export interface FilteringEventArgs {
+
+            /** If the event has to be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** Event name
+             */
+            type?: string;
+
+            /** DropDownTreeView model.
+             */
+            model?: any;
+
+            /** Selected item’s text.
+             */
+            selectedText?: string;
+
+            /** Returns the search string typed in the search box.
+             */
+            searchString?: string;
+
+            /** Returns the data items of theDropDownTreeView.
+             */
+            items?: any;
+        }
+
+        export interface FocusEventArgs {
+
+            /** If the event has to be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** Event name
+             */
+            type?: string;
+
+            /** DropDownTreeView model.
+             */
+            model?: any;
+        }
+
+        export interface OpenEventArgs {
+
+            /** If the event has to be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** Event name
+             */
+            type?: string;
+
+            /** DropDownTreeView model.
+             */
+            model?: any;
+
+            /** Selected item’s text.
+             */
+            text?: string;
+
+            /** Selected item’s value.
+             */
+            value?: string;
+        }
+
+        export interface SelectEventArgs {
+
+            /** If the event has to be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** Event name
+             */
+            type?: string;
+
+            /** DropDownTreeView model.
+             */
+            model?: any;
+
+            /** Selected item’s text.
+             */
+            text?: string;
+
+            /** Selected item’s value.
+             */
+            value?: string;
+
+            /** Selected item's ID.
+             */
+            itemId?: string;
+
+            /** Returns the selected item with checkbox checked or not.
+             */
+            isChecked?: boolean;
+        }
+
+        export interface PopupSettings {
+
+            /** Defines the height of the popup wrapper in the DropDownTree control.
+             */
+            height?: string|number;
+
+            /** Defines the width of the popup wrapper in the DropDownTree control.
+             */
+            width?: string|number;
+
+            /** The DropDownTree control is displayed with the popup.
+             */
+            showPopupOnLoad?: boolean;
+        }
+    }
+    enum Textmode {
+        //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,
+    }
+
     class Tooltip extends ej.Widget {
         static fn: Tooltip;
         constructor(element: JQuery | Element, options?: Tooltip.Model);
@@ -9855,7 +10522,7 @@ declare namespace ej {
              */
             cssClass?: string;
 
-            /** Specifies the number of digits that should be allowed after the decimal point.
+            /** Specifies the number of digits that is allowed after the decimal point. When the decimalPlaces is set to “-1”, it allows the decimals without any limit in the Textboxes.
              * @Default {0}
              */
             decimalPlaces?: number;
@@ -23132,8 +23799,7 @@ declare namespace ej {
              */
             searchSettings?: SearchSettings;
 
-            /** Gets a value that indicates whether the grid model to hold multiple selected records . selectedRecords can be used to displayed hold the single or multiple selected records using
-             * “selectedRecords” property
+            /** Gets a value that display the array of selected records in the Grid.
              * @Default {null}
              */
             selectedRecords?: any[];
@@ -25890,6 +26556,11 @@ declare namespace ej {
              * @Default {null}
              */
             dropMapper?: string;
+
+            /** Gets or sets a value that indicates whether move or copy a record from one grid to another or within the grid
+             * @Default {ej.Grid.DragBehavior.Move}
+             */
+            dragBehavior?: ej.Grid.DragBehavior|string;
         }
 
         export interface SearchSettings {
@@ -25926,6 +26597,11 @@ declare namespace ej {
              */
             enableToggle?: boolean;
 
+            /** Gets or sets a value that indicates whether to select multiple rows or cells by performing dragging in Grid.
+             * @Default {false}
+             */
+            allowDragSelection?: boolean;
+
             /** Gets or sets a value that indicates whether to add the default selection actions as a selection mode.See selectionMode
              * @Default {[row]}
              */
@@ -26329,6 +27005,16 @@ declare namespace ej {
         }
 
 
+        enum DragBehavior {
+
+            ///Allows to move a record from one grid to another or within the grid.
+            Move,
+
+            ///Allows to copy a record from one grid to another or within the grid.
+            Copy
+        }
+
+
         enum CellSelectionMode {
 
             ///It selects cells continuously from the start cell to end cell.
@@ -26607,6 +27293,18 @@ declare namespace ej {
             /** Fires on moving mouse outside the sparkline.
              */
             sparklineMouseLeave?(e: SparklineMouseLeaveEventArgs): void;
+
+            /** Fires, on clicking the sparkline.
+             */
+            Click?(e: ClickEventArgs): void;
+
+            /** Fires, on double clicking the sparkline.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the sparkline.
+             */
+            rightClick?(e: RightClickEventArgs): void;
         }
 
         export interface LoadEventArgs {
@@ -26793,6 +27491,51 @@ declare namespace ej {
             type?: string;
         }
 
+        export interface ClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sparkline model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
+        export interface DoubleClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sparkline model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sparkline model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
         export interface Border {
 
             /** Border color of the sparkline.
@@ -27244,6 +27987,18 @@ declare namespace ej {
             /** Fires after resetting the sunburst points
              */
             drillDownReset?(e: DrillDownResetEventArgs): void;
+
+            /** Fires, on clicking the sunburst chart.
+             */
+            Click?(e: ClickEventArgs): void;
+
+            /** Fires, on double clicking the sunburst chart.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the sunburst chart
+             */
+            rightClick?(e: RightClickEventArgs): void;
         }
 
         export interface LoadEventArgs {
@@ -27474,6 +28229,63 @@ declare namespace ej {
             type?: string;
         }
 
+        export interface ClickEventArgs {
+
+            /** Includes clicked region data
+             */
+            data?: string;
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sunburst model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
+        export interface DoubleClickEventArgs {
+
+            /** Includes double clicked region data
+             */
+            data?: string;
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sunburst model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** Includes right clicked region data
+             */
+            data?: string;
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sunburst model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
         export interface Border {
 
             /** Border color of the sunburst.
@@ -28240,12 +29052,12 @@ declare namespace ej {
          */
         exportPivotGrid(): void;
 
-        /** This function re-renders the PivotGrid on clicking the navigation buttons on PivotPager.
+        /** This function re-renders the PivotGrid when clicking the navigation buttons on the PivotPager.
          * @returns {void}
          */
         refreshPagedPivotGrid(): void;
 
-        /** This function refreshes the PivotGrid with modified data input in client-mode.
+        /** This function refreshes the PivotGrid with the modified data input in client-mode.
          * @returns {void}
          */
         refreshPivotGrid(): void;
@@ -28255,17 +29067,17 @@ declare namespace ej {
          */
         refreshControl(): void;
 
-        /** This function Destroy the PivotGrid widget all events bound using this._on will be unbind automatically and bring the control to pre-init state.
+        /** This function destroys the PivotGrid widget associated events that are bound using &quot;this._on&quot; and brings the control to pre-init state.
          * @returns {void}
          */
         destroy(): void;
 
-        /** This function returns the height of all rows and width each and every column.
+        /** This function returns the height of all rows and the width of all columns.
          * @returns {any}
          */
         calculateCellWidths(): any;
 
-        /** This function creates the conditional formatting dialog to apply conditional formatting for PivotGrid control.
+        /** This function creates the conditional formatting dialog to apply conditional formatting for the PivotGrid control.
          * @returns {void}
          */
         openConditionalFormattingDialog(): void;
@@ -28280,12 +29092,12 @@ declare namespace ej {
          */
         loadReport(): void;
 
-        /** This function reconstructs the JSON data formed for rendering PivotGrid in excel-like layout format.
+        /** This function reconstructs the JSON data that is formed for rendering the PivotGrid in the excel-like layout format.
          * @returns {void}
          */
         excelLikeLayout(): void;
 
-        /** Returns the OlapReport string maintained along with the axis elements information.
+        /** Returns the OlapReport string that is maintained along with the axis elements information.
          * @returns {string}
          */
         getOlapReport(): string;
@@ -28295,17 +29107,17 @@ declare namespace ej {
          */
         setOlapReport(): void;
 
-        /** Returns the JSON records formed to render the control.
+        /** Returns the JSON records that are formed to render the control.
          * @returns {any[]}
          */
         getJSONRecords(): any[];
 
-        /** Sets the JSON records formed to render the control.
+        /** Sets the JSON records that are formed to render the control.
          * @returns {void}
          */
         setJSONRecords(): void;
 
-        /** This function allows user to change the caption of the Pivot Item (name displayed in UI) on-demand for relational datasource in client-mode.
+        /** This function allows you to change the caption of the pivot item (name displayed in UI) on-demand for the relational datasource in client-mode.
          * @returns {void}
          */
         refreshFieldCaption(): void;
@@ -28319,17 +29131,17 @@ declare namespace ej {
 
         export interface Model {
 
-            /** Sets the mode for the PivotGrid widget for binding either OLAP or relational data source.
+            /** Sets the mode for the PivotGrid widget to bind either OLAP or relational data source.
              * @Default {ej.Pivot.AnalysisMode.Pivot}
              */
             analysisMode?: ej.Pivot.AnalysisMode|string;
 
-            /** Specifies the CSS class to PivotGrid to achieve custom theme.
+            /** Specifies the CSS class to the PivotGrid for achieving the custom theme.
              * @Default {“”}
              */
             cssClass?: string;
 
-            /** Connects the PivotSchemaDesigner with the specified ID to the PivotGrid Control.
+            /** Connects the PivotSchemaDesigner with specified ID to the PivotGrid control.
              * @Default {“”}
              */
             pivotTableFieldListID?: string;
@@ -28349,27 +29161,27 @@ declare namespace ej {
              */
             frozenHeaderSettings?: FrozenHeaderSettings;
 
-            /** Allows user to display header name in PivotGrid control.
+            /** Allows you to display the header name in the PivotGrid control.
              * @Default {{}}
              */
             headerSettings?: HeaderSettings;
 
-            /** Allows user to show appropriate unique name on Pivot button.
+            /** Allows you to show the appropriate unique name in the pivot button.
              * @Default {false}
              */
             showUniqueNameOnPivotButton?: boolean;
 
-            /** Object utilized to pass additional information between client-end and service-end on operating the control in server mode.
+            /** Object is utilized to pass additional information between the client-end and the service-end while operating the control in server mode.
              * @Default {null}
              */
             customObject?: any;
 
-            /** Allows the user to collapsed the specified members in each field by default.
+            /** Allows you to collapse specified members in each field by default.
              * @Default {null}
              */
             collapsedMembers?: any;
 
-            /** Allows the user to access each cell on mouse right-click.
+            /** Allows you to access each cell by right-clicking the mouse.
              * @Default {false}
              */
             enableCellContext?: boolean;
@@ -28379,136 +29191,146 @@ declare namespace ej {
              */
             enableCellSelection?: boolean;
 
-            /** Enables the Drill-Through feature which retrieves the raw items that are used to create the specific cell in PivotGrid.
+            /** Enables the Drill-Through feature which retrieves raw items that are used to create a specific cell in the PivotGrid.
              * @Default {false}
              */
             enableDrillThrough?: boolean;
 
-            /** Allows user to get the cell details in JSON format on double clicking the cell.
+            /** Allows you to get cell details in JSON format by clicking the value cell.
+             * @Default {false}
+             */
+            enableCellClick?: boolean;
+
+            /** Allows you to get cell details in JSON format by double-clicking the value cell.
              * @Default {false}
              */
             enableCellDoubleClick?: boolean;
 
-            /** Allows user to edit the value cells for write-back support in PivotGrid. This is applicable only for server-mode.
+            /** Allows you to edit value cells for write-back support in the PivotGrid. This is applicable only for the server-mode.
              * @Default {false}
              */
             enableCellEditing?: boolean;
 
-            /** Collapses the Pivot items along rows and columns by default.  It works only for relational data source.
+            /** Collapses the pivot items along rows and columns by default. It works only for the relational data source.
              * @Default {false}
              */
             enableCollapseByDefault?: boolean;
 
-            /** Enables/Disables the display of grand total for all the columns.
+            /** Enables/disables the display of grand total for all columns.
              * @Default {true}
              */
             enableColumnGrandTotal?: boolean;
 
-            /** Allows the user to format a specific set of cells based on the condition.
+            /** Allows you to format a specific set of cells based on the condition.
              * @Default {false}
              */
             enableConditionalFormatting?: boolean;
 
-            /** Enables the advanced filtering options Value Filtering, Label Filtering and Sorting for each fields in server mode.
+            /** Enables the advanced filtering options such as value filtering, label filtering, and sorting for each field in the server mode.
              * @Default {false}
              */
             enableAdvancedFilter?: boolean;
 
-            /** Allows the user to refresh the control on-demand and not during every UI operation.
+            /** Allows you to refresh the control on-demand and not during every UI operation.
              * @Default {false}
              */
             enableDeferUpdate?: boolean;
 
-            /** Enables the display of GroupingBar allowing you to filter, sort and remove fields obtained from datasource.
+            /** Enables the display of GroupingBar allowing you to filter, sort, and remove fields obtained from the datasource.
              * @Default {false}
              */
             enableGroupingBar?: boolean;
 
-            /** Enables/Disables paging in Member Editor for viewing the large count of members in pages.
+            /** Allows you to set the maximum number of nodes as well as child nodes to be displayed in the member editor.
+             * @Default {1000}
+             */
+            maxNodeLimitInMemberEditor?: number;
+
+            /** Enables/disables paging in the member editor for viewing the large count of members in pages.
              * @Default {false}
              */
             enableMemberEditorPaging?: boolean;
 
-            /** Allows the user to set the number of members to be displayed in each page of Member Editor on applying paging in it.
+            /** Allows you to set the number of members to be displayed in each page of member editor on applying paging in it.
              * @Default {100}
              */
             memberEditorPageSize?: number;
 
-            /** Enables/Disables the display of grand total for rows and columns.
+            /** Enables/disables the display of grand total for rows and columns.
              * @Default {true}
              */
             enableGrandTotal?: boolean;
 
-            /** Allows the user to load PivotGrid using JSON data.
+            /** Allows you to load the PivotGrid using the JSON data.
              * @Default {false}
              */
             enableJSONRendering?: boolean;
 
-            /** Enables rendering of PivotGrid widget along with the PivotTable Field List, which allows UI operations.
+            /** Enables rendering of the PivotGrid widget along with the PivotTable field list which allows UI operations.
              * @Default {true}
              */
             enablePivotFieldList?: boolean;
 
-            /** Enables the display of grand total for all the rows.
+            /** Enables the display of grand total for all rows.
              * @Default {true}
              */
             enableRowGrandTotal?: boolean;
 
-            /** Allows the user to view layout of the PivotGrid from right to left.
+            /** Allows you to view the layout of PivotGrid from right to left.
              * @Default {false}
              */
             enableRTL?: boolean;
 
-            /** Allows the user to enable ToolTip option.
+            /** Allows you to enable the ToolTip.
              * @Default {false}
              */
             enableToolTip?: boolean;
 
-            /** Allows the user to enable the animation effects in tooltip.
+            /** Allows you to enable the animation effects in the tooltip.
              * @Default {false}
              */
             enableToolTipAnimation?: boolean;
 
-            /** Allows the user to adjust the width of the columns dynamically within given widget size.
+            /** Allows you to adjust the width of columns dynamically within given widget size.
              * @Default {false}
              */
             enableColumnResizing?: boolean;
 
-            /** Allows the user to fit the width of the column based on its maximum text width.
+            /** Allows you to fit the width of the column based on its maximum text width.
              * @Default {true}
              */
             resizeColumnsToFit?: boolean;
 
-            /** Allows the user to enable/disable the context menu of Pivot buttons in the PivotGrid.
+            /** Allows you to enable/disable the context menu of pivot buttons in the PivotGrid.
              * @Default {false}
              */
             enableContextMenu?: boolean;
 
-            /** Allows the user to view large amount of data through virtual scrolling.
+            /** Allows you to view the large amount of data through virtual scrolling.
              * @Default {false}
              */
             enableVirtualScrolling?: boolean;
 
-            /** Allows the user to view large amount of data by applying paging.
+            /** Allows you to view the large amount of data by applying paging.
              * @Default {false}
              */
             enablePaging?: boolean;
 
-            /** Allows the user to configure hyperlink settings of PivotGrid control.
+            /** Allows you to configure the hyperlink settings of the PivotGrid control.
              * @Default {{}}
              */
             hyperlinkSettings?: HyperlinkSettings;
 
-            /** Allows the user to enable PivotGrid’s responsiveness in the browser layout.
+            /** Allows you to enable PivotGrid’s responsiveness in the browser layout.
              * @Default {false}
              */
             isResponsive?: boolean;
 
-            /** Contains the serialized JSON string which renders PivotGrid.
+            /** Contains the serialized JSON string which renders the PivotGrid.
              */
             jsonRecords?: string;
 
-            /** Sets the summary layout for PivotGrid.Following are the ways in which summary can be positioned: normal summary (bottom), top summary, no summary and excel-like summary.
+            /** Sets the summary layout for PivotGrid.Following are the ways in which summary can be positioned: normal summary (bottom), top summary, no summary, and excel-like summary.
              * @Default {ej.PivotGrid.Layout.Normal}
              */
             layout?: ej.PivotGrid.Layout|string;
@@ -28518,12 +29340,12 @@ declare namespace ej {
              */
             locale?: string;
 
-            /** Sets the mode for the PivotGrid widget for binding data source either in server-side or client-side.
+            /** Sets the mode for PivotGrid widget for binding the data source either in the server-side or client-side.
              * @Default {ej.Pivot.OperationalMode.ClientMode}
              */
             operationalMode?: ej.Pivot.OperationalMode|string;
 
-            /** Allows the user to set custom name for the methods at service-end, communicated during AJAX post.
+            /** Allows you to set the custom name for the methods at service-end, communicated during AJAX post.
              * @Default {{}}
              */
             serviceMethodSettings?: ServiceMethodSettings;
@@ -28533,19 +29355,33 @@ declare namespace ej {
              */
             url?: string;
 
-            /** Triggers when it reaches client-side after any AJAX request.
+            /** Allows you to export entire data instead of current page data, while paging option is enabled.
+             * @Default {false}
+             */
+            enableCompleteDataExport?: boolean;
+
+            /** Allows you to enable &quot;withCredentials&quot; property inside XMLHttpRequest object for CORS(Cross-Origin Resource Sharing) request.
+             * @Default {false}
+             */
+            enableXHRCredentials?: boolean;
+
+            /** Triggers when it reaches client-side after the AJAX request.
              */
             afterServiceInvoke?(e: AfterServiceInvokeEventArgs): void;
 
-            /** Triggers before any AJAX request is passed from PivotGrid to service methods.
+            /** Triggers before any AJAX request is passed from the PivotGrid to service methods.
              */
             beforeServiceInvoke?(e: BeforeServiceInvokeEventArgs): void;
 
-            /** Triggers before Pivot Engine starts to populate.
+            /** Triggers before the pivot engine starts to populate.
              */
             beforePivotEnginePopulate?(e: BeforePivotEnginePopulateEventArgs): void;
 
-            /** Triggers when double click action is performed over a cell.
+            /** Triggers when click action is performed over a value cell.
+             */
+            cellClick?(e: CellClickEventArgs): void;
+
+            /** Triggers when double-click action is performed over a value cell.
              */
             cellDoubleClick?(e: CellDoubleClickEventArgs): void;
 
@@ -28553,7 +29389,7 @@ declare namespace ej {
              */
             cellContext?(e: CellContextEventArgs): void;
 
-            /** Triggers when a specific range of value cells are selected.
+            /** Triggers when a specific range of value cells is selected.
              */
             cellSelection?(e: CellSelectionEventArgs): void;
 
@@ -28561,15 +29397,15 @@ declare namespace ej {
              */
             columnHeaderHyperlinkClick?(e: ColumnHeaderHyperlinkClickEventArgs): void;
 
-            /** Triggers after performing drill operation in PivotGrid.
+            /** Triggers after performing drill operation in the PivotGrid.
              */
             drillSuccess?(e: DrillSuccessEventArgs): void;
 
-            /** Triggers while clicking &quot;OK&quot; button in the drill-through dialog.
+            /** Triggers while clicking &quot;OK&quot; in the drill-through dialog.
              */
             drillThrough?(e: DrillThroughEventArgs): void;
 
-            /** Triggers when PivotGrid loading is initiated.
+            /** Triggers when the PivotGrid loading is initiated.
              */
             load?(e: LoadEventArgs): void;
 
@@ -28577,11 +29413,11 @@ declare namespace ej {
              */
             renderComplete?(e: RenderCompleteEventArgs): void;
 
-            /** Triggers when any error occurred during AJAX request.
+            /** Triggers when any error occurred during the AJAX request.
              */
             renderFailure?(e: RenderFailureEventArgs): void;
 
-            /** Triggers when PivotGrid successfully reaches client-side after any AJAX request.
+            /** Triggers when the PivotGrid successfully reaches the client-side after any AJAX request.
              */
             renderSuccess?(e: RenderSuccessEventArgs): void;
 
@@ -28597,15 +29433,15 @@ declare namespace ej {
              */
             valueCellHyperlinkClick?(e: ValueCellHyperlinkClickEventArgs): void;
 
-            /** Triggers before saving the current report to database.
+            /** Triggers before saving the current report to the database.
              */
             saveReport?(e: SaveReportEventArgs): void;
 
-            /** Triggers before loading a report from database.
+            /** Triggers before loading a report from the database.
              */
             loadReport?(e: LoadReportEventArgs): void;
 
-            /** Triggers before performing exporting in pivot grid.
+            /** Triggers before performing exporting in the pivot grid.
              */
             beforeExport?(e: BeforeExportEventArgs): void;
 
@@ -28651,9 +29487,24 @@ declare namespace ej {
             pivotGridObject?: any;
         }
 
+        export interface CellClickEventArgs {
+
+            /** returns the JSON details of the respective on cell.
+             */
+            selectedData?: any[];
+
+            /** returns the custom object bound with PivotGrid control.
+             */
+            customObject?: any;
+
+            /** returns the HTML element of PivotGrid control.
+             */
+            element?: any;
+        }
+
         export interface CellDoubleClickEventArgs {
 
-            /** returns the JSON details of the double clicked cell.
+            /** returns the JSON details of the double respective on cell.
              */
             selectedData?: any[];
 
@@ -28892,36 +29743,36 @@ declare namespace ej {
 
         export interface DataSourceColumnsAdvancedFilter {
 
-            /** Allows the user to provide level unique name to perform advanced filtering.
+            /** Allows you to provide a level unique name to perform the advanced filtering.
              */
             name?: string;
 
-            /** Allows the user to set the operator to perform Label Filtering.
+            /** Allows you to set the operator to perform the label filtering.
              * @Default {none}
              */
             labelFilterOperator?: string;
 
-            /** Allows the user to set the operator to perform Value Filtering.
+            /** Allows you to set the operator to perform the value filtering.
              * @Default {none}
              */
             valueFilterOperator?: string;
 
-            /** Allows the user to set the filtering type while performing advanced filtering.
+            /** Allows you to set the filtering type while performing the advanced filtering.
              */
             advancedFilterType?: string;
 
-            /** In case of value filtering, this property contains the measure name to which the filter is applied.
+            /** In value filtering, this property contains the measure name to which the filter is applied.
              */
             measure?: string;
 
-            /** Allows the user to hold the filter operand values in advanced filtering.
+            /** Allows you to hold filter operand values in the advanced filtering.
              */
             values?: any[];
         }
 
         export interface DataSourceColumnsFilterItems {
 
-            /** Sets the type of filter whether to include/exclude the mentioned values.
+            /** Sets the type of filter to include/exclude the mentioned values.
              * @Default {ej.PivotAnalysis.FilterType.Exclude}
              */
             filterType?: ej.PivotAnalysis.FilterType|string;
@@ -28934,46 +29785,46 @@ declare namespace ej {
 
         export interface DataSourceColumn {
 
-            /** Allows the user to bind the item by using its unique name as field name.
+            /** Allows you to bind the item by using its unique name as field name.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display caption for an item.
+            /** Allows you to set the display caption for an item.
              */
             fieldCaption?: string;
 
-            /** Allows the user to filter the report by default using advanced filtering (excel-like) option for OLAP data source in client-mode.
+            /** Allows you to filter the report by using advanced filtering (e.g., Microsoft Excel) option for the OLAP data source in client-mode.
              * @Default {[]}
              */
             advancedFilter?: DataSourceColumnsAdvancedFilter[];
 
-            /** Allows the user to indicate whether the added item is a named set or not.
+            /** Allows you to indicate whether the added item is a named set or not.
              * @Default {false}
              */
             isNamedSets?: boolean;
 
-            /** Shows/Hides the sub-total of the field in PivotGrid.
+            /** Shows/hides the sub-total of the field in PivotGrid.
              * @Default {true}
              */
             showSubTotal?: boolean;
 
-            /** Allows to set the format for the column headers.
+            /** Allows you to set the format for column headers.
              */
             format?: string;
 
-            /** This property is set to display the formatted values with format types in PivotGrid.
+            /** This property is set to display the formatted values with format types in the PivotGrid.
              */
             formatString?: string;
 
-            /** Allows to set the custom theme for the column headers.
+            /** Allows you to set the custom theme for column headers.
              */
             cssClass?: string;
 
-            /** Allows the user to set delimiter for date type format in formatString. This is applicable for groupByDate option for row/column headers.
+            /** Allows you to set the delimiter for date type format in the formatString. This is applicable for the groupByDate of row/column headers.
              */
             delimiter?: string;
 
-            /** Allows the user to set the sorting order of the members of the field.
+            /** Allows you to set the sorting order of members of the field.
              * @Default {ej.PivotAnalysis.SortOrder.Ascending}
              */
             sortOrder?: ej.PivotAnalysis.SortOrder|string;
@@ -28983,7 +29834,7 @@ declare namespace ej {
              */
             drilledItems?: any[];
 
-            /** Applies filter to the field members.
+            /** Applies the filter to field members.
              * @Default {null}
              */
             filterItems?: DataSourceColumnsFilterItems;
@@ -28991,36 +29842,36 @@ declare namespace ej {
 
         export interface DataSourceRowsAdvancedFilter {
 
-            /** Allows the user to provide level unique name to perform advanced filtering.
+            /** Allows you to provide the level unique name to perform the advanced filtering.
              */
             name?: string;
 
-            /** Allows the user to set the operator to perform Label Filtering.
+            /** Allows you to set the operator to perform the label filtering.
              * @Default {none}
              */
             labelFilterOperator?: string;
 
-            /** Allows the user to set the operator to perform Value Filtering.
+            /** Allows you to set the operator to perform the value filtering.
              * @Default {none}
              */
             valueFilterOperator?: string;
 
-            /** Allows the user to set the filtering type while performing advanced filtering.
+            /** Allows you to set the filtering type while performing the advanced filtering.
              */
             advancedFilterType?: string;
 
-            /** In case of value filtering, this property contains the measure name to which the filter is applied.
+            /** In value filtering, this property contains the measure name to which the filter is applied.
              */
             measure?: string;
 
-            /** Allows the user to hold the filter operand values in advanced filtering.
+            /** Allows you to hold the filter operand values in the advanced filtering.
              */
             values?: any[];
         }
 
         export interface DataSourceRowsFilterItems {
 
-            /** Sets the type of filter whether to include/exclude the mentioned values.
+            /** Sets the type of filter to include/exclude the mentioned values.
              * @Default {ej.PivotAnalysis.FilterType.Exclude}
              */
             filterType?: ej.PivotAnalysis.FilterType|string;
@@ -29033,46 +29884,46 @@ declare namespace ej {
 
         export interface DataSourceRow {
 
-            /** Allows the user to bind the item by using its unique name as field name.
+            /** Allows you to bind the item by using its unique name as field name.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display caption for an item.
+            /** Allows you to set the display caption for the item.
              */
             fieldCaption?: string;
 
-            /** Allows the user to filter the report by default using advanced filtering (excel-like) option for OLAP data source in client-mode.
+            /** Allows you to filter the report by using the advanced filtering (e.g., Microsoft Excel) option for the OLAP data source in client-mode.
              * @Default {[]}
              */
             advancedFilter?: DataSourceRowsAdvancedFilter[];
 
-            /** Allows the user to indicate whether the added item is a named set or not.
+            /** Allows you to indicate whether the added item is a named set or not.
              * @Default {false}
              */
             isNamedSets?: boolean;
 
-            /** Shows/Hides the sub-total of the field.
+            /** Shows/hides the sub-total of the field.
              * @Default {true}
              */
             showSubTotal?: boolean;
 
-            /** Allows to set the format for the row headers.
+            /** Allows you to set the format for row headers.
              */
             format?: string;
 
-            /** This property is set to display the formatted values with format types in PivotGrid.
+            /** This property is set to display the formatted values with format types in the PivotGrid.
              */
             formatString?: string;
 
-            /** Allows to set the custom theme for the row headers.
+            /** Allows you to set the custom theme for row headers.
              */
             cssClass?: string;
 
-            /** Allows the user to set delimiter for date type format in formatString. This is applicable for groupByDate option for row/column headers.
+            /** Allows you to set the delimiter for date type format in the formatString. This is applicable for the groupByDate in row/column headers.
              */
             delimiter?: string;
 
-            /** Allows the user to set the sorting order of the members of the field.
+            /** Allows you to set the sorting order of members of the field.
              * @Default {ej.PivotAnalysis.SortOrder.Ascending}
              */
             sortOrder?: ej.PivotAnalysis.SortOrder|string;
@@ -29082,7 +29933,7 @@ declare namespace ej {
              */
             drilledItems?: any[];
 
-            /** Applies filter to the field members.
+            /** Applies the filter to field members.
              * @Default {null}
              */
             filterItems?: DataSourceRowsFilterItems;
@@ -29090,18 +29941,18 @@ declare namespace ej {
 
         export interface DataSourceValuesMeasure {
 
-            /** Allows the user to bind the measure from OLAP datasource by using its unique name as field name.
+            /** Allows you to bind the measure from the OLAP datasource by using its unique name as field name.
              */
             fieldName?: string;
         }
 
         export interface DataSourceValue {
 
-            /** Allows the user to bind the item by using its unique name as field name for Relational datasource.
+            /** Allows you to bind the item by using its unique name as field name for the relational datasource.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display caption for an item for Relational datasource.
+            /** Allows you to set the display caption for the item in the relational datasource.
              */
             fieldCaption?: string;
 
@@ -29110,41 +29961,41 @@ declare namespace ej {
              */
             measures?: DataSourceValuesMeasure[];
 
-            /** Allows to set the axis name to place the measures items.
+            /** Allows you to set the axis name to place measures items.
              * @Default {rows}
              */
             axis?: string;
 
-            /** Indicates whether the field is a calculated field or not with Relational datasource.
+            /** Indicates whether the field is a calculated field with the relational datasource or not.
              * @Default {false}
              */
             isCalculatedField?: boolean;
 
-            /** Allows to set the type of PivotGrid summary calculation for the value field with Relational datasource.
+            /** Allows to set the type of PivotGrid summary calculation in the value field with the relational datasource.
              * @Default {ej.PivotAnalysis.SummaryType.Sum}
              */
             summaryType?: ej.PivotAnalysis.SummaryType|string;
 
-            /** Allows to set the format for the values.
+            /** Allows to set the format for values.
              */
             format?: string;
 
-            /** This property is set to display the formatted values with format types in PivotGrid.
+            /** This property is set to display the formatted values with format types in the PivotGrid.
              */
             formatString?: string;
 
-            /** Allows to set the formula for calculation of values for calculated members in Relational datasource.
+            /** Allows to set the formula for calculation of values for calculated members in the relational datasource.
              */
             formula?: string;
 
-            /** Allows to set the custom theme for the values.
+            /** Allows to set the custom theme for values.
              */
             cssClass?: string;
         }
 
         export interface DataSourceFiltersFilterItems {
 
-            /** Sets the type of filter whether to include/exclude the mentioned values.
+            /** Sets the type of filter to include/exclude the mentioned values.
              * @Default {ej.PivotAnalysis.FilterType.Exclude}
              */
             filterType?: ej.PivotAnalysis.FilterType|string;
@@ -29157,15 +30008,15 @@ declare namespace ej {
 
         export interface DataSourceFilter {
 
-            /** Allows the user to bind the item by using its unique name as field name.
+            /** Allows you to bind the item by using its unique name as field name.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display name for an item.
+            /** Allows you to set the display name for the item.
              */
             fieldCaption?: string;
 
-            /** Applies filter to the field members.
+            /** Applies the filter to field members.
              * @Default {null}
              */
             filterItems?: DataSourceFiltersFilterItems;
@@ -29173,22 +30024,22 @@ declare namespace ej {
 
         export interface DataSourcePagerOptions {
 
-            /** Allows to set the number of categorical columns to be displayed in each page on applying paging.
+            /** Allows to set the number of categorical columns to be displayed in each page on applying the paging.
              * @Default {0}
              */
             categoricalPageSize?: number;
 
-            /** Allows to set the number of series rows to be displayed in each page on applying paging.
+            /** Allows to set the number of series rows to be displayed in each page on applying the paging.
              * @Default {0}
              */
             seriesPageSize?: number;
 
-            /** Allows to set the page number in categorical axis to be loaded by default.
+            /** Allows to set the page number to be loaded in the categorical axis by default.
              * @Default {1}
              */
             categoricalCurrentPage?: number;
 
-            /** Allows to set the page number in series axis to be loaded by default.
+            /** Allows to set the page number to be loaded in the series axis by default.
              * @Default {1}
              */
             seriesCurrentPage?: number;
@@ -29196,37 +30047,37 @@ declare namespace ej {
 
         export interface DataSource {
 
-            /** Lists out the items to be arranged in columns section of PivotGrid.
+            /** Lists out the items to be arranged in the columns section of the PivotGrid.
              * @Default {[]}
              */
             columns?: DataSourceColumn[];
 
-            /** Lists out the items to be arranged in rows section of PivotGrid.
+            /** Lists out the items to be arranged in the rows section of PivotGrid.
              * @Default {[]}
              */
             rows?: DataSourceRow[];
 
-            /** Lists out the items which supports calculation in PivotGrid.
+            /** Lists out the items that support calculation in the PivotGrid.
              * @Default {[]}
              */
             values?: DataSourceValue[];
 
-            /** Lists out the items which supports filtering of values without displaying the members in UI in PivotGrid.
+            /** Lists out the items which supports filtering of values without displaying the members in UI of the PivotGrid.
              * @Default {[]}
              */
             filters?: DataSourceFilter[];
 
-            /** Contains the respective cube name from OLAP database as string type.
+            /** Contains the respective cube name as string type in the OLAP database.
              * @Default {“”}
              */
             cube?: string;
 
-            /** To set the data source name to fetch data from that.
+            /** To set the data source name to fetch the data.
              * @Default {“”}
              */
             sourceInfo?: string;
 
-            /** Set the provider name for PivotGrid to identify whether the provider is SSAS or Mondrian.
+            /** Sets the provider name for PivotGrid to identify whether the provider is SSAS or Mondrian.
              * @Default {ssas}
              */
             providerName?: string;
@@ -29241,16 +30092,16 @@ declare namespace ej {
              */
             catalog?: string;
 
-            /** Allows user to filter the members (by its name and values) through advanced filtering (excel-like) option for OLAP data source in client-mode.
+            /** Allows you to filter the members (by its name and values) through advanced filtering (e.g., Microsoft Excel) option at OLAP data source in client-mode.
              * @Default {false}
              */
             enableAdvancedFilter?: boolean;
 
-            /** Sets a name to the report bound to the control.
+            /** Sets a name to the report that is bound to the control.
              */
             reportName?: string;
 
-            /** Allows to set the page size and current page number for each axis on applying paging.
+            /** Allows to set the page size and current page number for each axis on applying the paging.
              * @Default {{}}
              */
             pagerOptions?: DataSourcePagerOptions;
@@ -29258,15 +30109,15 @@ declare namespace ej {
 
         export interface ValueSortSettings {
 
-            /** Contains the headers of the specific column to which value sorting is applied.
+            /** Contains the header of the specific column to which value sorting is applied.
              */
             headerText?: string;
 
-            /** Allows the user to set the string for separating column headers provided in the above property headerText.
+            /** Allows you to set the string for separating column headers provided in the headerText property.
              */
             headerDelimiters?: string;
 
-            /** Allows the user to set the sorting order of the values of the field.
+            /** Allows you to set the sorting order of values of the field.
              * @Default {ej.PivotAnalysis.SortOrder.Ascending}
              */
             sortOrder?: ej.PivotAnalysis.SortOrder|string;
@@ -29274,22 +30125,22 @@ declare namespace ej {
 
         export interface FrozenHeaderSettings {
 
-            /** Allows the user to freeze the row headers alone on scrolling the horizontal scroll bar.
+            /** Allows you to freeze the row headers alone when scrolling the horizontal scroll bar.
              * @Default {false}
              */
             enableFrozenRowHeaders?: boolean;
 
-            /** Allows the user to freeze the column headers alone on scrolling the vertical scroll bar.
+            /** Allows you to freeze the column headers alone when scrolling the vertical scroll bar.
              * @Default {false}
              */
             enableFrozenColumnHeaders?: boolean;
 
-            /** Allows the user to freeze both the row headers and column headers on scrolling.
+            /** Allows you to freeze both row headers and column headers while scrolling.
              * @Default {false}
              */
             enableFrozenHeaders?: boolean;
 
-            /** Allows user to set the size of the scrollbar (horizontal and vertical) visible in PivotGrid.
+            /** Allows you to set the size of the scrollbar (horizontal and vertical) that is visible in the PivotGrid.
              * @Default {18}
              */
             scrollerSize?: number;
@@ -29297,12 +30148,12 @@ declare namespace ej {
 
         export interface HeaderSettings {
 
-            /** Allows user to enable/disable row header names in PivotGrid control.
+            /** Allows you to enable/disable the row header names in the PivotGrid control.
              * @Default {false}
              */
             showRowItems?: boolean;
 
-            /** Allows user to enable/disable column header names in PivotGrid control.
+            /** Allows you to enable/disable the column header names in the PivotGrid control.
              * @Default {false}
              */
             showColumnItems?: boolean;
@@ -29310,22 +30161,22 @@ declare namespace ej {
 
         export interface HyperlinkSettings {
 
-            /** Allows the user to enable/disable hyperlink for column header.
+            /** Allows you to enable/disable the hyperlink for the column header.
              * @Default {false}
              */
             enableColumnHeaderHyperlink?: boolean;
 
-            /** Allows the user to enable/disable hyperlink for row header.
+            /** Allows you to enable/disable the hyperlink for the row header.
              * @Default {false}
              */
             enableRowHeaderHyperlink?: boolean;
 
-            /** Allows the user to enable/disable hyperlink for summary cells.
+            /** Allows you to enable/disable the hyperlink for summary cells.
              * @Default {false}
              */
             enableSummaryCellHyperlink?: boolean;
 
-            /** Allows the user to enable/disable hyperlink for value cells.
+            /** Allows you to enable/disable the hyperlink for value cells.
              * @Default {false}
              */
             enableValueCellHyperlink?: boolean;
@@ -29333,102 +30184,102 @@ declare namespace ej {
 
         export interface ServiceMethodSettings {
 
-            /** Allows the user to set the custom name for the service method responsible for drill up/down operation in PivotGrid.
+            /** Allows you to set the custom name for service method which is responsible for drill up/down operation in the PivotGrid.
              * @Default {DrillGrid}
              */
             drillDown?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for exporting.
+            /** Allows you to set the custom name for the service method that is responsible for exporting.
              * @Default {Export}
              */
             exportPivotGrid?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for performing server-side actions on defer update.
+            /** Allows you to set the custom name for the service method responsible for performing server-side actions based on defer update.
              * @Default {DeferUpdate}
              */
             deferUpdate?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for getting the values for the tree-view inside filter dialog.
+            /** Allows you to set the custom name for the service method that is responsible for getting values of the tree-view inside filter dialog.
              * @Default {FetchMembers}
              */
             fetchMembers?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for filtering operation in PivotGrid.
+            /** Allows you to set the custom name for the service method that is responsible for filtering operation in the PivotGrid.
              * @Default {Filtering}
              */
             filtering?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for initializing PivotGrid.
+            /** Allows you to set the custom name for the service method that is responsible for initializing the PivotGrid.
              * @Default {InitializeGrid}
              */
             initialize?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for the server-side action, on dropping a node from Field List.
+            /** Allows you to set the custom name for the service method that is responsible for the server-side action when dropping a node from the field list.
              * @Default {NodeDropped}
              */
             nodeDropped?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for the server-side action on changing the checked state of a node in Field List.
+            /** Allows you to set the custom name for the service method that is responsible for server-side action when changing the checked state of a node in the field list.
              * @Default {NodeStateModified}
              */
             nodeStateModified?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for performing paging operation in PivotGrid.
+            /** Allows you to set the custom name for the service method that is responsible for performing paging operation in the PivotGrid.
              * @Default {Paging}
              */
             paging?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for sorting operation in PivotGrid.
+            /** Allows you to set the custom name for the service method that is responsible for sorting operation in the PivotGrid.
              * @Default {Sorting}
              */
             sorting?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for expanding members inside member editor.
+            /** Allows you to set the custom name for the service method that is responsible for expanding members in the member editor.
              * @Default {MemberExpanded}
              */
             memberExpand?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for editing the cells.
+            /** Allows you to set the custom name for the service method that is responsible for editing the cells.
              * @Default {CellEditing}
              */
             cellEditing?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for saving the current report to database.
+            /** Allows you to set the custom name for the service method that is responsible for saving the current report to the database.
              * @Default {SaveReport}
              */
             saveReport?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for loading a report from database.
+            /** Allows you to set the custom name for the service method that is responsible for loading a report from the database.
              * @Default {LoadReportFromDB}
              */
             loadReport?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for adding a calculated field to the report.
+            /** Allows you to set the custom name for the service method that is responsible for adding a calculated field to the report.
              * @Default {CalculatedField}
              */
             calculatedField?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for performing drill through operation.
+            /** Allows you to set the custom name for the service method that is responsible for performing the drill through operation.
              * @Default {DrillThroughHierarchies}
              */
             drillThroughHierarchies?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for performing drill through operation in data table.
+            /** Allows you to set the custom name for the service method that is responsible for performing drill through operation in the data table.
              * @Default {DrillThroughDataTable}
              */
             drillThroughDataTable?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for performing value sorting operation in PivotGrid.
+            /** Allows you to set the custom name for the service method that is responsible for performing value sorting operation in the PivotGrid.
              * @Default {ValueSorting}
              */
             valueSorting?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for removing pivot button from GroupingBar/Field List.
+            /** Allows you to set the custom name for the service method that is responsible for removing the pivot button from the GroupingBar/field list.
              * @Default {RemoveButton}
              */
             removeButton?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for write-back operation in OLAP Cube. This is only applicable in server-side component.
+            /** Allows you to set the custom name for the service method that is responsible for write-back operation in the OLAP Cube. This is applicable only in the server-side component.
              * @Default {WriteBack}
              */
             writeBack?: string;
@@ -29464,7 +30315,7 @@ declare namespace ej {
             Ascending,
             //Sorts the members of the field in descending order.
             Descending,
-            //Displays the members without sorting in any order.
+            //Displays the members without sorting in default order.
             None,
         }
     }
@@ -29764,32 +30615,32 @@ declare namespace ej {
         model: PivotChart.Model;
         defaults: PivotChart.Model;
 
-        /** Performs an asynchronous HTTP (AJAX) request.
+        /** Posts an asynchronous HTTP (AJAX) request.
          * @returns {void}
          */
         doAjaxPost(): void;
 
-        /** Perform an asynchronous HTTP (FullPost) submit.
+        /** Performs an asynchronous HTTP (FullPost) submit.
          * @returns {void}
          */
         doPostBack(): void;
 
-        /** Exports the PivotChart to the format specified in the parameter.
+        /** Exports the pivot chart to the format that is specified in the parameter.
          * @returns {void}
          */
         exportPivotChart(): void;
 
-        /** This function renders the PivotChart control with the JSON formatted datasource.
+        /** This function renders the pivot chart control with the JSON formatted data source.
          * @returns {void}
          */
         renderChartFromJSON(): void;
 
-        /** This function receives the update from service-end, which would be utilized for rendering the widget.
+        /** This function receives the update from the service-end, which will be utilized for rendering the widget.
          * @returns {void}
          */
         renderControlSuccess(): void;
 
-        /** Returns the OlapReport string maintained along with the axis elements information.
+        /** Returns the OlapReport string that is maintained along with the axis elements information.
          * @returns {string}
          */
         getOlapReport(): string;
@@ -29799,7 +30650,7 @@ declare namespace ej {
          */
         setOlapReport(): void;
 
-        /** Returns the JSON records formed to render the control.
+        /** Returns the JSON records that are formed to render the control.
          * @returns {any[]}
          */
         getJSONRecords(): any[];
@@ -29809,32 +30660,32 @@ declare namespace ej {
          */
         setJSONRecords(): void;
 
-        /** Returns the PivotEngine formed to render the control.
+        /** Returns the PivotEngine that is formed to render the control.
          * @returns {any[]}
          */
         getPivotEngine(): any[];
 
-        /** Sets the PivotEngine required to render the control.
+        /** Sets the PivotEngine that is required to render the control.
          * @returns {void}
          */
         setPivotEngine(): void;
 
-        /** Re-renders the control with the data source at the instant.
+        /** Re-renders the control with the datasource at instant.
          * @returns {void}
          */
         refreshControl(): void;
 
-        /** This function Destroy the PivotChart widget all events bound using this._on will be unbind automatically and bring the control to pre-init state.
+        /** This function destroys the pivot chart widget associated events that are bound using &quot;this._on&quot; and brings the control to pre-init state.
          * @returns {void}
          */
         destroy(): void;
 
-        /** Renders the control with the pivot engine obtained from olap cube.
+        /** Renders the control with the pivot engine that is obtained from the OLAP cube.
          * @returns {void}
          */
         generateJSON(): void;
 
-        /** Navigates to the specified page number in specified axis.
+        /** Navigates to the specified page number in the specified axis.
          * @returns {void}
          */
         refreshPagedPivotChart(): void;
@@ -29843,141 +30694,152 @@ declare namespace ej {
 
         export interface Model {
 
-            /** Sets the mode for the PivotChart widget for binding either OLAP or Relational data source.
+            /** Sets the mode for the pivot chart widget to bind either the OLAP or relational datasource.
              * @Default {ej.Pivot.AnalysisMode.Pivot}
              */
             analysisMode?: ej.Pivot.AnalysisMode|string;
 
-            /** Specifies the CSS class to PivotChart to achieve custom theme.
+            /** Specifies the CSS class to the pivot chart for achieving the custom theme.
              * @Default {“”}
              */
             cssClass?: string;
 
-            /** Options for enabling zooming feature of PivotChart.
+            /** Options for enabling the zooming feature of the pivot chart.
              * @Default {{}}
              */
             zooming?: Zooming;
 
-            /** Options available to configure the properties of entire series. You can also override the options for specific series by using series collection.
+            /** Options available to configure the properties of entire series. You can also override the options for specific series by using the series collection.
              * @Default {{}}
              */
             commonSeriesOptions?: CommonSeriesOptions;
 
-            /** Initializes the data source for the PivotChart widget, when it functions completely on client-side.
+            /** Initializes the datasource for the pivot chart widget, when it functions completely on the client-side.
              * @Default {{}}
              */
             dataSource?: DataSource;
 
-            /** Object utilized to pass additional information between client-end and service-end on operating the control in server mode.
+            /** Object is utilized to pass additional information between the client-end and the service-end while operating the control in the server mode.
              * @Default {{}}
              */
             customObject?: any;
 
-            /** Allows the user to enable 3D view of PivotChart.
+            /** Allows you to enable the 3D view of the pivot chart.
              * @Default {false}
              */
             enable3D?: boolean;
 
-            /** Allows the user to view PivotChart from right to left.
+            /** Allows you to view the pivot chart from right to left.
              * @Default {false}
              */
             enableRTL?: boolean;
 
-            /** Allows user to render complete PivotChart on drill operation, that is, when expanding and collapsing members which are shown in multi-level labels.
+            /** Allows you to render the complete pivot chart on drill operation, when expanding and collapsing members are shown in multi-level labels.
              * @Default {false}
              */
             enableMultiLevelLabels?: boolean;
 
-            /** Allows the user to enable PivotChart’s responsiveness in the browser layout.
+            /** Allows you to enable the responsiveness of pivot chart in the browser layout.
              * @Default {false}
              */
             isResponsive?: boolean;
 
-            /** Lets the user to customize the legend items and their labels.
+            /** You can customize the legend items and their labels.
              * @Default {{}}
              */
             legend?: any;
 
-            /** Allows the user to set the localized language for the widget.
+            /** Allows you to set the localized language for the widget.
              * @Default {en-US}
              */
             locale?: string;
 
-            /** Sets the mode for the PivotChart widget for binding data source either in server-side or client-side.
+            /** Sets the mode for the pivot chart widget to bind the data source either in the server-side or client-side.
              * @Default {ej.Pivot.OperationalMode.ClientMode}
              */
             operationalMode?: ej.Pivot.OperationalMode|string;
 
-            /** This is a horizontal axis that contains options to configure axis and it is the primary x axis for all the series in series array. 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. Then, assign the name to the series’s xAxisName property to link both axis and series.
+            /** 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.
              * @Default {{}}
              */
             primaryXAxis?: any;
 
-            /** This is a vertical axis that contains options to configure axis. This is the primary y axis for all the series in series array. To override y axis for particular series, create an
-             * axis object by providing unique name by using name property and add it to axes array. Then, assign the name to the series’s yAxisName property to link both axis and series.
+            /** This is a vertical axis that contains options to configure the axis. This is the primary y-axis for all the series in the series array. To override y-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 yAxisName property to link both
+             * the axis and the series.
              * @Default {{}}
              */
             primaryYAxis?: any;
 
-            /** Allows the user to rotate the angle of PivotChart in 3D view.
+            /** Allows you to rotate the angle of pivot chart in 3D view.
              * @Default {0}
              */
             rotation?: number;
 
-            /** Allows the user to enable/disable the context menu options in the PivotChart.
+            /** Allows you to enable/disable context menu options in the pivot chart.
              * @Default {false}
              */
             enableContextMenu?: boolean;
 
-            /** Allows the user to set custom name for the methods at service-end, communicated on AJAX post.
+            /** Allows you to set the custom name for methods at service-end, when you are communicating on AJAX post.
              * @Default {{}}
              */
             serviceMethodSettings?: ServiceMethodSettings;
 
-            /** Options to customize the size of the PivotChart control.
+            /** Options to customize the size of the pivot chart control.
              * @Default {{}}
              */
             size?: any;
 
-            /** Connects the service using the specified URL for any server updates on operating the control in server mode.
+            /** Options for customizing the title of PivotChart.
+             */
+            title?: Title;
+
+            /** Connects the service by using the specified URL for any server updates while operating the control in the server mode.
              * @Default {“”}
              */
             url?: string;
 
-            /** Triggers when PivotChart starts to render.
+            /** Allows you to enable &quot;withCredentials&quot; property inside XMLHttpRequest object for CORS(Cross-Origin Resource Sharing) request.
+             * @Default {false}
+             */
+            enableXHRCredentials?: boolean;
+
+            /** Triggers when the pivot chart starts to render.
              */
             load?(e: LoadEventArgs): void;
 
-            /** Triggers when it reaches client-side after any AJAX request.
+            /** Triggers when it reaches the client-side after any AJAX request.
              */
             afterServiceInvoke?(e: AfterServiceInvokeEventArgs): void;
 
-            /** Triggers before any AJAX request is passed from PivotChart to service methods.
+            /** Triggers before any AJAX request is passed from the pivot chart to service methods.
              */
             beforeServiceInvoke?(e: BeforeServiceInvokeEventArgs): void;
 
-            /** Triggers before Pivot Engine starts to populate.
+            /** Triggers before the pivot engine starts to populate.
              */
             beforePivotEnginePopulate?(e: BeforePivotEnginePopulateEventArgs): void;
 
-            /** Triggers on performing drill up/down in PivotChart control.
+            /** Triggers when performing drill up/down operation in the pivot chart control.
              */
             drillSuccess?(e: DrillSuccessEventArgs): void;
 
-            /** Triggers when PivotChart widget completes all operations at client-side after any AJAX request.
+            /** Triggers when the pivot chart widget completes all operations at client-side after the AJAX request.
              */
             renderComplete?(e: RenderCompleteEventArgs): void;
 
-            /** Triggers when any error occurred during AJAX request.
+            /** Triggers when the error occurs on the AJAX request.
              */
             renderFailure?(e: RenderFailureEventArgs): void;
 
-            /** Triggers when PivotChart successfully reaches client-side after any AJAX request.
+            /** Triggers when the pivot chart successfully reaches the client-side after the AJAX request.
              */
             renderSuccess?(e: RenderSuccessEventArgs): void;
 
-            /** Triggers before performing exporting in pivot chart.
+            /** Triggers before performing export operation in the pivot chart.
              */
             beforeExport?(e: BeforeExportEventArgs): void;
         }
@@ -30107,7 +30969,7 @@ declare namespace ej {
 
         export interface Zooming {
 
-            /** Enables or disables horizontal scrollbar.
+            /** Enables or disables the horizontal scrollbar.
              * @Default {false}
              */
             enableScrollbar?: boolean;
@@ -30115,7 +30977,7 @@ declare namespace ej {
 
         export interface CommonSeriesOptions {
 
-            /** Allows the user to set the specific chart type for PivotChart widget.
+            /** Allows you to set the specific chart type for the pivot chart widget.
              * @Default {ej.PivotChart.ChartTypes.Column}
              */
             type?: ej.PivotChart.ChartTypes|string;
@@ -30136,25 +30998,25 @@ declare namespace ej {
 
         export interface DataSourceColumn {
 
-            /** Allows the user to bind the item by using its unique name as field name.
+            /** Allows you to bind the item by using its unique name as field name.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display caption for an item.
+            /** Allows you to set the display caption for the item.
              */
             fieldCaption?: string;
 
-            /** Allows the user to indicate whether the added item is a named set or not.
+            /** Allows you to indicate whether the added item is a named set or not.
              * @Default {false}
              */
             isNamedSets?: boolean;
 
-            /** Allows the user to set the sorting order of the members of the field.
+            /** Allows you to set the sorting order of field members.
              * @Default {ej.PivotAnalysis.SortOrder.Ascending}
              */
             sortOrder?: ej.PivotAnalysis.SortOrder|string;
 
-            /** Applies filter to the field members.
+            /** Applies filter to field members.
              * @Default {null}
              */
             filterItems?: DataSourceColumnsFilterItems;
@@ -30175,25 +31037,25 @@ declare namespace ej {
 
         export interface DataSourceRow {
 
-            /** Allows the user to bind the item by using its unique name as field name.
+            /** Allows you to bind the item by using its unique name as field name.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display caption for an item.
+            /** Allows you to set the display caption for the item.
              */
             fieldCaption?: string;
 
-            /** Allows the user to indicate whether the added item is a named set or not.
+            /** Allows you to indicate whether the added item is a named set or not.
              * @Default {false}
              */
             isNamedSets?: boolean;
 
-            /** Allows the user to set the sorting order of the members of the field.
+            /** Allows you to set the sorting order of field members.
              * @Default {ej.PivotAnalysis.SortOrder.Ascending}
              */
             sortOrder?: ej.PivotAnalysis.SortOrder|string;
 
-            /** Applies filter to the field members.
+            /** Applies filter to field members.
              * @Default {null}
              */
             filterItems?: DataSourceRowsFilterItems;
@@ -30201,37 +31063,37 @@ declare namespace ej {
 
         export interface DataSourceValuesMeasure {
 
-            /** Allows the user to bind the measure from OLAP datasource by using its unique name as field name.
+            /** Allows you to bind the measure from the OLAP datasource by using its unique name as field name.
              */
             fieldName?: string;
         }
 
         export interface DataSourceValue {
 
-            /** Allows the user to bind the item by using its unique name as field name for Relational datasource.
+            /** Allows you to bind the item by using its unique name as field name for the relational datasource.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display caption for an item for Relational datasource.
+            /** Allows you to set the display caption for the item of the relational datasource.
              */
             fieldCaption?: string;
 
-            /** This holds the list of unique names of measures to bind them from the OLAP cube.
+            /** Holds the list of unique names of measures to bind them from the OLAP cube.
              * @Default {[]}
              */
             measures?: DataSourceValuesMeasure[];
 
-            /** Allows to set the axis name to place the measures items.
+            /** Allows you to set the axis name to place the measures items.
              * @Default {rows}
              */
             axis?: string;
 
-            /** Indicates whether the field is a calculated field or not with Relational datasource.
+            /** Indicates whether the field is a calculated field with the relational datasource or not.
              * @Default {false}
              */
             isCalculatedField?: boolean;
 
-            /** Allows to set the formula for calculation of values for calculated members in Relational datasource.
+            /** Allows you to set the formula to calculate the values for calculated members in the relational datasource.
              */
             formula?: string;
         }
@@ -30251,11 +31113,11 @@ declare namespace ej {
 
         export interface DataSourceFilter {
 
-            /** Allows the user to bind the item by using its unique name as field name.
+            /** Allows you to bind the item by using its unique name as field name.
              */
             fieldName?: string;
 
-            /** Applies filter to the field members.
+            /** Applies filter to field members.
              * @Default {null}
              */
             filterItems?: DataSourceFiltersFilterItems;
@@ -30263,47 +31125,47 @@ declare namespace ej {
 
         export interface DataSource {
 
-            /** Contains the respective cube name from OLAP database as string type.
+            /** Contains the respective cube name from the OLAP database as string type.
              * @Default {“”}
              */
             cube?: string;
 
-            /** To set the data source name to fetch data from that.
+            /** To set the datasource name to fetch the data from that.
              * @Default {“”}
              */
             sourceInfo?: string;
 
-            /** Set the provider name for PivotChart to identify whether the provider is SSAS or Mondrian.
+            /** Sets the provider name for the pivot chart to identify whether the provider is SSAS or Mondrian.
              * @Default {ssas}
              */
             providerName?: string;
 
-            /** Provides the raw data source for the PivotChart.
+            /** Provides the raw datasource for the pivot chart.
              * @Default {null}
              */
             data?: any;
 
-            /** In connection with an OLAP database, this property contains the database name as string to fetch the data from the given connection string.
+            /** In connection with the OLAP database, this property contains the database name as string to fetch the data from the given connection string.
              * @Default {“”}
              */
             catalog?: string;
 
-            /** Lists out the items to be displayed as series of PivotChart.
+            /** Lists out the items to be displayed as series of the pivot chart.
              * @Default {[]}
              */
             columns?: DataSourceColumn[];
 
-            /** Lists out the items to be displayed as segments of PivotChart.
+            /** Lists out the items to be displayed as segments of the pivot chart.
              * @Default {[]}
              */
             rows?: DataSourceRow[];
 
-            /** Lists out the items supports calculation in PivotChart.
+            /** Lists out the items support calculation in the pivot chart.
              * @Default {[]}
              */
             values?: DataSourceValue[];
 
-            /** Lists out the items which supports filtering of values without displaying the members in UI in PivotChart.
+            /** Lists out the items that supports filtering of values without displaying the members in UI of the pivot chart.
              * @Default {[]}
              */
             filters?: DataSourceFilter[];
@@ -30311,27 +31173,34 @@ declare namespace ej {
 
         export interface ServiceMethodSettings {
 
-            /** Allows the user to set the custom name for the service method responsible for drilling up/down operation in PivotChart.
+            /** Allows you to set the custom name for the service method that is responsible for drilling up/down in the pivot chart.
              * @Default {DrillChart}
              */
             drillDown?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for exporting.
+            /** Allows you to set the custom name for the service method which is responsible for exporting the pivot chart.
              * @Default {Export}
              */
             exportPivotChart?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for initializing PivotChart.
+            /** Allows you to set the custom name for the service method which is responsible for initializing the pivot chart.
              * @Default {InitializeChart}
              */
             initialize?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for navigating between pages in paged PivotChart.
+            /** Allows you to set the custom name for the service method which is responsible for navigating between pages in the paged pivot chart.
              * @Default {Paging}
              */
             paging?: string;
         }
 
+        export interface Title {
+
+            /** Text to be displayed in PivotChart title.
+             */
+            text?: string;
+        }
+
         enum ChartTypes {
 
             ///To render a Line type PivotChart.
@@ -30400,22 +31269,22 @@ declare namespace ej {
          */
         doAjaxPost(): void;
 
-        /** Performs an asynchronous HTTP (FullPost) submit.
+        /** Performs an asynchronous HTTP (full post) submit.
          * @returns {void}
          */
         doPostBack(): void;
 
-        /** Navigates to the specified page in specified axis.
+        /** Navigates to a specified page in the specified axis.
          * @returns {void}
          */
         refreshPagedPivotClient(): void;
 
-        /** Updates the PivotClient component with the JSON data fetched from the service on navigating between pages.
+        /** Updates the pivot client component with the JSON data that is fetched from the service while navigating between the pages.
          * @returns {void}
          */
         refreshPagedPivotClientSuccess(): void;
 
-        /** Renders the PivotChart and PivotGrid with the JSON data provided.
+        /** Renders the pivot chart and the pivot grid with the provided JSON data.
          * @returns {void}
          */
         generateJSON(): void;
@@ -30425,32 +31294,32 @@ declare namespace ej {
          */
         refreshControl(): void;
 
-        /** Returns the control tab string that displays currently in PivotClient.
+        /** Returns the control tab string that displays currently in the pivot client.
          * @returns {void}
          */
         getActiveTab(): void;
 
-        /** This function Destroy the PivotClient widget all events bound using this._on will be unbind automatically and bring the control to pre-init state.
+        /** This function destroys all events of the pivot client widget bound using &quot;this._on&quot; and bring the control to pre-init state.
          * @returns {void}
          */
         destroy(): void;
 
-        /** Returns the OlapReport string maintained along with the axis elements information.
+        /** Returns the OLAP report string that is maintained along with the axis elements information.
          * @returns {string}
          */
         getOlapReport(): string;
 
-        /** Sets the OlapReport string along with the axis information and maintains it in a property.
+        /** Sets the OLAP report string along with the axis information and maintains it in a property.
          * @returns {void}
          */
         setOlapReport(): void;
 
-        /** Returns the JSON records formed to render the control.
+        /** Returns the formed JSON records to render the control.
          * @returns {any[]}
          */
         getJSONRecords(): any[];
 
-        /** Sets the JSON records formed to render the control to a property.
+        /** Sets the formed JSON records to render the control to a property.
          * @returns {void}
          */
         setJSONRecords(): void;
@@ -30459,157 +31328,178 @@ declare namespace ej {
 
         export interface Model {
 
-            /** Sets the mode for the PivotClient widget for binding either OLAP or Relational data source.
+            /** Sets the mode for the pivot client widget for binding the OLAP or relational data sources.
              * @Default {ej.Pivot.AnalysisMode.Pivot}
              */
             analysisMode?: ej.Pivot.AnalysisMode|string;
 
-            /** Allows the user to set the specific Chart type for PivotChart inside PivotClient widget.
+            /** Allows you to set the specific chart type for the pivot chart in the pivot client widget.
              * @Default {ej.PivotChart.ChartTypes.Column}
              */
             chartType?: ej.PivotChart.ChartTypes|string;
 
-            /** Allows the user to set the content on exporting the PivotClient widget.
+            /** Allows you to set the content for exporting the pivot client widget.
              * @Default {ej.PivotClient.ClientExportMode.ChartAndGrid}
              */
             clientExportMode?: ej.PivotClient.ClientExportMode|string;
 
-            /** Specifies the CSS class to PivotClient to achieve custom theme.
+            /** Specifies the CSS class to the pivot client for achieving the custom theme.
              * @Default {“”}
              */
             cssClass?: string;
 
-            /** Object utilized to pass additional information between client-end and service-end when the control functions in server-mode.
+            /** An object is utilized to pass the additional information between the client-end and the service-end when the control functions are present in the server-mode.
              * @Default {{}}
              */
             customObject?: any;
 
-            /** Initializes the data source for the PivotClient widget, when it functions completely on client-side.
+            /** Initializes the data source for the pivot client widget, when it functions completely on the client-side.
              * @Default {{}}
              */
             dataSource?: DataSource;
 
-            /** Enables the Drill-Through feature which retrieves the raw items that are used to create the specific cell in PivotGrid.
+            /** Enables the drill-through feature which retrieves the raw items that are used to create a specific cell in the pivot grid.
              * @Default {false}
              */
             enableDrillThrough?: boolean;
 
-            /** Allows the user to customize the widget's layout and appearance.
+            /** Allows you to customize the layout and appearance of the widget.
              * @Default {{}}
              */
             displaySettings?: DisplaySettings;
 
-            /** Allows user to set visibility of icons in toolbar panel.
+            /** Allows you to set the visibility of icons in the toolbar panel.
              * @Default {{}}
              */
             toolbarIconSettings?: ToolbarIconSettings;
 
-            /** Allows user to show unique name on pivot button.
+            /** Allows you to show a unique name on the pivot button.
              * @Default {false}
              */
             showUniqueNameOnPivotButton?: boolean;
 
-            /** Allows user to load the saved report collection from the database.
+            /** Allows you to load the saved report collection from the database.
              * @Default {false}
              */
             showReportCollection?: boolean;
 
-            /** Enables the splitter option for resizing the elements inside the control.
+            /** Enables the splitter option for resizing the elements in the control.
              * @Default {false}
              */
             enableSplitter?: boolean;
 
-            /** Enables the advanced filtering options Value Filtering, Label Filtering and Sorting for each dimensions on binding OLAP data in server mode.
+            /** Enables the advanced filtering options such as value filtering, label filtering, and sorting for each dimensions when binding the OLAP data in the server mode.
              * @Default {false}
              */
             enableAdvancedFilter?: boolean;
 
-            /** Allows the user to refresh the control on-demand and not during every UI operation.
+            /** Allows you to refresh the control on-demand and not during the every UI operation.
              * @Default {false}
              */
             enableDeferUpdate?: boolean;
 
-            /** Lets the user to save and load reports in a customized way with the help of events.
+            /** Allows to save and load the reports in a customized way with the help of events.
              * @Default {false}
              */
             enableLocalStorage?: boolean;
 
-            /** Allows the user to enable paging for both the PivotChart and PivotGrid components for the ease of viewing large data.
+            /** Allows you to enable the paging for both the pivot chart and the pivot grid components for viewing the large data.
              * @Default {false}
              */
             enablePaging?: boolean;
 
-            /** Allows the user to include the PivotTreeMap component as one of the Chart types.
+            /** Allows you to include the pivot tree map component as one of the chart types.
              * @Default {false}
              */
             enablePivotTreeMap?: boolean;
 
-            /** Allows the user to view the layout of PivotClient from right to left.
+            /** Allows you to view the layout of the pivot client from right to left.
              * @Default {false}
              */
             enableRTL?: boolean;
 
-            /** Enables/disables the visibility of measure group selector drop-down in Cube Browser.
+            /** Enables/disables the visibility of measure group selector drop-down in the cube browser.
              * @Default {false}
              */
             enableMeasureGroups?: boolean;
 
-            /** Allows the user to enable virtual scrolling for both the PivotChart and PivotGrid components for the ease of viewing large data.
+            /** Allows you to get cell details in JSON format by clicking the value cell.
+             * @Default {false}
+             */
+            enableCellClick?: boolean;
+
+            /** Allows you to get cell details in JSON format by double-clicking the value cell.
+             * @Default {false}
+             */
+            enableCellDoubleClick?: boolean;
+
+            /** Allows you to enable the virtual scrolling for both the pivot chart and pivot grid components for viewing the large data.
              * @Default {false}
              */
             enableVirtualScrolling?: boolean;
 
-            /** Enables/Disables paging in Member Editor for viewing the large count of members in pages.
+            /** Allows you to set the maximum number of nodes as well as child nodes to be displayed in the member editor.
+             * @Default {1000}
+             */
+            maxNodeLimitInMemberEditor?: number;
+
+            /** Enables/disables paging in the member editor for viewing the large count of members in the pages.
              * @Default {false}
              */
             enableMemberEditorPaging?: boolean;
 
-            /** Allows the user to set the number of members to be displayed in each page of Member Editor on applying paging in it.
+            /** Allows you to set the number of members to be displayed in each page of the member editor on applying the paging in it.
              * @Default {100}
              */
             memberEditorPageSize?: number;
 
-            /** Sets the summary layout for PivotGrid. Following are the ways in which summary can be positioned: normal summary (bottom), top summary, no summary and excel-like summary.
+            /** Sets the summary layout for the pivot grid. Following are the ways in which the summary can be positioned: normal summary (bottom), top summary, no summary, and Microsoft Excel
+             * summary.
              * @Default {ej.PivotGrid.Layout.Normal}
              */
             gridLayout?: ej.PivotGrid.Layout|string;
 
-            /** Allows the user to hide PivotClient's Cube Browser and Axis Element Builder while initiate the widget.
+            /** Allows you to hide the cube browser and the axis element builder of the pivot client while initiating the widget.
              * @Default {false}
              */
             collapseCubeBrowserByDefault?: boolean;
 
-            /** Allows the user to view the KPI elements in tree-view inside PivotClient's Cube Browser.
+            /** Allows you to view the KPI elements in tree-view of the pivot client's cube browser.
              * @Default {false}
              */
             enableKPI?: boolean;
 
-            /** Allows the user to enable PivotClient’s responsiveness in the browser layout.
+            /** Allows you to enable the pivot client’s responsiveness in the browser layout.
              * @Default {false}
              */
             isResponsive?: boolean;
 
-            /** Options to customize the size of the PivotClient control.
+            /** Options to customize the size of the pivot client control.
              * @Default {Example:}
              */
             size?: any;
 
-            /** Allows the user to set the localized language for the widget.
+            /** Allows you to set the localized language for the widget.
              * @Default {en-US}
              */
             locale?: string;
 
-            /** Sets the mode for the PivotClient widget for binding data source either in server-side or client-side.
+            /** Sets the mode for the pivot client widget to bind the data source in the server-side or the client-side.
              * @Default {ej.Pivot.OperationalMode.ClientMode}
              */
             operationalMode?: ej.Pivot.OperationalMode|string;
 
-            /** Allows the user to set custom name for the methods at service-end, communicated during AJAX post.
+            /** Allows you to set the custom name for methods at service-end, and it is communicated during the AJAX post.
              * @Default {{}}
              */
             serviceMethodSettings?: ServiceMethodSettings;
 
-            /** Sets the title for PivotClient widget.
+            /** Holds the necessary properties for value sorting.
+             * @Default {{}}
+             */
+            valueSortSettings?: ValueSortSettings;
+
+            /** Sets the title for the pivot client widget.
              */
             title?: string;
 
@@ -30617,11 +31507,21 @@ declare namespace ej {
              */
             url?: string;
 
-            /** Triggers when it reaches client-side after any AJAX request.
+            /** Allows you to export entire data instead of current page data, while paging option is enabled.
+             * @Default {false}
+             */
+            enableCompleteDataExport?: boolean;
+
+            /** Allows you to enable &quot;withCredentials&quot; property inside XMLHttpRequest object for CORS(Cross-Origin Resource Sharing) request.
+             * @Default {false}
+             */
+            enableXHRCredentials?: boolean;
+
+            /** Triggers when it reaches the client-side after any AJAX request.
              */
             afterServiceInvoke?(e: AfterServiceInvokeEventArgs): void;
 
-            /** Triggers before any AJAX request is passed from client-side to service methods.
+            /** Triggers before any AJAX request is passed from the client-side to the service methods.
              */
             beforeServiceInvoke?(e: BeforeServiceInvokeEventArgs): void;
 
@@ -30629,11 +31529,11 @@ declare namespace ej {
              */
             saveReport?(e: SaveReportEventArgs): void;
 
-            /** Triggers before loading a saved collection of reports.
+            /** Triggers before loading the saved collection of reports.
              */
             loadReport?(e: LoadReportEventArgs): void;
 
-            /** Triggers before fetching the report collection from storage.
+            /** Triggers before fetching the report collection from the storage.
              */
             fetchReport?(e: FetchReportEventArgs): void;
 
@@ -30641,47 +31541,51 @@ declare namespace ej {
              */
             beforeExport?(e: BeforeExportEventArgs): void;
 
-            /** Triggers before rendering the PivotChart.
+            /** Triggers before rendering the pivot chart.
              */
             chartLoad?(e: ChartLoadEventArgs): void;
 
-            /** Triggers before rendering the PivotSchemaDesigner.
+            /** Triggers before rendering the pivot schema designer.
              */
             schemaLoad?(e: SchemaLoadEventArgs): void;
 
-            /** Triggers before rendering the PivotTreeMap.
+            /** Triggers before rendering the pivot tree map.
              */
             treeMapLoad?(e: TreeMapLoadEventArgs): void;
 
-            /** Triggers on clicking any value cell in PivotGrid.
+            /** Triggers when clicking any value cell in the pivot grid.
              */
             valueCellHyperlinkClick?(e: ValueCellHyperlinkClickEventArgs): void;
 
-            /** Triggers when clicking on any Chart series points in the PivotChart.
+            /** Triggers when click action is performed over a grid value cell.
+             */
+            cellClick?(e: CellClickEventArgs): void;
+
+            /** Triggers when clicking on any chart series points in the pivot chart.
              */
             pointRegionClick?(e: PointRegionClickEventArgs): void;
 
-            /** Triggers before Chart label rendering in the PivotChart.
+            /** Triggers before the chart label is rendered in the pivot chart.
              */
             axesLabelRendering?(e: AxesLabelRenderingEventArgs): void;
 
-            /** Triggers while clicking value cells in PivotGrid.
+            /** Triggers while clicking the value cells in the pivot grid.
              */
             drillThrough?(e: DrillThroughEventArgs): void;
 
-            /** Triggers while we initiate loading of the widget.
+            /** Triggers while initiating the loading of the widget.
              */
             load?(e: LoadEventArgs): void;
 
-            /** Triggers when PivotClient widget completes all operations at client-end after any AJAX request.
+            /** Triggers when the pivot client widget completes all operations at client-end after any AJAX request.
              */
             renderComplete?(e: RenderCompleteEventArgs): void;
 
-            /** Triggers when any error occurred during AJAX request.
+            /** Triggers when any error is occurred during the AJAX request.
              */
             renderFailure?(e: RenderFailureEventArgs): void;
 
-            /** Triggers when PivotClient successfully completes rendering.
+            /** Triggers when the pivot client is completely rendered.
              */
             renderSuccess?(e: RenderSuccessEventArgs): void;
         }
@@ -30820,6 +31724,21 @@ declare namespace ej {
             model?: any;
         }
 
+        export interface CellClickEventArgs {
+
+            /** returns the JSON details of the respective on cell.
+             */
+            selectedData?: any[];
+
+            /** returns the custom object bound with PivotClient control.
+             */
+            customObject?: any;
+
+            /** returns the HTML element of PivotGrid control.
+             */
+            element?: any;
+        }
+
         export interface PointRegionClickEventArgs {
 
             /** returns the current action of PivotClient control.
@@ -30907,29 +31826,29 @@ declare namespace ej {
 
         export interface DataSourceColumnsAdvancedFilter {
 
-            /** Allows the user to provide level unique name to perform advanced filtering.
+            /** Allows you to provide a level unique name to perform the advanced filtering.
              */
             name?: string;
 
-            /** Allows the user to set the operator to perform Label Filtering.
+            /** Allows you to set the operator to perform label filtering.
              * @Default {none}
              */
             labelFilterOperator?: string;
 
-            /** Allows the user to set the operator to perform Value Filtering.
+            /** Allows you to set the operator to perform value filtering.
              * @Default {none}
              */
             valueFilterOperator?: string;
 
-            /** Allows the user to set the filtering type while performing advanced filtering.
+            /** Allows you to set the filtering type while performing the advanced filtering.
              */
             advancedFilterType?: string;
 
-            /** In case of value filtering, this property contains the measure name to which the filter is applied.
+            /** In value filtering, this property contains the measure name to which the filter is applied.
              */
             measure?: string;
 
-            /** Allows the user to hold the filter operand values in advanced filtering.
+            /** Allows you to hold the filter operand values in the advanced filtering.
              */
             values?: any[];
         }
@@ -30949,25 +31868,25 @@ declare namespace ej {
 
         export interface DataSourceColumn {
 
-            /** Allows the user to bind the item by using its unique name as field name.
+            /** Allows you to bind the item by using its unique name as field name.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display caption for an item.
+            /** Allows you to set the display caption for an item.
              */
             fieldCaption?: string;
 
-            /** Allows the user to filter the report by default using advanced filtering (excel-like) option for OLAP data source in client-mode.
+            /** Allows you to filter the report by default using the advanced filtering (e.g., Microsoft Excel) option for the OLAP data source in the client-mode.
              * @Default {[]}
              */
             advancedFilter?: DataSourceColumnsAdvancedFilter[];
 
-            /** Allows the user to indicate whether the added item is a named set or not.
+            /** Allows you to indicate whether the added item is a named set or not.
              * @Default {false}
              */
             isNamedSets?: boolean;
 
-            /** Shows/Hides the sub-total of the field in PivotGrid.
+            /** Shows/hides the sub-total of the field in the pivot grid.
              * @Default {true}
              */
             showSubTotal?: boolean;
@@ -30976,15 +31895,15 @@ declare namespace ej {
              */
             format?: string;
 
-            /** This property is set to display the formatted values with format types in PivotGrid.
+            /** This property is set to display the formatted values with format types in the pivot grid.
              */
             formatString?: string;
 
-            /** Allows to set the custom theme for the column headers.
+            /** Allows you to set the custom theme for the column headers.
              */
             cssClass?: string;
 
-            /** Allows the user to set the sorting order of the members of the field.
+            /** Allows you to set the sorting order of members of the field.
              * @Default {ej.PivotAnalysis.SortOrder.Ascending}
              */
             sortOrder?: ej.PivotAnalysis.SortOrder|string;
@@ -30994,7 +31913,7 @@ declare namespace ej {
              */
             drilledItems?: any[];
 
-            /** Applies filter to the field members.
+            /** Applies the filter to field members.
              * @Default {null}
              */
             filterItems?: DataSourceColumnsFilterItems;
@@ -31002,29 +31921,29 @@ declare namespace ej {
 
         export interface DataSourceRowsAdvancedFilter {
 
-            /** Allows the user to provide level unique name to perform advanced filtering.
+            /** Allows you to provide a level unique name to perform the advanced filtering.
              */
             name?: string;
 
-            /** Allows the user to set the operator to perform Label Filtering.
+            /** Allows you to set the operator to perform the label filtering.
              * @Default {none}
              */
             labelFilterOperator?: string;
 
-            /** Allows the user to set the operator to perform Value Filtering.
+            /** Allows you to set the operator to perform the value filtering.
              * @Default {none}
              */
             valueFilterOperator?: string;
 
-            /** Allows the user to set the filtering type while performing advanced filtering.
+            /** Allows you to set the filtering type while performing the advanced filtering.
              */
             advancedFilterType?: string;
 
-            /** In case of value filtering, this property contains the measure name to which the filter is applied.
+            /** In value filtering, this property contains the measure name to which the filter is applied.
              */
             measure?: string;
 
-            /** Allows the user to hold the filter operand values in advanced filtering.
+            /** Allows you to hold the filter operand values in the advanced filtering.
              */
             values?: any[];
         }
@@ -31044,42 +31963,42 @@ declare namespace ej {
 
         export interface DataSourceRow {
 
-            /** Allows the user to bind the item by using its unique name as field name.
+            /** Allows you to bind the item by using its unique name as field name.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display caption for an item.
+            /** Allows you to set the display caption for an item.
              */
             fieldCaption?: string;
 
-            /** Allows the user to filter the report by default using advanced filtering (excel-like) option for OLAP data source in client-mode.
+            /** Allows you to filter the report by using the advanced filtering (e.g., Microsoft Excel) option for the OLAP data source in the client-mode.
              * @Default {[]}
              */
             advancedFilter?: DataSourceRowsAdvancedFilter[];
 
-            /** Allows the user to indicate whether the added item is a named set or not.
+            /** Allows you to indicate whether the added item is a named set or not.
              * @Default {false}
              */
             isNamedSets?: boolean;
 
-            /** Shows/Hides the sub-total of the field.
+            /** Shows/hides the sub-total of the field.
              * @Default {true}
              */
             showSubTotal?: boolean;
 
-            /** Allows to set the format for the row headers.
+            /** Allows to set the format for row headers.
              */
             format?: string;
 
-            /** This property is set to display the formatted values with format types in PivotGrid.
+            /** This property is set to display the formatted values with format types in the pivot grid.
              */
             formatString?: string;
 
-            /** Allows to set the custom theme for the row headers.
+            /** Allows to set the custom theme for row headers.
              */
             cssClass?: string;
 
-            /** Allows the user to set the sorting order of the members of the field.
+            /** Allows you to set the sorting order for the field members.
              * @Default {ej.PivotAnalysis.SortOrder.Ascending}
              */
             sortOrder?: ej.PivotAnalysis.SortOrder|string;
@@ -31089,7 +32008,7 @@ declare namespace ej {
              */
             drilledItems?: any[];
 
-            /** Applies filter to the field members.
+            /** Applies the filter to the field members.
              * @Default {null}
              */
             filterItems?: DataSourceRowsFilterItems;
@@ -31097,18 +32016,18 @@ declare namespace ej {
 
         export interface DataSourceValuesMeasure {
 
-            /** Allows the user to bind the measure from OLAP datasource by using its unique name as field name.
+            /** Allows you to bind the measure from the OLAP data source by using its unique name as field name.
              */
             fieldName?: string;
         }
 
         export interface DataSourceValue {
 
-            /** Allows the user to bind the item by using its unique name as field name for Relational datasource.
+            /** Allows you to bind the item by using its unique name as field name for the relational data source.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display caption for an item for Relational datasource.
+            /** Allows you to set the display caption for an item for the relational data source.
              */
             fieldCaption?: string;
 
@@ -31122,12 +32041,12 @@ declare namespace ej {
              */
             axis?: string;
 
-            /** Indicates whether the field is a calculated field or not with Relational datasource.
+            /** Indicates whether the field is a calculated field or not with the relational data source.
              * @Default {false}
              */
             isCalculatedField?: boolean;
 
-            /** Allows to set the type of PivotGrid summary calculation for the value field with Relational datasource.
+            /** Allows to set the type of the pivot grid summary calculation for the value field with the relational data source.
              * @Default {ej.PivotAnalysis.SummaryType.Sum}
              */
             summaryType?: ej.PivotAnalysis.SummaryType|string;
@@ -31136,7 +32055,7 @@ declare namespace ej {
              */
             format?: string;
 
-            /** This property is set to display the formatted values with format types in PivotGrid.
+            /** This property is set to display the formatted values with format types in the pivot grid.
              */
             formatString?: string;
 
@@ -31144,7 +32063,7 @@ declare namespace ej {
              */
             cssClass?: string;
 
-            /** Allows to set the formula for calculation of values for calculated members in Relational datasource.
+            /** Allows to set the formula for calculation of members values in the relational data source.
              */
             formula?: string;
         }
@@ -31164,11 +32083,11 @@ declare namespace ej {
 
         export interface DataSourceFilter {
 
-            /** Allows the user to bind the item by using its unique name as field name.
+            /** Allows you to bind the item by using its unique name as field name.
              */
             fieldName?: string;
 
-            /** Allows the user to set the display name for an item.
+            /** Allows you to set the display name for an item.
              */
             fieldCaption?: string;
 
@@ -31180,22 +32099,22 @@ declare namespace ej {
 
         export interface DataSourcePagerOptions {
 
-            /** Allows to set the number of categorical columns to be displayed in each page on applying paging.
+            /** Allows to set the number of categorical columns to be displayed in each page on applying the paging.
              * @Default {0}
              */
             categoricalPageSize?: number;
 
-            /** Allows to set the number of series rows to be displayed in each page on applying paging.
+            /** Allows to set the number of series rows to be displayed in each page on applying the paging.
              * @Default {0}
              */
             seriesPageSize?: number;
 
-            /** Allows to set the page number in categorical axis to be loaded by default.
+            /** Allows to set the page number in the categorical axis to be loaded by default.
              * @Default {1}
              */
             categoricalCurrentPage?: number;
 
-            /** Allows to set the page number in series axis to be loaded by default.
+            /** Allows to set the page number in the series axis to be loaded by default.
              * @Default {1}
              */
             seriesCurrentPage?: number;
@@ -31203,42 +32122,42 @@ declare namespace ej {
 
         export interface DataSource {
 
-            /** Lists out the items to be arranged in columns section of PivotClient.
+            /** Lists out the items to be arranged in the columns section of the pivot client.
              * @Default {[]}
              */
             columns?: DataSourceColumn[];
 
-            /** Lists out the items to be arranged in rows section of PivotClient.
+            /** Lists out the items to be arranged in the rows section of the pivot client.
              * @Default {[]}
              */
             rows?: DataSourceRow[];
 
-            /** Lists out the items which supports calculation in PivotClient.
+            /** Lists out the items which supports calculation in the pivot client.
              * @Default {[]}
              */
             values?: DataSourceValue[];
 
-            /** Lists out the items which supports filtering of values without displaying the members in UI in PivotClient.
+            /** Lists out the items which supports filtering of values without displaying the members in UI of the pivot client.
              * @Default {[]}
              */
             filters?: DataSourceFilter[];
 
-            /** Contains the respective cube name from OLAP database as string type.
+            /** Contains the respective cube name from the OLAP database as string type.
              * @Default {“”}
              */
             cube?: string;
 
-            /** To set the data source name to fetch data from that.
+            /** Allows to set the data source name to fetch the data from that.
              * @Default {“”}
              */
             sourceInfo?: string;
 
-            /** Set the provider name for PivotClient to identify whether the provider is SSAS or Mondrian.
+            /** Sets the provider name for the pivot client to identify whether the provider is SSAS or Mondrian.
              * @Default {ssas}
              */
             providerName?: string;
 
-            /** Provides the raw data source for the PivotClient.
+            /** Provides the raw data source for the pivot client.
              * @Default {null}
              */
             data?: any;
@@ -31248,7 +32167,7 @@ declare namespace ej {
              */
             catalog?: string;
 
-            /** Allows user to filter the members (by its name and values) through advanced filtering (excel-like) option in client-mode.
+            /** Allows you to filter the members (by its name and values) through the advanced filtering (e.g., Microsoft Excel) option in the client-mode.
              * @Default {false}
              */
             enableAdvancedFilter?: boolean;
@@ -31257,7 +32176,7 @@ declare namespace ej {
              */
             reportName?: string;
 
-            /** Allows to set the page size and current page number for each axis on applying paging.
+            /** Allows to set the page size and current page number for each axis on applying the paging.
              * @Default {{}}
              */
             pagerOptions?: DataSourcePagerOptions;
@@ -31265,27 +32184,27 @@ declare namespace ej {
 
         export interface DisplaySettings {
 
-            /** Lets the user to customize the display of PivotChart and PivotGrid widgets, either in tabs or tiles.
+            /** Allows you to customize the display of the pivot chart and pivot grid widgets in the tabs or tiles.
              * @Default {ej.PivotClient.ControlPlacement.Tab}
              */
             controlPlacement?: ej.PivotClient.ControlPlacement|string;
 
-            /** Lets the user to set either Chart or Grid as the start-up widget.
+            /** Allows you to set either the chart or grid as the start-up widget.
              * @Default {ej.PivotClient.DefaultView.Grid}
              */
             defaultView?: ej.PivotClient.DefaultView|string;
 
-            /** Lets the user to have an option for switching to full screen view of PivotChart and PivotGrid from default view in PivotClient.
+            /** Allows you to switch to full screen view of the pivot chart and the pivot grid from default view in the pivot client.
              * @Default {false}
              */
             enableFullScreen?: boolean;
 
-            /** Enables an option to enhance the space for PivotGrid and PivotChart by hiding Cube Browser and Axis Element Builder.
+            /** Enables an option to enhance the space for the pivot grid and pivot chart by hiding the cube browser and the axis element builder.
              * @Default {false}
              */
             enableTogglePanel?: boolean;
 
-            /** Sets the display mode (Only Chart/Only Grid/Both) in PivotClient.
+            /** Sets the display mode (only chart/only grid/both) in the pivot client.
              * @Default {ej.PivotClient.DisplayMode.ChartAndGrid}
              */
             mode?: ej.PivotClient.DisplayMode|string;
@@ -31293,82 +32212,82 @@ declare namespace ej {
 
         export interface ToolbarIconSettings {
 
-            /** Allows user to set the visibility of Add Report icon in toolbar panel.
+            /** Allows you to set the visibility of Add Report icon in the toolbar panel.
              * @Default {true}
              */
             enableAddReport?: boolean;
 
-            /** Allows user to set the visibility of New Report icon in toolbar panel.
+            /** Allows you to set the visibility of New Report icon in the toolbar panel.
              * @Default {true}
              */
             enableNewReport?: boolean;
 
-            /** Allows user to set the visibility of Rename Report icon in toolbar panel.
+            /** Allows you to set the visibility of Rename Report icon in the toolbar panel.
              * @Default {true}
              */
             enableRenameReport?: boolean;
 
-            /** Allows user to set the visibility of DB Manipulation icon in toolbar panel.
+            /** Allows you to set the visibility of DB Manipulation icon in the toolbar panel.
              * @Default {true}
              */
             enableDBManipulation?: boolean;
 
-            /** Allows user to set the visibility of Word Export icon in toolbar panel.
+            /** Allows you to set the visibility of Word Export icon in the toolbar panel.
              * @Default {true}
              */
             enableWordExport?: boolean;
 
-            /** Allows user to set the visibility of Excel Export icon in toolbar panel.
+            /** Allows you to set the visibility of Excel Export icon in the toolbar panel.
              * @Default {true}
              */
             enableExcelExport?: boolean;
 
-            /** Allows user to set the visibility of PDF Export icon in toolbar panel.
+            /** Allows you to set the visibility of PDF Export icon in the toolbar panel.
              * @Default {true}
              */
             enablePdfExport?: boolean;
 
-            /** Allows user to set the visibility of MDX Query icon in toolbar panel.
+            /** Allows you to set the visibility of MDX Query icon in the toolbar panel.
              * @Default {true}
              */
             enableMDXQuery?: boolean;
 
-            /** Allows user to set the visibility of Defer Update icon in toolbar panel.
+            /** Allows to set the visibility of Defer Update icon in the toolbar panel.
              * @Default {false}
              */
             enableDeferUpdate?: boolean;
 
-            /** Allows user to set the visibility of Full Screen icon in toolbar panel.
+            /** Allows to set the visibility of Full Screen icon in the toolbar panel.
              * @Default {false}
              */
             enableFullScreen?: boolean;
 
-            /** Allows user to set the visibility of Sort/Filter Column icon in toolbar panel.
+            /** Allows you to set the visibility of Sort/Filter Column icon in the toolbar panel.
              * @Default {true}
              */
             enableSortOrFilterColumn?: boolean;
 
-            /** Allows user to set the visibility of Sort/Filter Row icon in toolbar panel.
+            /** Allows you to set the visibility of Sort/Filter Row icon in the toolbar panel.
              * @Default {true}
              */
             enableSortOrFilterRow?: boolean;
 
-            /** Allows user to set the visibility of Toggle Axis icon in toolbar panel.
+            /** Allows you to set the visibility of Toggle Axis icon in the toolbar panel.
              * @Default {true}
              */
             enableToggleAxis?: boolean;
 
-            /** Allows user to set the visibility of Chart Types icon in toolbar panel.
+            /** Allows you to set the visibility of Chart Types icon in the toolbar panel.
              * @Default {true}
              */
             enableChartTypes?: boolean;
 
-            /** Allows user to set the visibility of Remove Report icon in toolbar panel.
+            /** Allows you to set the visibility of Remove Report icon in the toolbar panel.
              * @Default {true}
              */
             enableRemoveReport?: boolean;
 
-            /** Allows user to set the visibility of Calculated Member icon in toolbar panel.
+            /** Allows you to set the visibility of Calculated Member icon in the toolbar panel.
              * @Default {false}
              */
             enableCalculatedMember?: boolean;
@@ -31376,117 +32295,138 @@ declare namespace ej {
 
         export interface ServiceMethodSettings {
 
-            /** Allows the user to set the custom name for the service method responsible for updating the entire report and widget, while changing the Cube.
+            /** Allows you to set the custom name for the service method that is responsible for updating the entire report and widget, while changing the cube.
              * @Default {CubeChanged}
              */
             cubeChanged?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for exporting.
+            /** Allows to set the custom name for the service method responsible for exporting.
              * @Default {Export}
              */
             exportPivotClient?: string;
 
-            /** Allows the user to set the custom name for the service method responsible to get the members for the tree-view, inside member-editor dialog.
+            /** Allows you to set the custom name for the service method that is responsible to get the members for tree-view in the member-editor dialog.
              * @Default {FetchMemberTreeNodes}
              */
             fetchMemberTreeNodes?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for fetching the report names from the database.
+            /** Allows you to set the custom name for the service method that is responsible for fetching the report names from the database.
              * @Default {FetchReportListFromDB}
              */
             fetchReportList?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for updating report while filtering members.
+            /** Allows you to set the custom name for the service method that is responsible for updating the report while filtering the members.
              * @Default {FilterElement}
              */
             filterElement?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for initializing PivotClient.
+            /** Allows you to set the custom name for the service method that is responsible for initializing the pivot client.
              * @Default {InitializeClient}
              */
             initialize?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for loading a report collection from the database.
+            /** Allows you to set the custom name for the service method that is responsible for loading a report collection from the database.
              * @Default {LoadReportFromDB}
              */
             loadReport?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for remove a report collection from the database.
+            /** Allows you to set the custom name for the service method that is responsible to remove a report collection from the database.
              * @Default {RemoveReportFromDB}
              */
             removeDBReport?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for rename the report collection in the database.
+            /** Allows you to set the custom name for the service method that is responsible for renaming the report collection in the database.
              * @Default {RenameReportInDB}
              */
             renameDBReport?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for retrieving the MDX query for the current report.
+            /** Allows you to set the custom name for the service method that is responsible for retrieving the MDX query for the current report.
              * @Default {GetMDXQuery}
              */
             mdxQuery?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for updating the tree-view inside Cube Browser, while changing the measure group.
+            /** Allows you to set the custom name for the service method that is responsible for updating the tree-view in the cube browser, while changing the measure group.
              * @Default {MeasureGroupChanged}
              */
             measureGroupChanged?: string;
 
-            /** Allows the user to set the custom name for the service method responsible to get the child members, on tree-view node expansion.
+            /** Allows you to set the custom name for the service method that is responsible to get the child members, on tree-view node expansion.
              * @Default {MemberExpanded}
              */
             memberExpand?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for updating report while dropping a node/SplitButton inside Axis Element Builder.
+            /** Allows you to set the custom name for the service method that is responsible for updating the report while dropping a node/split button in the axis element builder.
              * @Default {NodeDropped}
              */
             nodeDropped?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for updating report while removing SplitButton from Axis Element Builder.
+            /** Allows you to set the custom name for the service method that is responsible to update the report while removing the split button from the axis element builder.
              * @Default {RemoveSplitButton}
              */
             removeSplitButton?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for saving the report collection to database.
+            /** Allows you to set the custom name for the service method that is responsible for saving the report collection in the database.
              * @Default {SaveReportToDB}
              */
             saveReport?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for toggling the elements in row and column axes.
+            /** Allows you to set the custom name for the service method that is responsible for toggling the elements in the row and column axes.
              * @Default {ToggleAxis}
              */
             toggleAxis?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for all the toolbar operations.
+            /** Allows you to set the custom name for the service method that is responsible for all the toolbar operations.
              * @Default {ToolbarOperations}
              */
             toolbarServices?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for updating report collection.
+            /** Allows you to set the custom name for the service method that is responsible for updating the report collection.
              * @Default {UpdateReport}
              */
             updateReport?: string;
 
-            /** Allows the user to set the custom name for the service method responsible on navigating between pages in paged PivotClient.
+            /** Allows you to set the custom name for the service method while navigating between the pages in the paged pivot client.
              * @Default {Paging}
              */
             paging?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for updating report with calculated member.
+            /** Allows you to set the custom name for the service method that is responsible for updating the report with the calculated member.
              * @Default {CalculatedMember}
              */
             calculatedMember?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for performing drill through operation.
+            /** Allows you to set the custom name for the service method that is responsible for performing value sorting operation in the PivotClient.
+             * @Default {ValueSorting}
+             */
+            valueSorting?: string;
+
+            /** Allows you to set the custom name for the service method that is responsible for performing the drill through operation.
              * @Default {DrillThroughHierarchies}
              */
             drillThroughHierarchies?: string;
 
-            /** Allows the user to set the custom name for the service method responsible for performing drill through operation in data table.
+            /** Allows you to set the custom name for the service method that is responsible for performing the drill through operation in the data table.
              * @Default {DrillThroughDataTable}
              */
             drillThroughDataTable?: string;
         }
 
+        export interface ValueSortSettings {
+
+            /** Contains the header of the specific column to which value sorting is applied.
+             */
+            headerText?: string;
+
+            /** Allows you to set the string for separating column headers provided in the headerText property.
+             */
+            headerDelimiters?: string;
+
+            /** Allows you to set the sorting order of values of the field.
+             * @Default {ej.PivotAnalysis.SortOrder.Ascending}
+             */
+            sortOrder?: ej.PivotAnalysis.SortOrder|string;
+        }
+
         enum ClientExportMode {
 
             ///Exports both the PivotChart and PivotGrid on exporting.
@@ -31630,6 +32570,11 @@ declare namespace ej {
              */
             enableRTL?: boolean;
 
+            /** Specify the frame details of PivotGauge here.
+             * @Default {Object}
+             */
+            frame?: Frame;
+
             /** Allows the user to enable PivotGauge’s responsiveness in the browser layout.
              * @Default {false}
              */
@@ -31680,6 +32625,11 @@ declare namespace ej {
              */
             operationalMode?: ej.Pivot.OperationalMode|string;
 
+            /** Allows you to enable &quot;withCredentials&quot; property inside XMLHttpRequest object for CORS(Cross-Origin Resource Sharing) request.
+             * @Default {false}
+             */
+            enableXHRCredentials?: boolean;
+
             /** Triggers when it reaches client-side after any AJAX request.
              */
             afterServiceInvoke?(e: AfterServiceInvokeEventArgs): void;
@@ -31954,6 +32904,24 @@ declare namespace ej {
             filters?: DataSourceFilter[];
         }
 
+        export interface Frame {
+
+            /** Specifies the frame type of PivotGauge.
+             * @Default {fullcircle}
+             */
+            frameType?: string;
+
+            /** Specifies the end angle for the half circular frame.
+             * @Default {360}
+             */
+            halfCircleFrameEndAngle?: number;
+
+            /** Specifies the start angle for the half circular frame.
+             * @Default {180}
+             */
+            halfCircleFrameStartAngle?: number;
+        }
+
         export interface LabelFormatSettings {
 
             /** Allows the user to change the number format of the label values in PivotGauge.
@@ -32110,6 +33078,11 @@ declare namespace ej {
              */
             url?: string;
 
+            /** Allows you to enable &quot;withCredentials&quot; property inside XMLHttpRequest object for CORS(Cross-Origin Resource Sharing) request.
+             * @Default {false}
+             */
+            enableXHRCredentials?: boolean;
+
             /** Triggers when it reaches client-side after any AJAX request.
              */
             afterServiceInvoke?(e: AfterServiceInvokeEventArgs): void;
@@ -32410,6 +33383,15 @@ declare namespace ej {
         model: Schedule.Model;
         defaults: Schedule.Model;
 
+        /** It is used to add the resources dynamically in the scheduler. It renders the resource based on the index if it is available or else it renders this resource at end of all
+         * resources.
+         * @param {any} Resource object which can be defined with all the available options of resources.
+         * @param {string} Defines the name of the resource collection to which this object needs to be added.
+         * @param {number} It is optional. If it is available, this render the resource at the given specified index location. Else render at end of the all resources.
+         * @returns {void}
+         */
+        addResource(resourceObject: any, name: string, index: number): void;
+
         /** This method is used to delete the appointment based on the guid value or the appointment data passed to it.
          * @param {string|any} GUID value of an appointment element or an appointment object
          * @returns {void}
@@ -32460,6 +33442,13 @@ declare namespace ej {
          */
         refreshScroller(): void;
 
+        /** It is used to remove the resources dynamically from the scheduler. It removed the resource based on the resource id with the given resource collection name.
+         * @param {string|number} Defines the Id of the resource.
+         * @param {string} Defines the name of the resource collection which this resource id belongs.
+         * @returns {void}
+         */
+        removeResource(resourceId: string|number, name: string): void;
+
         /** It is used to save the appointment. The appointment object is based on the argument passed to this method.
          * @param {any} appointment object which includes appointment details
          * @returns {void}
@@ -33888,6 +34877,11 @@ declare namespace ej {
             /** Holds the array of resource names to be grouped on the Schedule.
              */
             resources?: any[];
+
+            /** When set to true, allows performing CRUD actions simultaneously on all the grouped appointments of multiple resources.
+             * @Default {false}
+             */
+            allowGroupEditing?: boolean;
         }
 
         export interface WorkHours {
@@ -34364,29 +35358,28 @@ declare namespace ej {
          */
         addRecord(data: any, rowPosition: string): void;
 
-        /** Positions the splitter by the specified column index.
-         * @param {number} Set the splitter position based on column index.
-         * @returns {void}
-         */
-        setSplitterIndex(index: number): void;
-
-        /** To sort the column in required direction
-         * @param {string} Defines the column's mapping name in which sorting have to be performed
-         * @param {string} Defines the sort direction whether the column has to sorted in ascending/descending order. By default it is sorting in an ascending order
-         * @returns {void}
-         */
-        sortColumn(mappingName: string, columnSortDirection: string): void;
-
         /** To cancel the edited state of an item in Gantt
          * @returns {void}
          */
         cancelEdit(): void;
 
+        /** To clear all the filtered columns in Gantt.
+         * @returns {void}
+         */
+        clearFilter(): void;
+
         /** To collapse all the parent items in Gantt
          * @returns {void}
          */
         collapseAllItems(): void;
 
+        /** To delete the dependency between the two tasks.
+         * @param {number} taskID of predecessor task
+         * @param {number} taskID of successor task
+         * @returns {void}
+         */
+        deleteDependency(fromTaskId: number, toTaskId: number): void;
+
         /** To delete a selected item in Gantt
          * @returns {void}
          */
@@ -34416,6 +35409,16 @@ declare namespace ej {
          */
         export(action: string, serverEvent?: string, multipleExport?: boolean): void;
 
+        /** Sends filtering request to filter a column in Gantt dynamically.
+         * @param {string} Pass the field name of the column.
+         * @param {string} string/integer/date operator.
+         * @param {string} Pass the value to be filtered in a column.
+         * @param {string} Optional - Pass the predicate as and/or.
+         * @param {boolean} Optional - pass the match case value as true/false.
+         * @returns {void}
+         */
+        filterColumn(fieldName: string, filterOperator: string, filterValue: string, predicate?: string, matchCase?: boolean): void;
+
         /** To hide the column by using header text
          * @param {string} you can pass a header text of a column to hide
          * @returns {void}
@@ -34447,6 +35450,12 @@ declare namespace ej {
          */
         saveEdit(): void;
 
+        /** To search an item with search string provided at the run time
+         * @param {string} you can pass a text to search in Gantt Control.
+         * @returns {void}
+         */
+        searchItem(searchString: string): void;
+
         /** To select cell based on the cell and row index dynamically.
          * @param {any[]} array of cell indexes to be select
          * @param {boolean} Defines that we need to preserve the previously selected cells of not
@@ -34460,11 +35469,11 @@ declare namespace ej {
          */
         selectMultipleRows(rowIndexes: any[]): void;
 
-        /** To search an item with search string provided at the run time
-         * @param {string} you can pass a text to search in Gantt Control.
+        /** Positions the splitter by the specified column index.
+         * @param {number} Set the splitter position based on column index.
          * @returns {void}
          */
-        searchItem(searchString: string): void;
+        setSplitterIndex(index: number): void;
 
         /** To set the grid width in Gantt
          * @param {string} you can give either percentage or pixels value
@@ -34478,6 +35487,41 @@ declare namespace ej {
          */
         showColumn(headerText: string): void;
 
+        /** To show/hide the critical tasks in current project.
+         * @param {boolean} To show/hide the critical tasks
+         * @returns {void}
+         */
+        showCriticalPath(isShown: boolean): void;
+
+        /** To sort the column in required direction
+         * @param {string} Defines the column's mapping name in which sorting have to be performed
+         * @param {string} Defines the sort direction whether the column has to sorted in ascending/descending order. By default it is sorting in an ascending order
+         * @returns {void}
+         */
+        sortColumn(mappingName: string, columnSortDirection: string): void;
+
+        /** To update the predecessor type and offset value for existing task dependency.
+         * @param {number} taskID of predecessor task
+         * @param {number} taskID of successor task
+         * @param {string} Type of dependency task.
+         * @param {number} Offset value of dependency task.
+         * @returns {void}
+         */
+        updateDependency(fromTaskId: number, toTaskId: number, predecessorType: string, offset: number): void;
+
+        /** To update the value of Gantt record by using it's task id value.
+         * @param {any} object with modified field values and current task id value
+         * @returns {void}
+         */
+        updateRecordByTaskId(data: any): void;
+
+        /** To update the value of Gantt record by using row index.
+         * @param {number} index of Gantt record to be updated
+         * @param {any} object with modified field value
+         * @returns {void}
+         */
+        updateRecordByIndex(index: number, data: any): void;
+
         /** To change an existing Gantt ID by new ID value dynamically
          * @param {number} you can pass an existing ID value to be change
          * @param {number} you can pass a new ID value to be change
@@ -34499,6 +35543,11 @@ declare namespace ej {
              */
             allowColumnResize?: boolean;
 
+            /** Enables or disables the ability to drag and drop the row interactively to reorder the rows
+             * @Default {false}
+             */
+            allowDragAndDrop?: boolean;
+
             /** Enables or Disables Gantt chart editing in Gantt
              * @Default {true}
              */
@@ -34529,34 +35578,11 @@ declare namespace ej {
              */
             allowSorting?: boolean;
 
-            /** Enables or disables the ability to drag and drop the row interactively to reorder the rows
-             * @Default {false}
-             */
-            allowDragAndDrop?: boolean;
-
-            /** Enable or disable predecessor validation. When it is true, all the task's start and end dates are aligned based on its predecessors start and end dates.
-             * @Default {true}
-             */
-            enablePredecessorValidation?: boolean;
-
-            /** Enables or disables serial number column for Gantt. When enabled, the records will be number sequenced.
-             * @Default {false}
-             */
-            enableSerialNumber?: boolean;
-
             /** Specifies the baseline background color in Gantt
              * @Default {#fba41c}
              */
             baselineColor?: string;
 
-            /** Specifies the mapping property path for the work field of a task in the data source. When it is mapped the end date and duration for a task will be calculated automatically.
-             */
-            workMapping?: string;
-
-            /** Specifies the mapping property path for the expand status of a record in data source.
-             */
-            expandStateMapping?: string;
-
             /** Specifies the mapping property path for baseline end date in datasource
              */
             baselineEndDateMapping?: string;
@@ -34565,6 +35591,11 @@ declare namespace ej {
              */
             baselineStartDateMapping?: string;
 
+            /** Specifies the template for cell tooltip
+             * @Default {null}
+             */
+            cellTooltipTemplate?: string;
+
             /** Specifies the mapping property path for sub tasks in datasource
              */
             childMapping?: string;
@@ -34587,15 +35618,6 @@ declare namespace ej {
              */
             cssClass?: string;
 
-            /** Specifies the template for cell tooltip
-             * @Default {null}
-             */
-            cellTooltipTemplate?: string;
-
-            /** Option for customizing the drag tooltip while reordering the rows.
-             */
-            dragTooltip?: DragTooltip;
-
             /** Collection of data or hierarchical data to represent in Gantt
              * @Default {null}
              */
@@ -34611,6 +35633,10 @@ declare namespace ej {
              */
             dayWorkingTime?: any[];
 
+            /** Option for customizing the drag tooltip while reordering the rows.
+             */
+            dragTooltip?: DragTooltip;
+
             /** Specifies the mapping property path for duration of a task in datasource
              */
             durationMapping?: string;
@@ -34620,24 +35646,15 @@ declare namespace ej {
              */
             durationUnit?: ej.Gantt.DurationUnit|string;
 
+            /** Specifies the mapping property path for task duration unit in datasource
+             */
+            durationUnitMapping?: string;
+
             /** Specifies the fields to be included in the edit dialog in Gantt
              * @Default {[]}
              */
             editDialogFields?: EditDialogField[];
 
-            /** Options for filtering and customizing filter actions.
-             */
-            filterSettings?: FilterSettings;
-
-            /** Enables or disables the responsiveness of Gantt
-             * @Default {false}
-             */
-            isResponsive?: boolean;
-
-            /** Option to configure the splitter position.
-             */
-            splitterSettings?: SplitterSettings;
-
             /** Specifies the editSettings options in Gantt.
              */
             editSettings?: EditSettings;
@@ -34647,42 +35664,21 @@ declare namespace ej {
              */
             enableAltRow?: boolean;
 
-            /** Enables/disables work breakdown structure column.
-             * @Default {false}
-             */
-            enableWBS?: boolean;
-
-            /** Enables/disables WBS predecessor column.
-             * @Default {false}
-             */
-            enableWBSPredecessor?: boolean;
-
             /** Enables or disables the collapse all records when loading the Gantt.
              * @Default {false}
              */
             enableCollapseAll?: boolean;
 
-            /** Specifies the data source field name to be displayed as left task label
-             */
-            leftTaskLabelMapping?: string;
-
-            /** Specifies the data source field name to be displayed as right task label
-             */
-            rightTaskLabelMapping?: string;
-
-            /** Specifies the template for left task label
-             */
-            leftTaskLabelTemplate?: string;
-
-            /** Specifies the template for right task label
-             */
-            rightTaskLabelTemplate?: string;
-
             /** Enables or disables the contextmenu for Gantt , when enabled contextmenu appears on right clicking Gantt
              * @Default {false}
              */
             enableContextMenu?: boolean;
 
+            /** Enable or disable predecessor validation. When it is true, all the task's start and end dates are aligned based on its predecessors start and end dates.
+             * @Default {true}
+             */
+            enablePredecessorValidation?: boolean;
+
             /** Indicates whether we can edit the progress of a task interactively in Gantt.
              * @Default {true}
              */
@@ -34693,6 +35689,11 @@ declare namespace ej {
              */
             enableResize?: boolean;
 
+            /** Enables or disables serial number column for Gantt. When enabled, the records will be number sequenced.
+             * @Default {false}
+             */
+            enableSerialNumber?: boolean;
+
             /** Enables or disables tooltip while editing (dragging/resizing) the taskbar.
              * @Default {true}
              */
@@ -34708,10 +35709,41 @@ declare namespace ej {
              */
             enableVirtualization?: boolean;
 
+            /** Enables/disables work breakdown structure column.
+             * @Default {false}
+             */
+            enableWBS?: boolean;
+
+            /** Enables/disables WBS predecessor column.
+             * @Default {false}
+             */
+            enableWBSPredecessor?: boolean;
+
             /** Specifies the mapping property path for end Date of a task in datasource
              */
             endDateMapping?: string;
 
+            /** Specifies the mapping property path for the expand status of a record in data source.
+             */
+            expandStateMapping?: string;
+
+            /** Options for filtering and customizing filter actions.
+             */
+            filterSettings?: FilterSettings;
+
+            /** Specifies the data collection for grouping the resources in resource allocation view in Gantt.
+             * @Default {[]}
+             */
+            groupCollection?: any[];
+
+            /** Default Value
+             */
+            groupIdMapping?: string;
+
+            /** Default Value
+             */
+            groupNameMapping?: string;
+
             /** Specifies whether to highlight the weekends in Gantt .
              * @Default {true}
              */
@@ -34727,6 +35759,19 @@ declare namespace ej {
              */
             includeWeekend?: boolean;
 
+            /** Enables or disables the responsiveness of Gantt
+             * @Default {false}
+             */
+            isResponsive?: boolean;
+
+            /** Specifies the data source field name to be displayed as left task label
+             */
+            leftTaskLabelMapping?: string;
+
+            /** Specifies the template for left task label
+             */
+            leftTaskLabelTemplate?: string;
+
             /** Specify the locale for Gantt
              * @Default {en-US}
              */
@@ -34736,68 +35781,42 @@ declare namespace ej {
              */
             milestoneMapping?: string;
 
-            /** Enables/disables the options for inserting , deleting and renaming  columns.
-             * @Default {false}
+            /** To Specify the JsRender script Id to customize the mile stone with our preference
              */
-            showColumnOptions?: boolean;
-
-            /** Specifies the template for parent taskbar
-             */
-            parentTaskbarTemplate?: string;
-
-            /** Specifies the nature of a task for calculating the work,  and it can fixed duration, fixed work and fixed resource unit
-             * @Default {ej.Gantt.TaskType.FixedUnit}
-             */
-            taskType?: ej.Gantt.TaskType|string;
-
-            /** Specifies the unit for the work involved in a task and it can be day, hour or minute
-             * @Default {ej.Gantt.WorkUnit.Hour}
-             */
-            workUnit?: ej.Gantt.WorkUnit|string;
-
-            /** Specifies the task scheduling mode for a project and this will be set to all the tasks available in the project
-             * @Default {ej.Gantt.TaskSchedulingMode.Auto}
-             */
-            taskSchedulingMode?: ej.Gantt.TaskSchedulingMode|string;
-
-            /** Specifies the row selection type.
-             * @Default {ej.Gantt.SelectionType.Single}
-             */
-            selectionType?: ej.Gantt.SelectionType|string;
-
-            /** Specifies the background of parent progressbar in Gantt
-             */
-            parentProgressbarBackground?: string;
-
-            /** Specifies the mapping property path for resource's percent effort involved in a task in datasource
-             */
-            resourceUnitMapping?: string;
+            milestoneTemplate?: string;
 
             /** Specifies the mapping property path for the task description in datasource
              */
             notesMapping?: string;
 
-            /** Specifies the mapping property path for the task scheduling mode for a task in datasource
-             * @Default {auto}
+            /** Specifies the background of parent progressbar in Gantt
              */
-            taskSchedulingModeMapping?: string;
-
-            /** Specifies the mapping property path for task duration unit in datasource
-             */
-            durationUnitMapping?: string;
-
-            /** Specifies the background of parent taskbar in Gantt
-             */
-            parentTaskbarBackground?: string;
+            parentProgressbarBackground?: string;
 
             /** Specifies the mapping property path for parent task Id in self reference datasource
              */
             parentTaskIdMapping?: string;
 
+            /** Specifies the background of parent taskbar in Gantt
+             */
+            parentTaskbarBackground?: string;
+
+            /** Specifies the template for parent taskbar
+             */
+            parentTaskbarTemplate?: string;
+
             /** Specifies the mapping property path for predecessors of a task in datasource
              */
             predecessorMapping?: string;
 
+            /** Specifies the JsRender template id or template script for predecessor tooltip on mouse action.
+             */
+            predecessorTooltipTemplate?: string;
+
+            /** Specifies the mapping property path for progress percentage of a task in datasource
+             */
+            progressMapping?: string;
+
             /** Specifies the background of progressbar in Gantt
              */
             progressbarBackground?: string;
@@ -34817,20 +35836,25 @@ declare namespace ej {
              */
             progressbarTooltipTemplateId?: string;
 
-            /** Specifies the mapping property path for progress percentage of a task in datasource
-             */
-            progressMapping?: string;
-
             /** It receives query to retrieve data from the table (query is same as SQL).
              * @Default {null}
              */
             query?: any;
 
+            /** Enables or disables Gantt to read-only mode
+             * @Default {false}
+             */
+            readOnly?: boolean;
+
             /** Enables or Disables rendering baselines in Gantt , when enabled baseline is rendered in Gantt
              * @Default {false}
              */
             renderBaseline?: boolean;
 
+            /** Default Value
+             */
+            resourceCollectionMapping?: string;
+
             /** Specifies the mapping property name for resource ID in resource Collection in Gantt
              */
             resourceIdMapping?: string;
@@ -34843,11 +35867,23 @@ declare namespace ej {
              */
             resourceNameMapping?: string;
 
+            /** Specifies the mapping property path for resource's percent effort involved in a task in datasource
+             */
+            resourceUnitMapping?: string;
+
             /** Collection of data regarding resources involved in entire project
              * @Default {[]}
              */
             resources?: any[];
 
+            /** Specifies the data source field name to be displayed as right task label
+             */
+            rightTaskLabelMapping?: string;
+
+            /** Specifies the template for right task label
+             */
+            rightTaskLabelTemplate?: string;
+
             /** Specifies whether rounding off the day working time edits
              * @Default {true}
              */
@@ -34872,16 +35908,35 @@ declare namespace ej {
              */
             scheduleStartDate?: string;
 
+            /** Specifies the selected cell information on rendering Gantt.
+             */
+            selectedCellIndexes?: SelectedCellIndex[];
+
             /** Specifies the selected row Index in Gantt , the row with given index will highlighted
              * @Default {-1}
              */
             selectedRowIndex?: number;
 
+            /** Specifies the row selection type.
+             * @Default {ej.Gantt.SelectionType.Single}
+             */
+            selectionType?: ej.Gantt.SelectionType|string;
+
+            /** Specifies the type of selection whether to select row or cell.
+             * @Default {ej.Gantt.SelectionMode.Row}
+             */
+            selectionMode?: ej.Gantt.SelectionMode|string;
+
             /** Enables or disables the column chooser.
              * @Default {false}
              */
             showColumnChooser?: boolean;
 
+            /** Enables/disables the options for inserting , deleting and renaming  columns.
+             * @Default {false}
+             */
+            showColumnOptions?: boolean;
+
             /** Specifies the template for cell tooltip
              * @Default {true}
              */
@@ -34911,10 +35966,6 @@ declare namespace ej {
              */
             sizeSettings?: SizeSettings;
 
-            /** Specifies the selected cell information on rendering Gantt.
-             */
-            selectedCellIndexes?: SelectedCellIndex[];
-
             /** Specifies the sorting options for Gantt.
              */
             sortSettings?: SortSettings;
@@ -34924,6 +35975,10 @@ declare namespace ej {
              */
             splitterPosition?: string;
 
+            /** Option to configure the splitter position.
+             */
+            splitterSettings?: SplitterSettings;
+
             /** Specifies the mapping property path for start date of a task in datasource
              */
             startDateMapping?: string;
@@ -34933,6 +35988,33 @@ declare namespace ej {
              */
             stripLines?: StripLine[];
 
+            /** Default Value
+             */
+            taskCollectionMapping?: string;
+
+            /** Specifies the mapping property path for task Id in datasource
+             */
+            taskIdMapping?: string;
+
+            /** Specifies the mapping property path for task name in datasource
+             */
+            taskNameMapping?: string;
+
+            /** Specifies the task scheduling mode for a project and this will be set to all the tasks available in the project
+             * @Default {ej.Gantt.TaskSchedulingMode.Auto}
+             */
+            taskSchedulingMode?: ej.Gantt.TaskSchedulingMode|string;
+
+            /** Specifies the mapping property path for the task scheduling mode for a task in datasource
+             * @Default {auto}
+             */
+            taskSchedulingModeMapping?: string;
+
+            /** Specifies the nature of a task for calculating the work,  and it can fixed duration, fixed work and fixed resource unit
+             * @Default {ej.Gantt.TaskType.FixedUnit}
+             */
+            taskType?: ej.Gantt.TaskType|string;
+
             /** Specifies the background of the taskbar in Gantt
              */
             taskbarBackground?: string;
@@ -34950,35 +36032,18 @@ declare namespace ej {
              */
             taskbarHeight?: number;
 
-            /** Specifies the template for tooltip on mouse action on taskbars
-             */
-            taskbarTooltipTemplate?: string;
-
             /** To Specify the JsRender script Id to customize the task bar with our preference
              */
             taskbarTemplate?: string;
 
-            /** To Specify the JsRender script Id to customize the mile stone with our preference
+            /** Specifies the template for tooltip on mouse action on taskbars
              */
-            milestoneTemplate?: string;
-
-            /** Enables or disables Gantt to read-only mode
-             * @Default {false}
-             */
-            readOnly?: boolean;
+            taskbarTooltipTemplate?: string;
 
             /** Specifies the template id for tooltip on mouse action on taskbars
              */
             taskbarTooltipTemplateId?: string;
 
-            /** Specifies the mapping property path for task Id in datasource
-             */
-            taskIdMapping?: string;
-
-            /** Specifies the mapping property path for task name in datasource
-             */
-            taskNameMapping?: string;
-
             /** Specifies the toolbarSettings options.
              */
             toolbarSettings?: ToolbarSettings;
@@ -34988,56 +36053,39 @@ declare namespace ej {
              */
             treeColumnIndex?: number;
 
-            /** Specifies the type of selection whether to select row or cell.
-             * @Default {ej.Gantt.SelectionMode.Row}
-             */
-            selectionMode?: ej.Gantt.SelectionMode|string;
-
             /** Enables or disables the schedule date validation while connecting a manually scheduled task with predecessor
              * @Default {false}
              */
             validateManualTasksOnLinking?: boolean;
 
-            /** Specifies the weekendBackground color in Gantt
-             * @Default {#F2F2F2}
-             */
-            weekendBackground?: string;
-
-            /** Specifies the working time schedule of day
-             * @Default {ej.Gantt.workingTimeScale.TimeScale8Hours}
-             */
-            workingTimeScale?: ej.Gantt.workingTimeScale|string;
-
-            /** Gets or sets the working days of a week in a project.
-             * @Default {[Monday,Tuesday,Wednesday,Thursday,Friday]}
-             */
-            workWeek?: any[];
-
             /** Specifies the view type for a project in the Gantt.
              * @Default {ej.Gantt.ViewType.ProjectView}
              */
             viewType?: ej.Gantt.ViewType|string;
 
-            /** Specifies the data collection for grouping the resources in resource allocation view in Gantt.
-             * @Default {[]}
+            /** Specifies the weekendBackground color in Gantt
+             * @Default {#F2F2F2}
              */
-            groupCollection?: any[];
+            weekendBackground?: string;
 
-            /** Default Value
+            /** Specifies the mapping property path for the work field of a task in the data source. When it is mapped the end date and duration for a task will be calculated automatically.
              */
-            resourceCollectionMapping?: string;
+            workMapping?: string;
 
-            /** Default Value
+            /** Specifies the unit for the work involved in a task and it can be day, hour or minute
+             * @Default {ej.Gantt.WorkUnit.Hour}
              */
-            taskCollectionMapping?: string;
+            workUnit?: ej.Gantt.WorkUnit|string;
 
-            /** Default Value
+            /** Gets or sets the working days of a week in a project.
+             * @Default {[Monday,Tuesday,Wednesday,Thursday,Friday]}
              */
-            groupIdMapping?: string;
+            workWeek?: any[];
 
-            /** Default Value
+            /** Specifies the working time schedule of day
+             * @Default {ej.Gantt.workingTimeScale.TimeScale8Hours}
              */
-            groupNameMapping?: string;
+            workingTimeScale?: ej.Gantt.workingTimeScale|string;
 
             /** Triggered for every Gantt action before its starts.
              */
@@ -35051,25 +36099,13 @@ declare namespace ej {
              */
             beginEdit?(e: BeginEditEventArgs): void;
 
-            /** Triggered before selecting a cell
-             */
-            cellSelecting?(e: CellSelectingEventArgs): void;
-
             /** Triggered after selected a cell
              */
             cellSelected?(e: CellSelectedEventArgs): void;
 
-            /** Triggered while dragging a row in Gantt control
+            /** Triggered before selecting a cell
              */
-            rowDrag?(e: RowDragEventArgs): void;
-
-            /** Triggered while start to drag row in Gantt control
-             */
-            rowDragStart?(e: RowDragStartEventArgs): void;
-
-            /** Triggered while drop a row in Gantt control
-             */
-            rowDragStop?(e: RowDragStopEventArgs): void;
+            cellSelecting?(e: CellSelectingEventArgs): void;
 
             /** Triggered after collapsed the Gantt record
              */
@@ -35115,6 +36151,18 @@ declare namespace ej {
              */
             rowDataBound?(e: RowDataBoundEventArgs): void;
 
+            /** Triggered while dragging a row in Gantt control
+             */
+            rowDrag?(e: RowDragEventArgs): void;
+
+            /** Triggered while start to drag row in Gantt control
+             */
+            rowDragStart?(e: RowDragStartEventArgs): void;
+
+            /** Triggered while drop a row in Gantt control
+             */
+            rowDragStop?(e: RowDragStopEventArgs): void;
+
             /** Triggered after the row is selected.
              */
             rowSelected?(e: RowSelectedEventArgs): void;
@@ -35123,6 +36171,10 @@ declare namespace ej {
              */
             rowSelecting?(e: RowSelectingEventArgs): void;
 
+            /** Triggered when taskbar item is clicked in Gantt.
+             */
+            taskbarClick?(e: TaskbarClickEventArgs): void;
+
             /** Triggered after completing the editing operation in taskbar
              */
             taskbarEdited?(e: TaskbarEditedEventArgs): void;
@@ -35131,10 +36183,6 @@ declare namespace ej {
              */
             taskbarEditing?(e: TaskbarEditingEventArgs): void;
 
-            /** Triggered when taskbar item is clicked in Gantt.
-             */
-            taskbarClick?(e: TaskbarClickEventArgs): void;
-
             /** Triggered when toolbar item is clicked in Gantt.
              */
             toolbarClick?(e: ToolbarClickEventArgs): void;
@@ -35177,6 +36225,10 @@ declare namespace ej {
             /** Returns selected record index
              */
             recordIndex?: number;
+
+            /** Returns the edit dialog element.
+             */
+            element?: string;
         }
 
         export interface ActionCompleteEventArgs {
@@ -35241,37 +36293,6 @@ declare namespace ej {
             columnIndex?: number;
         }
 
-        export interface CellSelectingEventArgs {
-
-            /** Returns the cancel option value.
-             */
-            cancel?: boolean;
-
-            /** Returns the cell index on the selection.
-             */
-            cellIndex?: number;
-
-            /** Returns the row index on the selection
-             */
-            rowIndex?: number;
-
-            /** Returns the selecting cell element
-             */
-            targetCell?: any;
-
-            /** Returns the selecting row element
-             */
-            targetRow?: any;
-
-            /** Returns the selecting record object
-             */
-            data?: any;
-
-            /** Returns the Gantt object Model
-             */
-            model?: any;
-        }
-
         export interface CellSelectedEventArgs {
 
             /** Returns the cancel option value.
@@ -35323,105 +36344,35 @@ declare namespace ej {
             previousTargetRow?: any;
         }
 
-        export interface RowDragEventArgs {
+        export interface CellSelectingEventArgs {
 
             /** Returns the cancel option value.
              */
             cancel?: boolean;
 
-            /** Returns the row which we start to drag.
+            /** Returns the cell index on the selection.
              */
-            draggedRow?: any;
+            cellIndex?: number;
 
-            /** Returns the row index which we start to drag.
+            /** Returns the row index on the selection
              */
-            draggedRowIndex?: number;
+            rowIndex?: number;
 
-            /** Returns the row on which we are dragging.
+            /** Returns the selecting cell element
+             */
+            targetCell?: any;
+
+            /** Returns the selecting row element
              */
             targetRow?: any;
 
-            /** Returns the row index on which we are dragging.
+            /** Returns the selecting record object
              */
-            targetRowIndex?: number;
+            data?: any;
 
-            /** Returns that we can drop over that record or not.
-             */
-            canDrop?: boolean;
-
-            /** Returns the Gantt model.
+            /** Returns the Gantt object Model
              */
             model?: any;
-
-            /** Returns request type.
-             */
-            requestType?: string;
-
-            /** Returns the name of the event.
-             */
-            type?: string;
-        }
-
-        export interface RowDragStartEventArgs {
-
-            /** 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?: boolean;
-
-            /** Returns the Gantt model.
-             */
-            model?: any;
-
-            /** Returns request type.
-             */
-            requestType?: string;
-
-            /** Returns the name of the event.
-             */
-            type?: string;
-        }
-
-        export interface RowDragStopEventArgs {
-
-            /** 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 row which we are dropped to row.
-             */
-            targetRow?: any;
-
-            /** Returns the row index which we are dropped to row.
-             */
-            targetRowIndex?: number;
-
-            /** Returns the Gantt model.
-             */
-            model?: any;
-
-            /** Returns request type.
-             */
-            requestType?: string;
-
-            /** Returns the name of the event.
-             */
-            type?: string;
         }
 
         export interface CollapsedEventArgs {
@@ -35653,6 +36604,115 @@ declare namespace ej {
             data?: any;
         }
 
+        export interface RowDragEventArgs {
+
+            /** 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 row on which we are dragging.
+             */
+            targetRow?: any;
+
+            /** Returns the row index on which we are dragging.
+             */
+            targetRowIndex?: number;
+
+            /** Returns that we can drop over that record or not.
+             */
+            canDrop?: boolean;
+
+            /** Returns the drop position value on current target row.
+             */
+            dropPosition?: string;
+
+            /** Returns the Gantt model.
+             */
+            model?: any;
+
+            /** Returns request type.
+             */
+            requestType?: string;
+
+            /** Returns the name of the event.
+             */
+            type?: string;
+
+            /** Duration is rounded off when it is set true.
+             */
+            roundOffDuration?: boolean;
+        }
+
+        export interface RowDragStartEventArgs {
+
+            /** 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?: boolean;
+
+            /** Returns the Gantt model.
+             */
+            model?: any;
+
+            /** Returns request type.
+             */
+            requestType?: string;
+
+            /** Returns the name of the event.
+             */
+            type?: string;
+        }
+
+        export interface RowDragStopEventArgs {
+
+            /** 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 row which we are dropped to row.
+             */
+            targetRow?: any;
+
+            /** Returns the row index which we are dropped to row.
+             */
+            targetRowIndex?: number;
+
+            /** Returns the Gantt model.
+             */
+            model?: any;
+
+            /** Returns request type.
+             */
+            requestType?: string;
+
+            /** Returns the name of the event.
+             */
+            type?: string;
+        }
+
         export interface RowSelectedEventArgs {
 
             /** Returns the cancel option value.
@@ -35711,6 +36771,33 @@ declare namespace ej {
             previousGridRow?: any;
         }
 
+        export interface TaskbarClickEventArgs {
+
+            /** Returns currently clicked row data
+             */
+            data?: any;
+
+            /** Returns the current item index.
+             */
+            index?: number;
+
+            /** Returns the Gantt model.
+             */
+            model?: any;
+
+            /** Returns the clicked row element
+             */
+            taskbarElement?: any;
+
+            /** Returns the target element.
+             */
+            target?: any;
+
+            /** Returns the name of the event.
+             */
+            type?: string;
+        }
+
         export interface TaskbarEditedEventArgs {
 
             /** Returns the cancel option value.
@@ -35771,33 +36858,10 @@ declare namespace ej {
             /** Returns the name of the event.
              */
             type?: string;
-        }
 
-        export interface TaskbarClickEventArgs {
-
-            /** Returns currently clicked row data
+            /** Returns duration value will be round-off or not.
              */
-            data?: any;
-
-            /** Returns the current item index.
-             */
-            index?: number;
-
-            /** Returns the Gantt model.
-             */
-            model?: any;
-
-            /** Returns the clicked row element
-             */
-            taskbarElement?: any;
-
-            /** Returns the target element.
-             */
-            target?: any;
-
-            /** Returns the name of the event.
-             */
-            type?: string;
+            roundOffDuration?: boolean;
         }
 
         export interface ToolbarClickEventArgs {
@@ -35832,6 +36896,11 @@ declare namespace ej {
             /** Specifies editType of fields to be included in the add dialog in Gantt
              */
             editType?: string;
+
+            /** Specifies the custom column field was displayed in General tab of add dialog or not.
+             * @Default {false}
+             */
+            displayInGeneralTab?: boolean;
         }
 
         export interface DragTooltip {
@@ -35861,6 +36930,54 @@ declare namespace ej {
             /** Specifies editType of fields to be included in the edit dialog in Gantt
              */
             editType?: string;
+
+            /** Specifies the custom column field was displayed in General tab of edit dialog or not.
+             * @Default {false}
+             */
+            displayInGeneralTab?: boolean;
+        }
+
+        export interface EditSettings {
+
+            /** Enables or disables add record icon in Gantt toolbar
+             * @Default {false}
+             */
+            allowAdding?: boolean;
+
+            /** Enables or disables delete icon in Gantt toolbar
+             * @Default {false}
+             */
+            allowDeleting?: boolean;
+
+            /** Specifies the option for enabling or disabling editing in Gantt grid part
+             * @Default {false}
+             */
+            allowEditing?: boolean;
+
+            /** Specifies the option for enabling or disabling indent action in Gantt.
+             * @Default {false}
+             */
+            allowIndent?: boolean;
+
+            /** Specifies the mouse action whether single click or double click to begin the editing
+             * @Default {ej.Gantt.BeginEditAction.DblClick}
+             */
+            beginEditAction?: ej.Gantt.BeginEditAction|string;
+
+            /** Specifies the edit mode in Gantt, &quot;normal&quot; is for dialog editing ,&quot;cellEditing&quot; is for cell type editing
+             * @Default {normal}
+             */
+            editMode?: string;
+
+            /** Specifies the position where the new row has to be added.
+             * @Default {ej.Gantt.RowPosition.BelowSelectedRow}
+             */
+            rowPosition?: ej.Gantt.RowPosition|string;
+
+            /** Enable or disable the confirmation dialog while deleting the record.
+             * @Default {false}
+             */
+            showDeleteConfirmDialog?: boolean;
         }
 
         export interface FilterSettingsFilteredColumn {
@@ -35890,65 +37007,6 @@ declare namespace ej {
             filteredColumns?: FilterSettingsFilteredColumn[];
         }
 
-        export interface SplitterSettings {
-
-            /** Specifies position of the splitter in Gantt , splitter can be placed either based on percentage values or pixel values.
-             */
-            position?: string;
-
-            /** Specifies the position of splitter in Gantt, based on column index in Gantt.
-             */
-            index?: string;
-        }
-
-        export interface EditSettings {
-
-            /** Enables or disables add record icon in Gantt toolbar
-             * @Default {false}
-             */
-            allowAdding?: boolean;
-
-            /** Enables or disables delete icon in Gantt toolbar
-             * @Default {false}
-             */
-            allowDeleting?: boolean;
-
-            /** Specifies the option for enabling or disabling editing in Gantt grid part
-             * @Default {false}
-             */
-            allowEditing?: boolean;
-
-            /** Specifies the option for enabling or disabling indent action in Gantt.
-             * @Default {false}
-             */
-            allowIndent?: boolean;
-
-            /** Specifies the option for enabling or disabling outdent action in Gantt
-             * @Default {false}
-             */
-            allowOutdent?: boolean;
-
-            /** Specifies the mouse action whether single click or double click to begin the editing
-             * @Default {ej.Gantt.BeginEditAction.DblClick}
-             */
-            beginEditAction?: ej.Gantt.BeginEditAction|string;
-
-            /** Specifies the edit mode in Gantt, &quot;normal&quot; is for dialog editing ,&quot;cellEditing&quot; is for cell type editing
-             * @Default {normal}
-             */
-            editMode?: string;
-
-            /** Specifies the position where the new row has to be added.
-             * @Default {ej.Gantt.RowPosition.BelowSelectedRow}
-             */
-            rowPosition?: ej.Gantt.RowPosition|string;
-
-            /** Enable or disable the confirmation dialog while deleting the record.
-             * @Default {false}
-             */
-            showDeleteConfirmDialog?: boolean;
-        }
-
         export interface Holiday {
 
             /** Specifies holiday date to be displayed in Gantt
@@ -36022,6 +37080,19 @@ declare namespace ej {
             weekStartDay?: number;
         }
 
+        export interface SelectedCellIndex {
+
+            /** Specifies the row index of the cell to be selected Gantt control
+             * @Default {-1}
+             */
+            rowIndex?: number;
+
+            /** Specifies the cell index to be selected in the row.
+             * @Default {-1}
+             */
+            cellIndex?: number;
+        }
+
         export interface SizeSettings {
 
             /** Specifies the height of Gantt control
@@ -36033,18 +37104,6 @@ declare namespace ej {
             width?: string;
         }
 
-        export interface SelectedCellIndex {
-
-            /** Specifies the row index of the cell to be selected Gantt control
-             */
-            rowIndex?: number;
-
-            /** Specifies the cell index to be selected in the row.
-             * @Default { }
-             */
-            cellIndex?: number;
-        }
-
         export interface SortSettingsSortedColumn {
 
             /** Specifies the field to be sorted in Gantt
@@ -36064,6 +37123,17 @@ declare namespace ej {
             sortedColumns?: SortSettingsSortedColumn[];
         }
 
+        export interface SplitterSettings {
+
+            /** Specifies position of the splitter in Gantt , splitter can be placed either based on percentage values or pixel values.
+             */
+            position?: string;
+
+            /** Specifies the position of splitter in Gantt, based on column index in Gantt.
+             */
+            index?: string;
+        }
+
         export interface StripLine {
 
             /** Specifies date to render striplines in Gantt
@@ -36161,55 +37231,6 @@ declare namespace ej {
         }
 
 
-        enum TaskType {
-
-            ///Resource unit remains constant while editing the work and duration values.
-            FixedUnit,
-
-            ///Work value of a task remains constant while editing duration and resource unit values.
-            FixedWork,
-
-            ///Duration value remains constant while editing work and resource unit values.
-            FixedDuration
-        }
-
-
-        enum WorkUnit {
-
-            ///Displays the work involved in a task in days.
-            Day,
-
-            ///Displays the work involved in a task in hours.
-            Hour,
-
-            ///Displays the work involved in a task in minutes
-            Minute
-        }
-
-
-        enum TaskSchedulingMode {
-
-            ///All the tasks in the project will be displayed in auto scheduled mode, where the tasks are scheduled automatically over non-working days and holidays.
-            Auto,
-
-            ///All the tasks in the project will be displayed in manually scheduled mode.
-            Manual,
-
-            ///Project consists of tasks with both auto and manually scheduled modes, based on the datasource values
-            Custom
-        }
-
-
-        enum SelectionType {
-
-            ///you can select a single row.
-            Single,
-
-            ///you can select a multiple row.
-            Multiple
-        }
-
-
         enum minutesPerInterval {
 
             ///Sets the interval automatically according with schedule start and end date.
@@ -36264,6 +37285,16 @@ declare namespace ej {
         }
 
 
+        enum SelectionType {
+
+            ///you can select a single row.
+            Single,
+
+            ///you can select a multiple row.
+            Multiple
+        }
+
+
         enum SelectionMode {
 
             ///you can select a row.
@@ -36274,13 +37305,29 @@ declare namespace ej {
         }
 
 
-        enum workingTimeScale {
+        enum TaskSchedulingMode {
 
-            ///Sets eight hour timescale.
-            TimeScale8Hours,
+            ///All the tasks in the project will be displayed in auto scheduled mode, where the tasks are scheduled automatically over non-working days and holidays.
+            Auto,
 
-            ///Sets twenty four hour timescale.
-            TimeScale24Hours
+            ///All the tasks in the project will be displayed in manually scheduled mode.
+            Manual,
+
+            ///Project consists of tasks with both auto and manually scheduled modes, based on the datasource values
+            Custom
+        }
+
+
+        enum TaskType {
+
+            ///Resource unit remains constant while editing the work and duration values.
+            FixedUnit,
+
+            ///Work value of a task remains constant while editing duration and resource unit values.
+            FixedWork,
+
+            ///Duration value remains constant while editing work and resource unit values.
+            FixedDuration
         }
 
 
@@ -36293,6 +37340,29 @@ declare namespace ej {
             ResourceView
         }
 
+
+        enum WorkUnit {
+
+            ///Displays the work involved in a task in days.
+            Day,
+
+            ///Displays the work involved in a task in hours.
+            Hour,
+
+            ///Displays the work involved in a task in minutes
+            Minute
+        }
+
+
+        enum workingTimeScale {
+
+            ///Sets eight hour timescale.
+            TimeScale8Hours,
+
+            ///Sets twenty four hour timescale.
+            TimeScale24Hours
+        }
+
     }
 
     class ReportViewer extends ej.Widget {
@@ -36637,7 +37707,7 @@ declare namespace ej {
             /** Gets or sets the values of data source.
              * @Default {[]}
              */
-            values?: any[];
+            value?: any[];
         }
 
         export interface ExportSettings {
@@ -38837,6 +39907,11 @@ declare namespace ej {
              * @Default {true}
              */
             enableComplexBlankFilter?: boolean;
+
+            /** Specifies the mode of filtering to filter the record with or without hierarchy.
+             * @Default {ej.TreeGrid.FilterHierarchyMode.Parent}
+             */
+            filterHierarchyMode?: ej.TreeGrid.FilterHierarchyMode|string;
         }
 
         export interface PageSettings {
@@ -39198,6 +40273,22 @@ declare namespace ej {
         }
 
 
+        enum FilterHierarchyMode {
+
+            ///Shows the filtered record with parent record
+            Parent,
+
+            ///Shows the filtered record with child record
+            Child,
+
+            ///shows the filtered record with both parent and child record
+            Both,
+
+            ///Shows only filtered record.
+            None
+        }
+
+
         enum PageSizeMode {
 
             ///To count all the parent and child records.
@@ -40529,6 +41620,11 @@ declare namespace ej {
          */
         redo(): void;
 
+        /** Refreshes the Signature widget
+         * @returns {void}
+         */
+        refresh(): void;
+
         /** used to save the drawn image.
          * @param {string} The file name of the signature to be downloaded.
          * @returns {void}
@@ -41320,6 +42416,11 @@ declare namespace ej {
          */
         protectSheet(isProtected?: boolean): void;
 
+        /** This method is used to perform the redo action in Spreadsheet.
+         * @returns {void}
+         */
+        redo(): void;
+
         /** This method is used to refresh the content in Spreadsheet.
          * @param {number} Pass the index of the sheet.
          * @returns {void}
@@ -41477,6 +42578,11 @@ declare namespace ej {
          */
         showWaitingPopUp(): void;
 
+        /** This method is used to perform the undo action in Spreadsheet.
+         * @returns {void}
+         */
+        undo(): void;
+
         /** This method is used to unhide the sheet based on specified sheet name or sheet index.
          * @param {string|number} Pass the sheet name or index that you want to unhide.
          * @returns {void}
@@ -41795,12 +42901,26 @@ declare namespace ej {
              */
             enableItem(target: string, idxColl: any[]): void;
 
+            /** This method is used to hide the items in the context menu.
+             * @param {string} Specifies the context menu type in which the item to be hides.
+             * @param {any[]} Specifies the Menu Item id collection to be hides
+             * @returns {void}
+             */
+            hideItem(cMenuType: string, idxColl: any[]): void;
+
             /** This method is used to remove the items in the context menu.
              * @param {string} Specifies the context menu type in which the item to be removed.
              * @param {any[]} Specifies the Menu Item id collection to be removed
              * @returns {void}
              */
             removeItem(target: string, idxColl: any[]): void;
+
+            /** This method is used to show the items in the context menu.
+             * @param {string} Specifies the context menu type in which the item to be shown.
+             * @param {any[]} Specifies the Menu Item id collection to be shown
+             * @returns {void}
+             */
+            showItem(cMenuType: string, idxColl: any[]): void;
         }
 
         export interface XLDragDrop {
@@ -42231,12 +43351,12 @@ declare namespace ej {
             addNamedRange(name: string, refersTo: string, comment: string, sheetIdx: number): void;
 
             /** This method is used to dynamically add the tab in the ribbon.
-             * @param {any[]} Specifies the text to be displayed in the tab.
-             * @param {number} pass the groups to be displayed in the ribbon tab.
+             * @param {string} Specifies the text to be displayed in the tab.
+             * @param {any[]} pass the groups to be displayed in the ribbon tab.
              * @param {number} pass the index of the tab.
              * @returns {void}
              */
-            addTab(tabText: any[], ribbonGroups: number, index: number): void;
+            addTab(tabText: string, ribbonGroups: any[], index: number): void;
 
             /** This method is used to dynamically add the tab group in the ribbon.
              * @param {number} Specifies the ribbon tab index.
@@ -42902,10 +44022,6 @@ declare namespace ej {
              */
             ribbonClick?(e: RibbonClickEventArgs): void;
 
-            /** Triggered when the chart series rendering.
-             */
-            seriesRendering?(e: SeriesRenderingEventArgs): void;
-
             /** Triggered when click the ribbon tab.
              */
             tabClick?(e: TabClickEventArgs): void;
@@ -43384,7 +44500,7 @@ declare namespace ej {
 
             /** Returns the cell previous value.
              */
-            pValue?: string;
+            prevValue?: string;
 
             /** Returns the name of the event.
              */
@@ -43952,25 +45068,6 @@ declare namespace ej {
             cancel?: boolean;
         }
 
-        export interface SeriesRenderingEventArgs {
-
-            /** Returns chart data and chart information.
-             */
-            data?: any;
-
-            /** Returns the chart model.
-             */
-            model?: ej.Spreadsheet.Model;
-
-            /** Returns the name of the event.
-             */
-            type?: string;
-
-            /** Returns the cancel option value.
-             */
-            cancel?: boolean;
-        }
-
         export interface TabClickEventArgs {
 
             /** Returns the active tab index.
@@ -45056,7 +46153,7 @@ declare namespace ej {
              */
             pageChange?(e: PageChangeEventArgs): void;
 
-            /** Triggers when the ajax request is failed.
+            /** Triggers when the AJAX request is failed.
              */
             ajaxRequestFailure?(e: AjaxRequestFailureEventArgs): void;
 
@@ -45123,7 +46220,7 @@ declare namespace ej {
 
         export interface DocumentLoadEventArgs {
 
-            /** true, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45142,7 +46239,7 @@ declare namespace ej {
 
         export interface DocumentUnloadEventArgs {
 
-            /** true, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45157,7 +46254,7 @@ declare namespace ej {
 
         export interface PageChangeEventArgs {
 
-            /** true, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45176,7 +46273,7 @@ declare namespace ej {
 
         export interface AjaxRequestFailureEventArgs {
 
-            /** true, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45195,7 +46292,7 @@ declare namespace ej {
 
         export interface ZoomChangeEventArgs {
 
-            /** true, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45218,7 +46315,7 @@ declare namespace ej {
 
         export interface HyperlinkClickEventArgs {
 
-            /** true, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45237,7 +46334,7 @@ declare namespace ej {
 
         export interface BeforePrintEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45252,7 +46349,7 @@ declare namespace ej {
 
         export interface AfterPrintEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45267,7 +46364,7 @@ declare namespace ej {
 
         export interface PageClickEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45290,7 +46387,7 @@ declare namespace ej {
 
         export interface AnnotationAddEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45325,7 +46422,7 @@ declare namespace ej {
 
         export interface AnnotationRemoveEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45352,7 +46449,7 @@ declare namespace ej {
 
         export interface AnnotationPropertiesChangeEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45387,7 +46484,7 @@ declare namespace ej {
 
         export interface SignatureAddEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45414,7 +46511,7 @@ declare namespace ej {
 
         export interface SignatureDeleteEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45433,7 +46530,7 @@ declare namespace ej {
 
         export interface SignaturePropertiesChangeEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45476,7 +46573,7 @@ declare namespace ej {
 
         export interface SignatureResizeEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45507,7 +46604,7 @@ declare namespace ej {
 
         export interface BufferStartEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45526,7 +46623,7 @@ declare namespace ej {
 
         export interface BufferEndEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -45545,7 +46642,7 @@ declare namespace ej {
 
         export interface DestroyEventArgs {
 
-            /** True, if the event should be canceled; otherwise, false.
+            /** Returns the cancel option value.
              */
             cancel?: boolean;
 
@@ -47707,6 +48804,10 @@ declare namespace ej.datavisualization {
              */
             enableMarkerPointerAnimation?: boolean;
 
+            /** This provides options for customizing export settings
+             */
+            exportSettings?: ExportSettings;
+
             /** Specifies the can resize state.
              * @Default {false}
              */
@@ -47858,6 +48959,14 @@ declare namespace ej.datavisualization {
             /** Triggers while the rendering of the gauge completed.
              */
             renderComplete?(e: RenderCompleteEventArgs): void;
+
+            /** Fires, on double clicking the gauge.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the gauge.
+             */
+            rightClick?(e: RightClickEventArgs): void;
         }
 
         export interface DrawBarPointersEventArgs {
@@ -48451,6 +49560,68 @@ declare namespace ej.datavisualization {
             type?: any;
         }
 
+        export interface DoubleClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the gauge model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** location - X and Y co-ordinate of the points with respect to gauge area.id - ID of the target element.    size - Width and height of the gauge.    pageX - x-coordinate of the
+             * pointer, relative to the page    pageY - y-coordinate of the pointer, relative to the page
+             */
+            data?: any;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the gauge model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** location - X and Y co-ordinate of the points with respect to gauge area.id - ID of the target element.    size - Width and height of the gauge.    pageX - x-coordinate of the
+             * pointer, relative to the page    pageY - y-coordinate of the pointer, relative to the page
+             */
+            data?: any;
+        }
+
+        export interface ExportSettings {
+
+            /** Specifies the downloading filename
+             * @Default {LinearGauge}
+             */
+            filename?: string;
+
+            /** Specifies the format of the file to export
+             * @Default {png}
+             */
+            type?: ej.datavisualization.LinearGauge.ExportingType|string;
+
+            /** Specifies the name of the action URL
+             */
+            action?: string;
+
+            /** Specifies the mode of exporting
+             * @Default {client}
+             */
+            mode?: ej.datavisualization.LinearGauge.ExportingMode|string;
+        }
+
         export interface Frame {
 
             /** Specifies the frame background image URL of linear gauge
@@ -49183,6 +50354,22 @@ declare namespace ej.datavisualization {
             templateID?: string;
         }
     }
+    namespace LinearGauge {
+        enum ExportingType {
+            //string
+            PNG,
+            //string
+            JPG,
+        }
+    }
+    namespace LinearGauge {
+        enum ExportingMode {
+            //string
+            ServerSide,
+            //string
+            ClientSide,
+        }
+    }
     namespace LinearGauge {
         enum OuterCustomLabelPosition {
             //string
@@ -49928,7 +51115,7 @@ declare namespace ej.datavisualization {
              */
             distanceFromCorner?: number;
 
-            /** Specify range zOrder placement of circular gauge.
+            /** Specify range Z-order placement of circular gauge.
              * @Default {Rear}
              */
             rangeZOrder?: ej.datavisualization.CircularGauge.RangeZOrderPlacement|string;
@@ -49948,6 +51135,10 @@ declare namespace ej.datavisualization {
              */
             enableResize?: boolean;
 
+            /** This provides options for customizing export settings
+             */
+            exportSettings?: ExportSettings;
+
             /** Specify the frame of circular gauge
              * @Default {Object}
              */
@@ -50097,6 +51288,14 @@ declare namespace ej.datavisualization {
             /** Triggers when the rendering of the gauge is completed.
              */
             renderComplete?(e: RenderCompleteEventArgs): void;
+
+            /** Fires, on double clicking the circular gauge.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the circular gauge.
+             */
+            rightClick?(e: RightClickEventArgs): void;
         }
 
         export interface LegendItemRenderEventArgs {
@@ -50716,6 +51915,68 @@ declare namespace ej.datavisualization {
             type?: string;
         }
 
+        export interface DoubleClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the circular gauge model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** location - X and Y co-ordinate of the points with respect to circular gauge area.id - ID of the target element.    size - Width and height of the circular gauge.    pageX -
+             * x-coordinate of the pointer, relative to the page    pageY - y-coordinate of the pointer, relative to the page
+             */
+            data?: any;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the circular gauge model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** location - X and Y co-ordinate of the points with respect to circular gauge area.id - ID of the target element.    size - Width and height of the circular gauge.    pageX -
+             * x-coordinate of the pointer, relative to the page    pageY - y-coordinate of the pointer, relative to the page
+             */
+            data?: any;
+        }
+
+        export interface ExportSettings {
+
+            /** Specifies the downloading filename
+             * @Default {CircularGauge}
+             */
+            filename?: string;
+
+            /** Specifies the format of the file to export
+             * @Default {png}
+             */
+            type?: ej.datavisualization.CircularGauge.ExportingType|string;
+
+            /** Specifies the name of the action URL
+             */
+            action?: string;
+
+            /** Specifies the mode of exporting
+             * @Default {client}
+             */
+            mode?: ej.datavisualization.CircularGauge.ExportingMode|string;
+        }
+
         export interface Frame {
 
             /** Specify the URL of the frame background image for circular gauge
@@ -51609,6 +52870,22 @@ declare namespace ej.datavisualization {
             Front,
         }
     }
+    namespace CircularGauge {
+        enum ExportingType {
+            //string
+            PNG,
+            //string
+            JPG,
+        }
+    }
+    namespace CircularGauge {
+        enum ExportingMode {
+            //string
+            ServerSide,
+            //string
+            ClientSide,
+        }
+    }
     namespace CircularGauge {
         enum FrameType {
             //string
@@ -51854,6 +53131,10 @@ declare namespace ej.datavisualization {
 
         export interface Model {
 
+            /** This provides options for customizing export settings
+             */
+            exportSettings?: ExportSettings;
+
             /** Specifies the frame of the Digital gauge.
              * @Default {{backgroundImageUrl: null, innerWidth: 6, outerWidth: 10}}
              */
@@ -51917,6 +53198,18 @@ declare namespace ej.datavisualization {
             /** Triggers when the gauge render is completed.
              */
             renderComplete?(e: RenderCompleteEventArgs): void;
+
+            /** Fires, on clicking the gauge.
+             */
+            Click?(e: ClickEventArgs): void;
+
+            /** Fires, on double clicking the digital gauge.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the digital gauge.
+             */
+            rightClick?(e: RightClickEventArgs): void;
         }
 
         export interface InitEventArgs {
@@ -52027,6 +53320,88 @@ declare namespace ej.datavisualization {
             type?: string;
         }
 
+        export interface ClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the gauge model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** location - X and Y co-ordinate of the points with respect to gauge area.id - ID of the target element.    size - Width and height of the gauge.    pageX - x-coordinate of the
+             * pointer, relative to the page    pageY - y-coordinate of the pointer, relative to the page
+             */
+            data?: any;
+        }
+
+        export interface DoubleClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the digital gauge model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** location - X and Y co-ordinate of the points with respect to digital gauge area.id - ID of the target element.    size - Width and height of the digital gauge.    pageX -
+             * x-coordinate of the pointer, relative to the page    pageY - y-coordinate of the pointer, relative to the page
+             */
+            data?: any;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the digital gauge model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** location - X and Y co-ordinate of the points with respect to digital gauge area.id - ID of the target element.    size - Width and height of the digital gauge.    pageX -
+             * x-coordinate of the pointer, relative to the page    pageY - y-coordinate of the pointer, relative to the page
+             */
+            data?: any;
+        }
+
+        export interface ExportSettings {
+
+            /** Specifies the downloading filename
+             * @Default {DigitalGauge}
+             */
+            filename?: string;
+
+            /** Specifies the format of the file to export
+             * @Default {png}
+             */
+            type?: ej.datavisualization.DigitalGauge.ExportingType|string;
+
+            /** Specifies the name of the action URL
+             */
+            action?: string;
+
+            /** Specifies the mode of exporting
+             * @Default {client}
+             */
+            mode?: ej.datavisualization.DigitalGauge.ExportingMode|string;
+        }
+
         export interface Frame {
 
             /** Specifies the URL of an image to be displayed as background of the Digital gauge.
@@ -52195,6 +53570,22 @@ declare namespace ej.datavisualization {
             value?: string;
         }
     }
+    namespace DigitalGauge {
+        enum ExportingType {
+            //string
+            PNG,
+            //string
+            JPG,
+        }
+    }
+    namespace DigitalGauge {
+        enum ExportingMode {
+            //string
+            ServerSide,
+            //string
+            ClientSide,
+        }
+    }
     namespace DigitalGauge {
         enum CharacterType {
             //string
@@ -60231,6 +61622,18 @@ declare namespace ej.datavisualization {
             /** Fires on changes ending the scrollbar position of range navigator.
              */
             scrollEnd?(e: ScrollEndEventArgs): void;
+
+            /** Fires, on clicking the range of range navigator.
+             */
+            Click?(e: ClickEventArgs): void;
+
+            /** Fires, on double clicking the range of range navigator.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the range of range navigator.
+             */
+            rightClick?(e: RightClickEventArgs): void;
         }
 
         export interface LoadEventArgs {
@@ -60409,6 +61812,63 @@ declare namespace ej.datavisualization {
             type?: string;
         }
 
+        export interface ClickEventArgs {
+
+            /** parameters from range navigator
+             */
+            Data?: any;
+
+            /** if the event should be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** returns the range navigator model
+             */
+            model?: any;
+
+            /** returns the name of the event
+             */
+            type?: string;
+        }
+
+        export interface DoubleClickEventArgs {
+
+            /** parameters from range navigator
+             */
+            Data?: any;
+
+            /** if the event should be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** returns the range navigator model
+             */
+            model?: any;
+
+            /** returns the name of the event
+             */
+            type?: string;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** parameters from range navigator
+             */
+            Data?: any;
+
+            /** if the event should be canceled; otherwise, false.
+             */
+            cancel?: boolean;
+
+            /** returns the range navigator model
+             */
+            model?: any;
+
+            /** returns the name of the event
+             */
+            type?: string;
+        }
+
         export interface Border {
 
             /** Border color of rangenavigator. When enable the scrollbar, the default color will be set as &quot;#B4B4B4&quot;.
@@ -61447,6 +62907,18 @@ declare namespace ej.datavisualization {
             /** Fires on loading bullet graph.
              */
             load?(e: LoadEventArgs): void;
+
+            /** Fires, on clicking the bullet graph.
+             */
+            Click?(e: ClickEventArgs): void;
+
+            /** Fires, on double clicking the bullet graph.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the bullet graph.
+             */
+            rightClick?(e: RightClickEventArgs): void;
         }
 
         export interface DrawCaptionEventArgs {
@@ -61636,6 +63108,66 @@ declare namespace ej.datavisualization {
             cancel?: boolean;
         }
 
+        export interface ClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the bullet graph model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** location - X and Y co-ordinate of the points with respect to bullet graph area.id - ID of the target element.    size - Width and height of the bullet graph.    pageX -
+             * x-coordinate of the pointer, relative to the page    pageY - y-coordinate of the pointer, relative to the page
+             */
+            data?: any;
+        }
+
+        export interface DoubleClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the bullet graph model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** location - X and Y co-ordinate of the points with respect to bullet graph area.id - ID of the target element.    size - Width and height of the bullet graph.    pageX -
+             * x-coordinate of the pointer, relative to the page    pageY - y-coordinate of the pointer, relative to the page
+             */
+            data?: any;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the bullet graph model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** location - X and Y co-ordinate of the points with respect to bullet graph area.id - ID of the target element.    size - Width and height of the bullet graph.    pageX -
+             * x-coordinate of the pointer, relative to the page    pageY - y-coordinate of the pointer, relative to the page
+             */
+            data?: any;
+        }
+
         export interface CaptionSettingsFont {
 
             /** Specifies the color of the text in caption.
@@ -62614,6 +64146,11 @@ declare namespace ej.datavisualization {
              */
             enableAnimation?: boolean;
 
+            /** Enables or Disables right to left(RTL) support for maps.
+             * @Default {false}
+             */
+            enableRTL?: boolean;
+
             /** Enables or Disables the animation for layer change in map
              * @Default {false}
              */
@@ -62656,6 +64193,18 @@ declare namespace ej.datavisualization {
              */
             markerSelected?(e: MarkerSelectedEventArgs): void;
 
+            /** Triggered while rendering the each legend in maps.
+             */
+            legendItemRendering?(e: LegendItemRenderingEventArgs): void;
+
+            /** Triggered while rendering the each bubbles in maps.
+             */
+            bubbleRendering?(e: BubbleRenderingEventArgs): void;
+
+            /** Triggered while rendering the each shapes in maps.
+             */
+            shapeRendering?(e: ShapeRenderingEventArgs): void;
+
             /** Triggers while leaving the hovered map shape
              */
             mouseleave?(e: MouseleaveEventArgs): void;
@@ -62683,6 +64232,22 @@ declare namespace ej.datavisualization {
             /** Triggers when map is zoomed out.
              */
             zoomedOut?(e: ZoomedOutEventArgs): void;
+
+            /** Fires, on clicking the map.
+             */
+            Click?(e: ClickEventArgs): void;
+
+            /** Fires, on double clicking the map.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the map.
+             */
+            rightClick?(e: RightClickEventArgs): void;
+
+            /** Fires before loading the map.
+             */
+            onLoad?(e: OnLoadEventArgs): void;
         }
 
         export interface MarkerSelectedEventArgs {
@@ -62692,6 +64257,27 @@ declare namespace ej.datavisualization {
             originalEvent?: any;
         }
 
+        export interface LegendItemRenderingEventArgs {
+
+            /** Returns the legend item.
+             */
+            originalEvent?: any;
+        }
+
+        export interface BubbleRenderingEventArgs {
+
+            /** Returns the bubble values.
+             */
+            originalEvent?: any;
+        }
+
+        export interface ShapeRenderingEventArgs {
+
+            /** Returns the shape values.
+             */
+            originalEvent?: any;
+        }
+
         export interface MouseleaveEventArgs {
 
             /** Returns hovered map shape object.
@@ -62749,6 +64335,42 @@ declare namespace ej.datavisualization {
             zoomLevel?: any;
         }
 
+        export interface ClickEventArgs {
+
+            /** Returns clicked shape object.
+             */
+            originalEvent?: any;
+        }
+
+        export interface DoubleClickEventArgs {
+
+            /** Returns double clicked shape object.
+             */
+            originalEvent?: any;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** Returns right clicked shape object.
+             */
+            originalEvent?: any;
+        }
+
+        export interface OnLoadEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the map model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
         export interface ZoomSettings {
 
             /** Enables or Disables the zooming of map
@@ -62761,6 +64383,11 @@ declare namespace ej.datavisualization {
              */
             enableZoomOnSelection?: boolean;
 
+            /** Enables or Disables the zoom on mouse wheel the map.
+             * @Default {true}
+             */
+            enableMouseWheelZoom?: boolean;
+
             /** Specifies the zoom factor for map zoom value.
              * @Default {1}
              */
@@ -62963,6 +64590,11 @@ declare namespace ej.datavisualization {
              */
             leftLabel?: string;
 
+            /** To get the field name in the datasource for generating legend items.
+             * @Default {null}
+             */
+            textPath?: string;
+
             /** to get mode of legend setting
              * @Default {default}
              */
@@ -63080,6 +64712,11 @@ declare namespace ej.datavisualization {
              */
             colorValuePath?: string;
 
+            /** Specifies the field name in the datasource that contains color values for each shapes.
+             * @Default {null}
+             */
+            colorPath?: string;
+
             /** Enables or Disables the gradient colors for map shapes.
              * @Default {false}
              */
@@ -63188,6 +64825,11 @@ declare namespace ej.datavisualization {
              */
             colorValuePath?: string;
 
+            /** Specifies the field name in the datasource that contains color values for each bubbles.
+             * @Default {null}
+             */
+            colorPath?: string;
+
             /** Specifies the maximum size value of bubbles for shape layer in map
              * @Default {20}
              */
@@ -63289,6 +64931,11 @@ declare namespace ej.datavisualization {
              */
             leftLabel?: string;
 
+            /** To get the field name in the datasource for generating legend items.
+             * @Default {null}
+             */
+            textPath?: string;
+
             /** to get mode of legend setting
              * @Default {default}
              */
@@ -63848,6 +65495,11 @@ declare namespace ej.datavisualization {
              */
             colorValuePath?: string;
 
+            /** Specifies the field name in the datasource that contains color values for treemap items.
+             * @Default {null}
+             */
+            colorPath?: string;
+
             /** Specifies the datasource of the treemap
              * @Default {null}
              */
@@ -64014,6 +65666,14 @@ declare namespace ej.datavisualization {
              */
             treeMapItemSelected?(e: TreeMapItemSelectedEventArgs): void;
 
+            /** Triggers while rendering each treemap items.
+             */
+            itemRendering?(e: ItemRenderingEventArgs): void;
+
+            /** Triggers while rendering each legend item
+             */
+            legendItemRendering?(e: LegendItemRenderingEventArgs): void;
+
             /** Triggers when drilldown is started
              */
             drillStarted?(e: DrillStartedEventArgs): void;
@@ -64033,6 +65693,18 @@ declare namespace ej.datavisualization {
             /** Triggers when the group selection is performed on treemap items.
              */
             treeMapGroupSelected?(e: TreeMapGroupSelectedEventArgs): void;
+
+            /** Fires, on clicking the tree map items.
+             */
+            Click?(e: ClickEventArgs): void;
+
+            /** Fires, on double clicking the tree map items.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the tree map items.
+             */
+            rightClick?(e: RightClickEventArgs): void;
         }
 
         export interface TreeMapItemSelectedEventArgs {
@@ -64042,6 +65714,20 @@ declare namespace ej.datavisualization {
             originalEvent?: any;
         }
 
+        export interface ItemRenderingEventArgs {
+
+            /** Returns treemap leaf item
+             */
+            originalEvent?: any;
+        }
+
+        export interface LegendItemRenderingEventArgs {
+
+            /** Returns treemap legend item
+             */
+            originalEvent?: any;
+        }
+
         export interface DrillStartedEventArgs {
 
             /** Returns selected drilled treeMap object.
@@ -64077,6 +65763,27 @@ declare namespace ej.datavisualization {
             originalEvent?: any;
         }
 
+        export interface ClickEventArgs {
+
+            /** Returns the clicked group of treeMapItems as  object.
+             */
+            originalEvent?: any;
+        }
+
+        export interface DoubleClickEventArgs {
+
+            /** Returns the  double clicked group of treeMapItems as  object.
+             */
+            originalEvent?: any;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** Returns the right clicked group of treeMapItems as  object.
+             */
+            originalEvent?: any;
+        }
+
         export interface UniColorMapping {
 
             /** Specifies the uniform color mapping of the treemap
@@ -64461,6 +66168,19 @@ declare namespace ej.datavisualization {
          */
         addPhase(name: string, options: any): void;
 
+        /** Add a collection of layers can be added to the existing diagram layer at runtime.
+         * @param {any[]} a collection of layers to be added to the existing diagram layers.
+         * @returns {void}
+         */
+        addLayers(layers: any[]): void;
+
+        /** Add a collection of diagram elements can be added to the specific diagram layer.
+         * @param {string} specifies the name of the layer to the nodes will be added.
+         * @param {any[]} collection of diagram elements to be added to the specific layer.
+         * @returns {void}
+         */
+        addNodeToLayer(layerName: string, nodes: any[]): void;
+
         /** Add a collection of ports to the node specified by name
          * @param {string} name of the node to which the ports have to be added
          * @param {any[]} a collection of ports to be added to the specified node
@@ -64531,10 +66251,10 @@ declare namespace ej.datavisualization {
 
         /** The exportImage method is used to export the image passed through argument with different image format and exporting options as like exportDiagram method.
          * @param {string} pass the base64String image to be exported.
-         * @param {Diagram.Options} options to export the desired region of diagram to the desired formats.
+         * @param {Diagram.ExportImageSettings} options to export the desired region of diagram to the desired formats.
          * @returns {string}
          */
-        exportImage(image: string, options?: Diagram.Options): string;
+        exportImage(image: string, exportImageSettings?: Diagram.ExportImageSettings): string;
 
         /** Read a node/connector object by its name
          * @param {string} name of the node/connector that is to be identified
@@ -64606,17 +66326,17 @@ declare namespace ej.datavisualization {
         paste(object?: any, rename?: boolean): void;
 
         /** Print the diagram as image
-         * @param {Diagram.Options} options to print the desired region of diagram and print the diagram in multiple pages.
+         * @param {Diagram.PrintSettings} options to print the desired region of diagram and print the diagram in multiple pages.
          * @returns {void}
          */
-        print(options?: Diagram.Options): void;
+        print(printSettings?: Diagram.PrintSettings): void;
 
         /** The printImage method is used to print the image passed through argument with desired region and multiple pages as like print method.
          * @param {string} pass the base64String image to be printed.
-         * @param {Diagram.Options} options to export the desired region of diagram to the desired formats.
+         * @param {Diagram.PrintImageSettings} options to export the desired region of diagram to the desired formats.
          * @returns {string}
          */
-        printImage(image: string, options?: Diagram.Options): string;
+        printImage(image: string, printImageSettings?: Diagram.PrintImageSettings): string;
 
         /** Restore the last action that was reverted
          * @returns {void}
@@ -64634,7 +66354,20 @@ declare namespace ej.datavisualization {
          */
         remove(node?: any): void;
 
-        /** Add a collection of ports to the node specified by name
+        /** Remove the collection of layers from the diagram layers.
+         * @param {any[]} collection of layers to be removed from diagram layer.
+         * @returns {void}
+         */
+        removeLayers(layers: any[]): void;
+
+        /** Remove the collection of nodes from the specific layer.
+         * @param {string} Specifies the layer name to the node will be removed.
+         * @param {any[]} collection of diagram elements name to be removed from specific layer.
+         * @returns {void}
+         */
+        removeNodeToLayer(layerName: string, nodes: any[]): void;
+
+        /** Remove the collection of ports from the specified node.
          * @param {string} name of the node to which the ports have to be added
          * @param {any[]} a collection of ports to be deleted from the specified node
          * @returns {void}
@@ -64743,6 +66476,13 @@ declare namespace ej.datavisualization {
          */
         updateLabel(nodeName: string, label: any, options: any): any;
 
+        /** Update the given layer at run time.
+         * @param {string} the name of layer to be updated
+         * @param {any} the layer object to be modified
+         * @returns {void}
+         */
+        updateLayer(layerName: string, options: any): void;
+
         /** Update nodes at runtime
          * @param {string} name of the node that is to be updated
          * @param {any} JSON to specify the properties of node that have to be updated
@@ -64842,7 +66582,7 @@ declare namespace ej.datavisualization {
             pageOrientation?: ej.datavisualization.Diagram.PageOrientations;
         }
 
-        export interface Options {
+        export interface ExportImageSettings {
 
             /** name of the file to be downloaded.
              */
@@ -64881,7 +66621,7 @@ declare namespace ej.datavisualization {
             pageOrientation?: ej.datavisualization.Diagram.PageOrientations;
         }
 
-        export interface Options {
+        export interface PrintSettings {
 
             /** to set the region of the diagram to be printed.
              */
@@ -64912,7 +66652,7 @@ declare namespace ej.datavisualization {
             pageOrientation?: ej.datavisualization.Diagram.PageOrientations;
         }
 
-        export interface Options {
+        export interface PrintImageSettings {
 
             /** to set the region of the diagram to be printed.
              */
@@ -65045,6 +66785,11 @@ declare namespace ej.datavisualization {
              */
             nodes?: Node[];
 
+            /** A collection of JSON objects where each object represents a layer. Layer is a named category of diagram shapes.
+             * @Default {[]}
+             */
+            layers?: Layer[];
+
             /** Binds the custom JSON data with node properties
              * @Default {null}
              */
@@ -67901,11 +69646,6 @@ declare namespace ej.datavisualization {
              */
             gradient?: NodesGradient;
 
-            /** Sets the type of the BPMN Shapes as group. Applicable, if the node is a BPMN.
-             * @Default {ej.datavisualization.Diagram.BPMNShapes}
-             */
-            group?: any;
-
             /** Defines the header of a swimlane/lane
              * @Default {{ text: Title, fontSize: 11 }}
              */
@@ -68153,6 +69893,38 @@ declare namespace ej.datavisualization {
             zOrder?: number;
         }
 
+        export interface Layer {
+
+            /** To specify the name of the diagram layer. Layer name should be unique.
+             */
+            name?: string;
+
+            /** Enable or disable diagram objects to be added to the specific layer.
+             * @Default {false}
+             */
+            active?: boolean;
+
+            /** Enable or disable the specific layer objects to be visible.
+             * @Default {true}
+             */
+            visible?: boolean;
+
+            /** Enable or disable the specific layer objects to be visible on printing or exporting.
+             * @Default {true}
+             */
+            print?: boolean;
+
+            /** Enable or disable the interaction of the specific diagram objects.
+             * @Default {false}
+             */
+            lock?: boolean;
+
+            /** To Specify the collection of the object names belongs to the layer.
+             * @Default {[]}
+             */
+            objects?: any[];
+        }
+
         export interface PageSettings {
 
             /** Defines the maximum distance to be left between the object and the scroll bar to trigger auto scrolling
@@ -69003,6 +70775,10 @@ declare namespace ej.datavisualization {
             HierarchicalTree,
             //Used to set layout type as organnizational chart
             OrganizationalChart,
+            //Used to set layout type as radial tree
+            RadialTree,
+            //Used to set layout type as symmetric layout
+            SymmetricLayout,
         }
     }
     namespace Diagram {
@@ -70442,6 +72218,18 @@ declare namespace ej.datavisualization {
             /** Fires on moving mouse outside the sparkline.
              */
             sparklineMouseLeave?(e: SparklineMouseLeaveEventArgs): void;
+
+            /** Fires, on clicking the sparkline.
+             */
+            Click?(e: ClickEventArgs): void;
+
+            /** Fires, on double clicking the sparkline.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the sparkline.
+             */
+            rightClick?(e: RightClickEventArgs): void;
         }
 
         export interface LoadEventArgs {
@@ -70628,6 +72416,51 @@ declare namespace ej.datavisualization {
             type?: string;
         }
 
+        export interface ClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sparkline model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
+        export interface DoubleClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sparkline model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sparkline model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
         export interface Border {
 
             /** Border color of the sparkline.
@@ -71079,6 +72912,18 @@ declare namespace ej.datavisualization {
             /** Fires after resetting the sunburst points
              */
             drillDownReset?(e: DrillDownResetEventArgs): void;
+
+            /** Fires, on clicking the sunburst chart.
+             */
+            Click?(e: ClickEventArgs): void;
+
+            /** Fires, on double clicking the sunburst chart.
+             */
+            doubleClick?(e: DoubleClickEventArgs): void;
+
+            /** Fires, on right clicking the sunburst chart
+             */
+            rightClick?(e: RightClickEventArgs): void;
         }
 
         export interface LoadEventArgs {
@@ -71309,6 +73154,63 @@ declare namespace ej.datavisualization {
             type?: string;
         }
 
+        export interface ClickEventArgs {
+
+            /** Includes clicked region data
+             */
+            data?: string;
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sunburst model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
+        export interface DoubleClickEventArgs {
+
+            /** Includes double clicked region data
+             */
+            data?: string;
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sunburst model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
+        export interface RightClickEventArgs {
+
+            /** Includes right clicked region data
+             */
+            data?: string;
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the sunburst model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
         export interface Border {
 
             /** Border color of the sunburst.
@@ -72175,6 +74077,9 @@ interface JQuery {
     ejDropDownList(options?: ej.DropDownList.Model): JQuery;
     ejDropDownList(memberName: any, value?: any, param?: any): any;
 
+    ejDropDownTree(options?: ej.DropDownTree.Model): JQuery;
+    ejDropDownTree(memberName: any, value?: any, param?: any): any;
+
     ejDroppable(options?: ej.Droppable.Model): JQuery;
     ejDroppable(memberName: any, value?: any, param?: any): any;
 
@@ -72386,6 +74291,7 @@ interface JQuery {
     data(key: "ejDocumentEditor"): ej.DocumentEditor;
     data(key: "ejDraggable"): ej.Draggable;
     data(key: "ejDropDownList"): ej.DropDownList;
+    data(key: "ejDropDownTree"): ej.DropDownTree;
     data(key: "ejDroppable"): ej.Droppable;
     data(key: "ejFileExplorer"): ej.FileExplorer;
     data(key: "ejGantt"): ej.Gantt;

From 03fe8a67423367edf9d99194e1239d1ce09f4068 Mon Sep 17 00:00:00 2001
From: Syncfusion-JavaScript <packages@syncfusion.com>
Date: Thu, 22 Feb 2018 15:14:24 +0530
Subject: [PATCH 200/388] Updated Typescript

---
 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 ca17e3cd5f..2f1d415175 100644
--- a/types/ej.web.all/index.d.ts
+++ b/types/ej.web.all/index.d.ts
@@ -2,7 +2,7 @@
 // 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 8d8557dddeca3422673a05d67e94879f98de7e49 Mon Sep 17 00:00:00 2001
From: Barin Britva <barinbritva@outlook.com>
Date: Thu, 22 Feb 2018 13:12:27 +0300
Subject: [PATCH 201/388] Improvements and fixes for minio.

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

diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
index e4f2a0613c..7e920428ff 100644
--- a/types/minio/index.d.ts
+++ b/types/minio/index.d.ts
@@ -10,7 +10,7 @@ import { Stream } from 'stream';
 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';
+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;
@@ -46,8 +46,7 @@ export interface BucketItemStat {
     size: number;
     contentType: string;
     etag: string;
-    // In documentation in this case string. Is it doc error?
-    lastModified: Date|string;
+    lastModified: string;
 }
 
 export interface IncompleteUploadedBucketItem {
@@ -80,14 +79,12 @@ export class Client {
     constructor(options: ClientOptions);
 
     // Bucket operations
-    makeBucket(bucketName: string, callback: NoResultCallback): void;
     makeBucket(bucketName: string, region: Region, callback: NoResultCallback): void;
-    makeBucket(bucketName: string, region?: Region): Promise<void>;
+    makeBucket(bucketName: string, region: Region): Promise<void>;
 
     listBuckets(callback: ResultCallback<BucketItemFromList[]>): void;
     listBuckets(): Promise<BucketItemFromList>;
 
-    // Doc contains error - no boolean value in result
     bucketExists(bucketName: string, callback: NoResultCallback): void;
     bucketExists(bucketName: string): Promise<void>;
 
diff --git a/types/minio/minio-tests.ts b/types/minio/minio-tests.ts
index 56e81762ce..78a7fab267 100644
--- a/types/minio/minio-tests.ts
+++ b/types/minio/minio-tests.ts
@@ -9,10 +9,9 @@ const minio = new Minio.Client({
     secretKey: 'Go1hhOkXnl',
 });
 
-minio.makeBucket('testBucket', (error: Error|null) => { console.log(error); });
 minio.makeBucket('testBucket', 'ap-southeast-2', (error: Error|null) => { console.log(error); });
-minio.makeBucket('testBucket');
 minio.makeBucket('testBucket', 'eu-west-1');
+minio.makeBucket('testBucket', 'region-not-from-list');
 
 minio.listBuckets((error: Error|null, bucketList: Minio.BucketItemFromList[]) => { console.log(error, bucketList); });
 minio.listBuckets();

From 7d7d5f676346fc37a3d33d971fab2c2b5c994560 Mon Sep 17 00:00:00 2001
From: Dona278 <davide.donadello@ericsoft.com>
Date: Thu, 22 Feb 2018 11:47:42 +0100
Subject: [PATCH 202/388] [angular-desktop-notification] Added typings

---
 .../angular-desktop-notification-tests.ts     |  40 ++++
 types/angular-desktop-notification/index.d.ts | 171 ++++++++++++++++++
 .../tsconfig.json                             |  25 +++
 .../angular-desktop-notification/tslint.json  |   7 +
 4 files changed, 243 insertions(+)
 create mode 100644 types/angular-desktop-notification/angular-desktop-notification-tests.ts
 create mode 100644 types/angular-desktop-notification/index.d.ts
 create mode 100644 types/angular-desktop-notification/tsconfig.json
 create mode 100644 types/angular-desktop-notification/tslint.json

diff --git a/types/angular-desktop-notification/angular-desktop-notification-tests.ts b/types/angular-desktop-notification/angular-desktop-notification-tests.ts
new file mode 100644
index 0000000000..0cb41b2317
--- /dev/null
+++ b/types/angular-desktop-notification/angular-desktop-notification-tests.ts
@@ -0,0 +1,40 @@
+import * as angular from 'angular';
+
+angular
+    .module('app', ['ngDesktopNotification'])
+    .config(['desktopNotificationProvider', (desktopNotificationProvider: angular.desktopNotification.IDesktopNotificationProvider) => {
+        desktopNotificationProvider.config({
+            autoClose: true,
+            duration: 5,
+            showOnPageHidden: false,
+        });
+    }])
+	.controller('AppController', ['desktopNotification', (desktopNotification: angular.desktopNotification.IDesktopNotificationService) => {
+        // Check support and permission
+        const isNotificationSupported = desktopNotification.isSupported();
+        const currentNotificationPermission = desktopNotification.currentPermission();
+
+        if (currentNotificationPermission === desktopNotification.permissions.granted) {
+            // Permission granted
+        }
+
+        // Request permission
+        desktopNotification.requestPermission().then(
+            // Permission granted
+            (permission) => {
+                // Show notification
+                desktopNotification.show(
+                    "Notification title",
+                    {
+                        tag: "tag",
+                        body: "Notification body",
+                        icon: "https://www.iconurl.com/icon-name.icon-extension",
+                        onClick: () => {
+                            // Notification clicked
+                        }
+                    });
+            },
+            () => {
+                // No permission granted
+            });
+	}]);
diff --git a/types/angular-desktop-notification/index.d.ts b/types/angular-desktop-notification/index.d.ts
new file mode 100644
index 0000000000..1f62dfb178
--- /dev/null
+++ b/types/angular-desktop-notification/index.d.ts
@@ -0,0 +1,171 @@
+// Type definitions for angular-desktop-notification 1.1
+// Project: https://github.com/jmsanpascual/angular-desktop-notification#readme
+// Definitions by: Davide Donadello <https://github.com/Dona278>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as angular from 'angular';
+
+declare var _: string;
+export = _;
+
+declare module 'angular' {
+    namespace desktopNotification {
+        /**
+         * All options available during show notification according to https://developer.mozilla.org/en-US/docs/Web/API/notification
+         */
+        interface AugmentedNotificationOptions extends NotificationOptions {
+            /**
+             * The badge property of the Notification interface returns the URL of the image used to represent the notification
+             * when there is not enough space to display the notification itself.
+             *
+             * This is an experimental technology
+             * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/badge
+             */
+            badge?: USVString;
+
+            /**
+             * The data read-only property of the Notification interface returns a structured clone of the notification's data,
+             * as specified in the data option of the Notification() constructor
+             *
+             * Note: This feature is available in Web Workers.
+             * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/data
+             */
+            data?: any;
+
+            /**
+             * The image read-only property of the Notification interface contains the URL of an image to be displayed as part of
+             * the notification, as specified in the image option of the Notification() constructor.
+             *
+             * Note: This feature is available in Web Workers.
+             * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/image
+             */
+            image?: USVString;
+
+            /**
+             * The renotify read-only property of the Notification interface specifies whether the user should be notified after a
+             * new notification replaces an old one, as specified in the renotify option of the Notification() constructor
+             *
+             * Note: This property is not currently supported in any browser.
+             * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/renotify
+             */
+            renotify?: boolean;
+
+            /**
+             * The requireInteraction read-only property of the Notification interface returns a Boolean indicating that a notification
+             * should remain active until the user clicks or dismisses it, rather than closing automatically.
+             *
+             * Note: This can be set when the notification is first created by setting the requireInteraction option to true in the
+             *       options object of the Notification.Notification() constructor.
+             * Note: This feature is available in Web Workers.
+             * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/requireInteraction
+             */
+            requireInteraction?: boolean;
+
+            /**
+             * The silent read-only property of the Notification interface specifies whether the notification should be silent, i.e. no
+             * sounds or vibrations should be issued, regardless of the device settings. This is specified in the renotify option of the
+             * Notification() constructor.
+             *
+             * Note: This feature is available in Web Workers.
+             * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/silent
+             */
+            silent?: boolean;
+
+            /**
+             * The timestamp read-only property of the Notification interface returns a DOMTimeStamp, as specified in the timestamp option of the
+             * Notification() constructor.
+             *
+             * The notification's timestamp can represent the time, in milliseconds since 00:00:00 UTC on 1 January 1970, of the event for which
+             * the notification was created, or it can be an arbitrary timestamp that you want associated with the notification. For example, a
+             * timestamp for an upcoming meeting could be set in the future, whereas a timestamp for a missed message could be set in the past.
+             *
+             * Note: This feature is available in Web Workers
+             * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/timestamp
+             */
+            timestamp?: number;
+
+            /**
+             * The title read-only property of the Notification interface indicates the title of the notification, as specified in the title parameter
+             * of the Notification() constructor.
+             *
+             * Note: This feature is available in Web Workers.
+             * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/title
+             */
+            title?: string;
+
+            /**
+             * The vibrate read-only property of the Notification interface specifies a a vibration pattern for the device's vibration hardware to emit
+             * when the notification fires. This is specified in the vibrate option of the Notification() constructor.
+             *
+             * Note: This property is not currently supported in any browser.
+             * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/vibrate
+             */
+            vibrate?: boolean;
+
+            /**
+             * The onclick property of the Notification interface specifies an event listener to receive click events.
+             * These events occur when the user clicks on a displayed Notification.
+             *
+             * The default behavior is to move the focus to the viewport of the notification's related browsing context.
+             * If you don't want that behaviour, call preventDefault() on the event object.
+             */
+            onClick?: (event: MouseEvent) => void;
+
+            /**
+             * The onerror property of the Notification interface specifies an event listener to receive error events.
+             * These events occur when something goes wrong with a Notification (in many cases an error preventing the notification from being displayed.)
+             *
+             * A function which serves as the event handler for the error event. When an error occurs, the specified function will be called.
+             * If null, no error handler is in effect.
+             */
+            onError?: EventListener;
+        }
+
+        interface IDesktopNotificationOptions {
+            autoClose?: boolean;
+            duration?: number;
+            showOnPageHidden?: boolean;
+        }
+
+        interface IDesktopNotificationProvider {
+            /**
+             * Set the default app-wide configuration for desktopNotification
+             */
+            config(options: IDesktopNotificationOptions): void;
+        }
+
+        interface IDesktopNotificationService {
+            permissions: {
+                default: 'default',
+                denied: 'denied',
+                granted: 'granted',
+            };
+
+            /**
+             * This method returns true if the browser supports the Notification API, false otherwise
+             */
+            isSupported(): boolean;
+
+            /**
+             * This method will get the current permission set in the browser which could be one of the ff.
+             * - desktopNotification.permissions.default
+             * - desktopNotification.permissions.denied
+             * - desktopNotification.permissions.granted
+             */
+            currentPermission(): NotificationPermission;
+
+            /**
+             * This method returns a $q promise, if the user allowed the notification the successCallback will be executed,
+             * errorCallback will be executed otherwise
+             */
+            requestPermission(): IPromise<NotificationPermission>;
+
+            /**
+             * This method will display the notification using the parameter values.
+             * See all available options here at https://developer.mozilla.org/en-US/docs/Web/API/notification#Instance_properties
+             */
+            show(title: string, options?: NotificationOptions | AugmentedNotificationOptions): void;
+        }
+    }
+}
diff --git a/types/angular-desktop-notification/tsconfig.json b/types/angular-desktop-notification/tsconfig.json
new file mode 100644
index 0000000000..4398df5f25
--- /dev/null
+++ b/types/angular-desktop-notification/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",
+        "angular-desktop-notification-tests.ts"
+    ]
+}
diff --git a/types/angular-desktop-notification/tslint.json b/types/angular-desktop-notification/tslint.json
new file mode 100644
index 0000000000..63913ca3f0
--- /dev/null
+++ b/types/angular-desktop-notification/tslint.json
@@ -0,0 +1,7 @@
+{ 
+    "extends": "dtslint/dt.json" ,
+    "rules": {
+        "interface-name": false,
+        "max-line-length": false
+    }
+}

From c434953125d3122f3229cc4b7fca7377d5786e00 Mon Sep 17 00:00:00 2001
From: Will Boyce <me@willboyce.com>
Date: Thu, 22 Feb 2018 11:22:03 +0000
Subject: [PATCH 203/388] generic-pool should use PromiseLike, not Promise

---
 types/generic-pool/index.d.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/types/generic-pool/index.d.ts b/types/generic-pool/index.d.ts
index 7f7830f6b1..00f8852823 100644
--- a/types/generic-pool/index.d.ts
+++ b/types/generic-pool/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for generic-pool 3.1
 // Project: https://github.com/coopernurse/node-pool#readme
 // Definitions by: Jerray Fu <https://github.com/jerray>
+//                 Will Boyce <https://github.com/wrboyce>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -16,17 +17,17 @@ export class Pool<T> extends EventEmitter {
     max: number;
     min: number;
 
-    acquire(priority?: number): Promise<T>;
+    acquire(priority?: number): PromiseLike<T>;
     release(resource: T): void;
     destroy(resource: T): void;
-    drain(): Promise<undefined>;
-    clear(): Promise<undefined[]>;
+    drain(): PromiseLike<undefined>;
+    clear(): PromiseLike<undefined[]>;
 }
 
 export interface Factory<T> {
-    create(): Promise<T>;
-    destroy(client: T): Promise<undefined>;
-    validate?(client: T): Promise<boolean>;
+    create(): PromiseLike<T>;
+    destroy(client: T): PromiseLike<undefined>;
+    validate?(client: T): PromiseLike<boolean>;
 }
 
 export interface Options {

From f3ec46fbc607386ddd72a282bcc69e01cdda5786 Mon Sep 17 00:00:00 2001
From: Will Boyce <me@willboyce.com>
Date: Thu, 22 Feb 2018 11:25:08 +0000
Subject: [PATCH 204/388] forever-monitor.Options.env should use
 NodeJS.ProcessEnv

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

diff --git a/types/forever-monitor/index.d.ts b/types/forever-monitor/index.d.ts
index caa921fa1a..c9de58e7cc 100644
--- a/types/forever-monitor/index.d.ts
+++ b/types/forever-monitor/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for forever-monitor 1.7
 // Project: https://github.com/nodejitsu/forever-monitor#readme
 // Definitions by: Shun Takahashi <https://github.com/shuntksh>
+//                 Will Boyce <https://github.com/wrboyce>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference types="node" />
 
@@ -27,7 +28,7 @@ export interface Options {
     watchIgnorePatters?: string[];
     watchDirectory?: string;
     spawnWith?: SpawnWith;
-    env?: { [envKey: string]: string; };
+    env?: NodeJS.ProcessEnv;
     cwd?: string;
     logFile?: string;
     outFile?: string;

From dfee6fc675d48329ee3bed965dcff74bbd8a6aa2 Mon Sep 17 00:00:00 2001
From: taoqf <tao_qiufeng@126.com>
Date: Thu, 22 Feb 2018 20:38:31 +0800
Subject: [PATCH 205/388] add types see
 https://github.com/jsreport/jsreport-core/pull/26

---
 types/jsreport-core/index.d.ts                | 140 ++++++++++--------
 types/jsreport-html-to-xlsx/index.d.ts        |  24 +++
 .../jsreport-html-to-xlsx-tests.ts            |  19 +++
 types/jsreport-html-to-xlsx/tsconfig.json     |  23 +++
 types/jsreport-html-to-xlsx/tslint.json       |   1 +
 types/jsreport-jsrender/index.d.ts            |  17 +++
 .../jsreport-jsrender-tests.ts                |  37 +++++
 types/jsreport-jsrender/tsconfig.json         |  23 +++
 types/jsreport-jsrender/tslint.json           |   1 +
 types/jsreport-phantom-pdf/index.d.ts         |  62 ++++++++
 .../jsreport-phantom-pdf-tests.ts             |  37 +++++
 types/jsreport-phantom-pdf/tsconfig.json      |  23 +++
 types/jsreport-phantom-pdf/tslint.json        |   1 +
 types/jsreport-xlsx/index.d.ts                |  29 ++++
 types/jsreport-xlsx/jsreport-xlsx-tests.ts    |  19 +++
 types/jsreport-xlsx/tsconfig.json             |  23 +++
 types/jsreport-xlsx/tslint.json               |   1 +
 17 files changed, 416 insertions(+), 64 deletions(-)
 create mode 100644 types/jsreport-html-to-xlsx/index.d.ts
 create mode 100644 types/jsreport-html-to-xlsx/jsreport-html-to-xlsx-tests.ts
 create mode 100644 types/jsreport-html-to-xlsx/tsconfig.json
 create mode 100644 types/jsreport-html-to-xlsx/tslint.json
 create mode 100644 types/jsreport-jsrender/index.d.ts
 create mode 100644 types/jsreport-jsrender/jsreport-jsrender-tests.ts
 create mode 100644 types/jsreport-jsrender/tsconfig.json
 create mode 100644 types/jsreport-jsrender/tslint.json
 create mode 100644 types/jsreport-phantom-pdf/index.d.ts
 create mode 100644 types/jsreport-phantom-pdf/jsreport-phantom-pdf-tests.ts
 create mode 100644 types/jsreport-phantom-pdf/tsconfig.json
 create mode 100644 types/jsreport-phantom-pdf/tslint.json
 create mode 100644 types/jsreport-xlsx/index.d.ts
 create mode 100644 types/jsreport-xlsx/jsreport-xlsx-tests.ts
 create mode 100644 types/jsreport-xlsx/tsconfig.json
 create mode 100644 types/jsreport-xlsx/tslint.json

diff --git a/types/jsreport-core/index.d.ts b/types/jsreport-core/index.d.ts
index 23413889da..ab0fe38a02 100644
--- a/types/jsreport-core/index.d.ts
+++ b/types/jsreport-core/index.d.ts
@@ -5,92 +5,104 @@
 // TypeScript Version: 2.3
 
 /// <reference types="node" />
-import { Buffer } from 'buffer';
-import { Readable } from 'stream';
 
 declare namespace JsReport {
-	type helpers = string | { [fun: string]: (...args: any[]) => any };
+	type Helpers = string | { [fun: string]: (...args: any[]) => any };
 
-	interface RenderOptions {
-		template: {
-			content: string;
-			engine: 'jsrender' | 'handlebars' | 'ejs' | 'jade' | string;
-			helpers?: helpers;
-			recipe: 'phantom-pdf' | 'electron-pdf' | 'text' | 'xlsx' | 'html-to-xlsx' | 'phantom-image' | 'html-to-text' | 'fop-pdf' | 'client-html' | 'wrapped-html' | 'wkhtmltopdf' | string;
-		};
-		data?: any;
+	type Engine = "none";
+
+	type Recipe = "html";
+
+	interface Template {
+		content: string;
+		engine: Engine | string;
+		helpers: Helpers;
+		recipe: Recipe | string;
 	}
 
-	interface Report {
+	interface Request {
+		template: Partial<Template>;
+		options: object;
+		data: any;
+	}
+
+	interface Response {
 		content: Buffer;
-		stream: Readable;
+		stream: NodeJS.ReadableStream;
 		headers: {
 			[header: string]: string | number | boolean;
 		};
 	}
 
-	interface Request {
-		template: {
-			content: string;
-		};
-	}
-
-	// interface Response {
-	// 	// todo
-	// }
-
-	type Response = any;
-
-	interface Listener {
-		add(type: string, callback: (req: Request, res: Response, err: any) => void): void;
-	}
-
-	interface Logger {
-		add(logger: any, options?: {
-			level: 'debug' | 'info' | 'log' | 'warn' | 'error';
-		}): void;
+	interface ListenerCollection {
+		add(
+			type: string,
+			callback: (req: Request, res: Response, err?: any) => Promise<any> | void
+		): void;
 	}
 
 	interface Collection {
-		find(query: {
-			[field: string]: any;
-		}): Promise<any>;
+		find(query: { [field: string]: any }): Promise<object[]>;
+		update(query: { [field: string]: any }, update: object, options?: object): Promise<any>;
+		remove(query: { [field: string]: any }): Promise<any>;
+		insert(obj: object): Promise<object>;
 	}
 
 	interface DocumentStore {
-		collection(options: string): Collection;
+		collection(name: string): Collection;
 	}
 
-	interface JsReporter {
-		afterRenderListeners: Listener;
-		afterTemplatingEnginesExecutedListeners: Listener;
-		beforeRenderListeners: Listener;
+	type Extension = (reporter: Reporter, definition: object) => void;
+
+	interface ExtensionDefinition {
+		options: any;
+		main: any;
+		directory: string;
+	}
+
+	interface Reporter {
+		use(extension: Extension | ExtensionDefinition): Reporter;
+	}
+
+	interface Reporter {
+		afterRenderListeners: ListenerCollection;
+		afterTemplatingEnginesExecutedListeners: ListenerCollection;
+		beforeRenderListeners: ListenerCollection;
 		documentStore: DocumentStore;
-		initializeListeners: Listener;
-		logger: Logger;
-		validateRenderListeners: Listener;
-		init(): Promise<void>;
-		render(options: RenderOptions): Promise<Report>;
-		use(extension: any): any;
+		initializeListeners: ListenerCollection;
+		// it would be nice to add winston.LoggerInstance here
+		// however adding import winston = require('winston') breaks exported enums
+		logger: any;
+		validateRenderListeners: ListenerCollection;
+		version: string;
+		init(): Promise<Reporter>;
+		render(options: Partial<Request>): Promise<Response>;
+		discover(): Reporter;
+		createListenerCollection(): ListenerCollection;
+	}
+
+	interface Configuration {
+		autoTempCleanup: boolean;
+		dataDirectory: string;
+		extensionsLocationCache: boolean;
+		loadConfig: boolean;
+		logger: {
+			silent: boolean;
+		};
+		rootDirectory: string;
+		scripts: {
+			allowedModules: string[];
+		};
+		tasks: Partial<{
+			allowedModules: string[] | string;
+			strategy: "dedicated-process" | "http-server" | "in-process" | string;
+		}>;
+		tempDirectory: string;
 	}
 }
 
-declare function JsReport(options?: Partial<{
-	autoTempCleanup: boolean;
-	dataDirectory: string;
-	extensionsLocationCache: boolean;
-	loadConfig: boolean;
-	logger: {
-		silent: boolean;
-	};
-	rootDirectory: string;
-	scripts: {
-		allowedModules: string[];
-	};
-	tasks: {
-		[task: string]: any;
-	};
-	tempDirectory: string;
-}>): JsReport.JsReporter;
+declare function JsReport(
+	config?: Partial<JsReport.Configuration>
+): JsReport.Reporter;
 
 export = JsReport;
diff --git a/types/jsreport-html-to-xlsx/index.d.ts b/types/jsreport-html-to-xlsx/index.d.ts
new file mode 100644
index 0000000000..84b37480aa
--- /dev/null
+++ b/types/jsreport-html-to-xlsx/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for jsreport-html-to-xlsx 1.4
+// Project: https://github.com/jsreport/jsreport-html-to-xlsx
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ExtensionDefinition } from 'jsreport-core';
+import { Options as BaseOptions } from 'jsreport-xlsx';
+
+declare module 'jsreport-core' {
+	interface Template {
+		recipe: 'html-to-xlsx' | string;
+	}
+}
+
+declare namespace JsReportHtml2Xlsx {
+	interface Options extends BaseOptions {
+		strategy: string;
+	}
+}
+
+declare function JsReportHtml2Xlsx(options?: Partial<JsReportHtml2Xlsx.Options>): ExtensionDefinition;
+
+export = JsReportHtml2Xlsx;
diff --git a/types/jsreport-html-to-xlsx/jsreport-html-to-xlsx-tests.ts b/types/jsreport-html-to-xlsx/jsreport-html-to-xlsx-tests.ts
new file mode 100644
index 0000000000..9540cf7929
--- /dev/null
+++ b/types/jsreport-html-to-xlsx/jsreport-html-to-xlsx-tests.ts
@@ -0,0 +1,19 @@
+import JsReport = require('jsreport-core');
+import JsreportHtml2Xlsx = require('jsreport-html-to-xlsx');
+import JsreportXlsx = require('jsreport-xlsx');
+
+const jsreport = JsReport();
+jsreport.use(JsreportXlsx());
+jsreport.use(JsreportHtml2Xlsx());
+
+(async () => {
+	const content = `<table><tr><td>test</td></tr></table>`;
+	await jsreport.init();
+	const resp = await jsreport.render({
+		template: {
+			content,
+			engine: 'none',
+			recipe: 'xlsx'
+		}
+	});
+})();
diff --git a/types/jsreport-html-to-xlsx/tsconfig.json b/types/jsreport-html-to-xlsx/tsconfig.json
new file mode 100644
index 0000000000..c62e686b02
--- /dev/null
+++ b/types/jsreport-html-to-xlsx/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "esnext"
+        ],
+        "strictFunctionTypes": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsreport-html-to-xlsx-tests.ts"
+    ]
+}
diff --git a/types/jsreport-html-to-xlsx/tslint.json b/types/jsreport-html-to-xlsx/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jsreport-html-to-xlsx/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jsreport-jsrender/index.d.ts b/types/jsreport-jsrender/index.d.ts
new file mode 100644
index 0000000000..3b42556c53
--- /dev/null
+++ b/types/jsreport-jsrender/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for jsreport-jsrender 1.0
+// Project: https://github.com/jsreport/jsreport-jsrender
+// Definitions by: taoqf <https://github.com/taoqf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ExtensionDefinition } from 'jsreport-core';
+
+declare module 'jsreport-core' {
+	interface Template {
+		engine: 'jsrender' | string;
+	}
+}
+
+declare function JsReportJsrender(): ExtensionDefinition;
+
+export = JsReportJsrender;
diff --git a/types/jsreport-jsrender/jsreport-jsrender-tests.ts b/types/jsreport-jsrender/jsreport-jsrender-tests.ts
new file mode 100644
index 0000000000..520af3683a
--- /dev/null
+++ b/types/jsreport-jsrender/jsreport-jsrender-tests.ts
@@ -0,0 +1,37 @@
+import JsReport = require("jsreport-core");
+import JsReportPhantomPdf = require("jsreport-phantom-pdf");
+import JsRender = require("jsreport-jsrender");
+import fs = require('fs');
+
+const jsreport = JsReport({
+	tasks: {
+		strategy: "http-server"
+	}
+});
+
+jsreport.beforeRenderListeners.add('test', (req, res) => {
+	console.log('input', req.template.content);
+});
+
+jsreport.use(JsReportPhantomPdf());
+jsreport.use(JsRender());
+
+(async () => {
+	await jsreport.init();
+	await jsreport.documentStore.collection('settings').update({}, { $set: { foo: 1 } });
+	const res = await jsreport.render({
+		template: {
+			content: "<h1>{{:foo}}</h1>",
+			engine: 'jsrender',
+			recipe: 'phantom-pdf',
+			phantom: {
+				header: 'header',
+				headerHeight: '5cm',
+				orientation: 'landscape'
+			}
+		},
+		data: { foo: "hello2" }
+	});
+	fs.writeFileSync('./types/test/test.pdf', res.content);
+	process.exit(0);
+})();
diff --git a/types/jsreport-jsrender/tsconfig.json b/types/jsreport-jsrender/tsconfig.json
new file mode 100644
index 0000000000..3ba91c9b31
--- /dev/null
+++ b/types/jsreport-jsrender/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "esnext"
+        ],
+        "strictFunctionTypes": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsreport-jsrender-tests.ts"
+    ]
+}
diff --git a/types/jsreport-jsrender/tslint.json b/types/jsreport-jsrender/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jsreport-jsrender/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jsreport-phantom-pdf/index.d.ts b/types/jsreport-phantom-pdf/index.d.ts
new file mode 100644
index 0000000000..233a74c707
--- /dev/null
+++ b/types/jsreport-phantom-pdf/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for jsreport-phantom-pdf 1.4
+// Project: https://github.com/jsreport/jsreport-phantom-pdf
+// Definitions by: taoqf <https://github.com/taoqf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ExtensionDefinition } from 'jsreport-core';
+
+declare module 'jsreport-core' {
+	interface Template {
+		phantom?: Partial<JsReportPhantomPdf.Phantom>;
+		recipe: 'phantom-pdf' | string;
+	}
+}
+
+declare namespace JsReportPhantomPdf {
+	interface Margin {
+		left: number | string;
+		right: number | string;
+		top: number | string;
+		bottom: number | string;
+	}
+
+	interface Phantom {
+		margin: string | Margin;
+		header: string;
+		footer: string;
+		width: string;
+		height: string;
+		headerHeight: string;
+		footerHeight: string;
+		format: string;
+		orientation: 'portrait' | 'landscape';
+		blockJavaScript: boolean;
+		resourceTimeout: number;
+		waitForJS: boolean;
+		fitToPage: boolean;
+		customPhantomJS: boolean;
+		phantomjsVersion: string;
+	}
+
+	// const enum PhantomStrategy {
+	//   dedicatedProcess = 'dedicated-process',
+	//   phantomServer = 'phantom-server'
+	// }
+
+	interface Options {
+		allowLocalFilesAccess: boolean;
+		// appDirectory: string;
+		defaultPhantomjsVersion: string;
+		strategy: 'dedicated-process' | 'phantom-server';
+		timeout: number;
+	}
+
+	// without exporting enum, it doesn't include the require('jsreport-core') in the test.js for some reason
+	// help welcome
+	// export enum Foo { }
+}
+
+declare function JsReportPhantomPdf(options?: Partial<JsReportPhantomPdf.Options>): ExtensionDefinition;
+
+export = JsReportPhantomPdf;
diff --git a/types/jsreport-phantom-pdf/jsreport-phantom-pdf-tests.ts b/types/jsreport-phantom-pdf/jsreport-phantom-pdf-tests.ts
new file mode 100644
index 0000000000..520af3683a
--- /dev/null
+++ b/types/jsreport-phantom-pdf/jsreport-phantom-pdf-tests.ts
@@ -0,0 +1,37 @@
+import JsReport = require("jsreport-core");
+import JsReportPhantomPdf = require("jsreport-phantom-pdf");
+import JsRender = require("jsreport-jsrender");
+import fs = require('fs');
+
+const jsreport = JsReport({
+	tasks: {
+		strategy: "http-server"
+	}
+});
+
+jsreport.beforeRenderListeners.add('test', (req, res) => {
+	console.log('input', req.template.content);
+});
+
+jsreport.use(JsReportPhantomPdf());
+jsreport.use(JsRender());
+
+(async () => {
+	await jsreport.init();
+	await jsreport.documentStore.collection('settings').update({}, { $set: { foo: 1 } });
+	const res = await jsreport.render({
+		template: {
+			content: "<h1>{{:foo}}</h1>",
+			engine: 'jsrender',
+			recipe: 'phantom-pdf',
+			phantom: {
+				header: 'header',
+				headerHeight: '5cm',
+				orientation: 'landscape'
+			}
+		},
+		data: { foo: "hello2" }
+	});
+	fs.writeFileSync('./types/test/test.pdf', res.content);
+	process.exit(0);
+})();
diff --git a/types/jsreport-phantom-pdf/tsconfig.json b/types/jsreport-phantom-pdf/tsconfig.json
new file mode 100644
index 0000000000..fd5b72f5f1
--- /dev/null
+++ b/types/jsreport-phantom-pdf/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "esnext"
+        ],
+        "strictFunctionTypes": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsreport-phantom-pdf-tests.ts"
+    ]
+}
diff --git a/types/jsreport-phantom-pdf/tslint.json b/types/jsreport-phantom-pdf/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jsreport-phantom-pdf/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jsreport-xlsx/index.d.ts b/types/jsreport-xlsx/index.d.ts
new file mode 100644
index 0000000000..de415b6c12
--- /dev/null
+++ b/types/jsreport-xlsx/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for jsreport-xlsx 1.4
+// Project: https://github.com/jsreport/jsreport-xlsx
+// Definitions by: taoqf <https://github.com/taoqf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ExtensionDefinition } from 'jsreport-core';
+
+declare module 'jsreport-core' {
+	interface Template {
+		recipe: 'xlsx' | string;
+	}
+}
+
+declare namespace JsReportXlsx {
+	interface Xlsx {
+		shortid: string;
+	}
+
+	interface Options {
+		addBufferSize: number;
+		escapeAmp: boolean;
+		numberOfParsedAddIterations: number;
+	}
+}
+
+declare function JsReportXlsx(options?: Partial<JsReportXlsx.Options>): ExtensionDefinition;
+
+export = JsReportXlsx;
diff --git a/types/jsreport-xlsx/jsreport-xlsx-tests.ts b/types/jsreport-xlsx/jsreport-xlsx-tests.ts
new file mode 100644
index 0000000000..9540cf7929
--- /dev/null
+++ b/types/jsreport-xlsx/jsreport-xlsx-tests.ts
@@ -0,0 +1,19 @@
+import JsReport = require('jsreport-core');
+import JsreportHtml2Xlsx = require('jsreport-html-to-xlsx');
+import JsreportXlsx = require('jsreport-xlsx');
+
+const jsreport = JsReport();
+jsreport.use(JsreportXlsx());
+jsreport.use(JsreportHtml2Xlsx());
+
+(async () => {
+	const content = `<table><tr><td>test</td></tr></table>`;
+	await jsreport.init();
+	const resp = await jsreport.render({
+		template: {
+			content,
+			engine: 'none',
+			recipe: 'xlsx'
+		}
+	});
+})();
diff --git a/types/jsreport-xlsx/tsconfig.json b/types/jsreport-xlsx/tsconfig.json
new file mode 100644
index 0000000000..641b309859
--- /dev/null
+++ b/types/jsreport-xlsx/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "esnext"
+        ],
+        "strictFunctionTypes": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsreport-xlsx-tests.ts"
+    ]
+}
diff --git a/types/jsreport-xlsx/tslint.json b/types/jsreport-xlsx/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jsreport-xlsx/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d44c90df2da16a2dd99a71e202719daa10f23bd3 Mon Sep 17 00:00:00 2001
From: Huw Martin <huwmartin@deloitte.co.uk>
Date: Thu, 22 Feb 2018 13:31:12 +0000
Subject: [PATCH 206/388] [redux-form] typing for version 7.2

Add clearFields action;
update Validator type to accept optional name argument;
update FieldArray meta props to type `any`;
add shouldError and shouldWarn config props to reduxForm;
add getFormError selector
---
 types/redux-form/index.d.ts           | 3 ++-
 types/redux-form/lib/Field.d.ts       | 2 +-
 types/redux-form/lib/FieldArray.d.ts  | 4 ++--
 types/redux-form/lib/actionTypes.d.ts | 1 +
 types/redux-form/lib/actions.d.ts     | 2 ++
 types/redux-form/lib/reduxForm.d.ts   | 2 ++
 types/redux-form/lib/selectors.d.ts   | 1 +
 7 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 25d342c8c2..3ecfe65cd4 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for redux-form 7.0
+// Type definitions for redux-form 7.2
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Carson Full <https://github.com/carsonf>
 //                 Daniel Lytkin <https://github.com/aikoven>
@@ -6,6 +6,7 @@
 //                 Luka Zakrajsek <https://github.com/bancek>
 //                 Alex Young <https://github.com/alsiola>
 //                 Anton Novik <https://github.com/tehbi4>
+//                 Huw Martin <https://github.com/huwmartin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index aa3036b713..7a3c11af3f 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -14,7 +14,7 @@ import { Dispatch } from "redux";
 export type Normalizer = (value: any, previousValue?: any, allValues?: any, previousAllValues?: any) => any;
 export type Formatter = (value: any, name: string) => any;
 export type Parser = (value: any, name: string) => any;
-export type Validator = (value: any, allValues?: any, props?: any) => any;
+export type Validator = (value: any, allValues?: any, props?: any, name?: any) => any;
 
 export type EventHandler<Event> = (event: Event) => void;
 export type EventWithDataHandler<Event> = (event?: Event, newValue?: any, previousValue?: any) => void;
diff --git a/types/redux-form/lib/FieldArray.d.ts b/types/redux-form/lib/FieldArray.d.ts
index 7dd9564472..44ca7806ca 100644
--- a/types/redux-form/lib/FieldArray.d.ts
+++ b/types/redux-form/lib/FieldArray.d.ts
@@ -47,11 +47,11 @@ interface FieldsProps<FieldValue> {
 
 interface FieldArrayMetaProps {
     dirty: boolean;
-    error?: string;
+    error?: any;
     form: string;
     invalid: boolean;
     pristine: boolean;
     submitting: boolean;
     valid: boolean;
-    warning?: string;
+    warning?: any;
 }
diff --git a/types/redux-form/lib/actionTypes.d.ts b/types/redux-form/lib/actionTypes.d.ts
index ce1ba5d208..ac0256456c 100644
--- a/types/redux-form/lib/actionTypes.d.ts
+++ b/types/redux-form/lib/actionTypes.d.ts
@@ -15,6 +15,7 @@ export interface ActionTypes {
     CLEAR_SUBMIT: string;
     CLEAR_SUBMIT_ERRORS: string;
     CLEAR_ASYNC_ERROR: string;
+    CLEAR_FIELDS: string;
     DESTROY: string;
     FOCUS: string;
     INITIALIZE: string;
diff --git a/types/redux-form/lib/actions.d.ts b/types/redux-form/lib/actions.d.ts
index 7918b94350..80fbc3a234 100644
--- a/types/redux-form/lib/actions.d.ts
+++ b/types/redux-form/lib/actions.d.ts
@@ -41,6 +41,7 @@ export declare function submit(form: string): FormAction;
 export declare function clearSubmit(form: string): FormAction;
 export declare function clearSubmitErrors(form: string): FormAction;
 export declare function clearAsyncError(form: string, field: string): FormAction;
+export declare function clearFields(form: string, keepTouched: boolean, persistentSubmitErrors: boolean, ...fields: string[]): FormAction;
 export declare function touch(form: string, ...fields: string[]): FormAction;
 export declare function unregisterField(form: string, name: string): FormAction;
 export declare function untouch(form: string, ...fields: string[]): FormAction;
@@ -64,6 +65,7 @@ declare const actions: {
     clearSubmit: typeof clearSubmit,
     clearSubmitErrors: typeof clearSubmitErrors,
     clearAsyncError: typeof clearAsyncError,
+    clearFields: typeof clearFields,
     destroy: typeof destroy,
     focus: typeof focus,
     initialize: typeof initialize,
diff --git a/types/redux-form/lib/reduxForm.d.ts b/types/redux-form/lib/reduxForm.d.ts
index 5989e248cc..2c6dd40c5d 100644
--- a/types/redux-form/lib/reduxForm.d.ts
+++ b/types/redux-form/lib/reduxForm.d.ts
@@ -116,6 +116,8 @@ export interface ConfigProps<FormData = {}, P = {}> {
     propNamespace?: string;
     pure?: boolean;
     shouldValidate?(params: ValidateCallback<FormData, P>): boolean;
+    shouldError?(params: ValidateCallback<FormData, P>): boolean;
+    shouldWarn?(params: ValidateCallback<FormData, P>): boolean;
     shouldAsyncValidate?(params: AsyncValidateCallback<FormData>): boolean;
     touchOnBlur?: boolean;
     touchOnChange?: boolean;
diff --git a/types/redux-form/lib/selectors.d.ts b/types/redux-form/lib/selectors.d.ts
index ee79f4b137..4d224b5b82 100644
--- a/types/redux-form/lib/selectors.d.ts
+++ b/types/redux-form/lib/selectors.d.ts
@@ -11,6 +11,7 @@ export const getFormMeta: DataSelector;
 export const getFormAsyncErrors: ErrorSelector;
 export const getFormSyncWarnings: ErrorSelector;
 export const getFormSubmitErrors: ErrorSelector;
+export const getFormError: ErrorSelector;
 export function getFormNames(state: any): string[];
 export const isDirty: BooleanSelector;
 export const isPristine: BooleanSelector;

From 2056f990d016a06e312b741ec7295adfc0da1ebd Mon Sep 17 00:00:00 2001
From: Justin Simms <526791+jhsimms@users.noreply.github.com>
Date: Thu, 22 Feb 2018 09:06:11 -0600
Subject: [PATCH 207/388] Fix issues identified with the Hapi 17 update
 (#23691)

* Fix issues identified with the Hapi 17 update

This commit introduces a variety of changes, primarily fixes, but it
also collapses the typings into a single file.  Collapsing it into a
single file means simpler augmentation of types, which is common in
Hapi.

Thank you to SimonSchick for contributing a number of changes here.

* fix response property
---
 types/h2o2/tsconfig.json                      |    2 +-
 .../hapi-auth-basic/hapi-auth-basic-tests.ts  |    2 +-
 .../definitions/plugin/plugin-registered.d.ts |   32 -
 types/hapi/definitions/plugin/plugin.d.ts     |   58 -
 .../definitions/request/request-auth.d.ts     |   34 -
 .../definitions/request/request-events.d.ts   |   45 -
 .../definitions/request/request-info.d.ts     |   41 -
 .../definitions/request/request-route.d.ts    |   45 -
 types/hapi/definitions/request/request.d.ts   |  224 -
 .../definitions/response/response-events.d.ts |   29 -
 .../definitions/response/response-object.d.ts |  288 --
 .../response/response-settings.d.ts           |   33 -
 .../response/response-toolkit.d.ts            |  139 -
 .../route/route-options-access.d.ts           |   82 -
 .../route/route-options-cache.d.ts            |   27 -
 .../definitions/route/route-options-cors.d.ts |   42 -
 .../route/route-options-payload.d.ts          |  122 -
 .../definitions/route/route-options-pre.d.ts  |   33 -
 .../route/route-options-response.d.ts         |   76 -
 .../route/route-options-secure.d.ts           |   74 -
 .../route/route-options-validate.d.ts         |   92 -
 .../hapi/definitions/route/route-options.d.ts |  284 --
 .../server/server-auth-scheme.d.ts            |   74 -
 .../hapi/definitions/server/server-auth.d.ts  |   82 -
 .../hapi/definitions/server/server-cache.d.ts |   42 -
 .../definitions/server/server-events.d.ts     |  146 -
 types/hapi/definitions/server/server-ext.d.ts |  146 -
 .../hapi/definitions/server/server-info.d.ts  |   55 -
 .../definitions/server/server-inject.d.ts     |   71 -
 .../definitions/server/server-method.d.ts     |   64 -
 .../server/server-options-cache.d.ts          |   25 -
 .../definitions/server/server-options.d.ts    |  186 -
 .../hapi/definitions/server/server-realm.d.ts |   35 -
 .../definitions/server/server-register.d.ts   |   62 -
 .../hapi/definitions/server/server-route.d.ts |   55 -
 .../server/server-state-options.d.ts          |   63 -
 .../hapi/definitions/server/server-state.d.ts |   67 -
 types/hapi/definitions/server/server.d.ts     |  563 ---
 types/hapi/definitions/util/common.d.ts       |    8 -
 types/hapi/definitions/util/json.d.ts         |   27 -
 types/hapi/definitions/util/lifecycle.d.ts    |   59 -
 types/hapi/definitions/util/util.d.ts         |    8 -
 types/hapi/index.d.ts                         | 3907 ++++++++++++++++-
 types/hapi/test/request/catch-all.ts          |    5 +-
 types/hapi/test/request/event-types.ts        |   10 +-
 types/hapi/test/request/get-log.ts            |    2 +-
 types/hapi/test/request/parameters.ts         |    4 +-
 types/hapi/test/request/query.ts              |    2 +-
 types/hapi/test/response/continue.ts          |    4 +-
 types/hapi/test/response/error.ts             |    4 +-
 types/hapi/test/response/redirect.ts          |    2 +-
 types/hapi/test/response/response-events.ts   |    8 +-
 types/hapi/test/response/response.ts          |    4 +-
 types/hapi/test/route/adding-routes.ts        |    6 +-
 types/hapi/test/route/config.ts               |    6 +-
 types/hapi/test/route/ext.ts                  |   15 +
 types/hapi/test/route/handler.ts              |    4 +-
 types/hapi/test/route/route-options-pre.ts    |   12 +-
 types/hapi/test/route/route-options.ts        |   17 +-
 types/hapi/test/route/validation.ts           |    8 +-
 types/hapi/test/server/server-app.ts          |    2 +-
 types/hapi/test/server/server-auth-api.ts     |    4 +-
 types/hapi/test/server/server-auth-default.ts |   14 +-
 types/hapi/test/server/server-auth-test.ts    |    4 +-
 types/hapi/test/server/server-bind.ts         |    6 +-
 types/hapi/test/server/server-decorations.ts  |  106 +-
 types/hapi/test/server/server-events-once.ts  |   13 +-
 types/hapi/test/server/server-events.ts       |   15 +-
 types/hapi/test/server/server-expose.ts       |    4 +-
 types/hapi/test/server/server-inject.ts       |    2 +-
 types/hapi/test/server/server-lookup.ts       |    2 +-
 types/hapi/test/server/server-match.ts        |    2 +-
 types/hapi/test/server/server-path.ts         |    7 +
 types/hapi/test/server/server-state.ts        |    2 +-
 types/hapi/test/server/server-table.ts        |    2 +-
 types/hapi/tsconfig.json                      |    3 +-
 .../v16/test/response/error-representation.ts |   10 -
 types/hapi/v16/tsconfig.json                  |    2 +-
 types/nes/index.d.ts                          |    4 +-
 types/nes/test/nes-tests.ts                   |    6 +-
 types/nes/test/route-authentication-server.ts |    4 +-
 types/nes/test/route-invocation-server.ts     |    2 +-
 types/vision/index.d.ts                       |   22 +-
 types/yar/index.d.ts                          |    2 +-
 84 files changed, 4103 insertions(+), 3799 deletions(-)
 delete mode 100644 types/hapi/definitions/plugin/plugin-registered.d.ts
 delete mode 100644 types/hapi/definitions/plugin/plugin.d.ts
 delete mode 100644 types/hapi/definitions/request/request-auth.d.ts
 delete mode 100644 types/hapi/definitions/request/request-events.d.ts
 delete mode 100644 types/hapi/definitions/request/request-info.d.ts
 delete mode 100644 types/hapi/definitions/request/request-route.d.ts
 delete mode 100644 types/hapi/definitions/request/request.d.ts
 delete mode 100644 types/hapi/definitions/response/response-events.d.ts
 delete mode 100644 types/hapi/definitions/response/response-object.d.ts
 delete mode 100644 types/hapi/definitions/response/response-settings.d.ts
 delete mode 100644 types/hapi/definitions/response/response-toolkit.d.ts
 delete mode 100644 types/hapi/definitions/route/route-options-access.d.ts
 delete mode 100644 types/hapi/definitions/route/route-options-cache.d.ts
 delete mode 100644 types/hapi/definitions/route/route-options-cors.d.ts
 delete mode 100644 types/hapi/definitions/route/route-options-payload.d.ts
 delete mode 100644 types/hapi/definitions/route/route-options-pre.d.ts
 delete mode 100644 types/hapi/definitions/route/route-options-response.d.ts
 delete mode 100644 types/hapi/definitions/route/route-options-secure.d.ts
 delete mode 100644 types/hapi/definitions/route/route-options-validate.d.ts
 delete mode 100644 types/hapi/definitions/route/route-options.d.ts
 delete mode 100644 types/hapi/definitions/server/server-auth-scheme.d.ts
 delete mode 100644 types/hapi/definitions/server/server-auth.d.ts
 delete mode 100644 types/hapi/definitions/server/server-cache.d.ts
 delete mode 100644 types/hapi/definitions/server/server-events.d.ts
 delete mode 100644 types/hapi/definitions/server/server-ext.d.ts
 delete mode 100644 types/hapi/definitions/server/server-info.d.ts
 delete mode 100644 types/hapi/definitions/server/server-inject.d.ts
 delete mode 100644 types/hapi/definitions/server/server-method.d.ts
 delete mode 100644 types/hapi/definitions/server/server-options-cache.d.ts
 delete mode 100644 types/hapi/definitions/server/server-options.d.ts
 delete mode 100644 types/hapi/definitions/server/server-realm.d.ts
 delete mode 100644 types/hapi/definitions/server/server-register.d.ts
 delete mode 100644 types/hapi/definitions/server/server-route.d.ts
 delete mode 100644 types/hapi/definitions/server/server-state-options.d.ts
 delete mode 100644 types/hapi/definitions/server/server-state.d.ts
 delete mode 100644 types/hapi/definitions/server/server.d.ts
 delete mode 100644 types/hapi/definitions/util/common.d.ts
 delete mode 100644 types/hapi/definitions/util/json.d.ts
 delete mode 100644 types/hapi/definitions/util/lifecycle.d.ts
 delete mode 100644 types/hapi/definitions/util/util.d.ts
 create mode 100644 types/hapi/test/route/ext.ts

diff --git a/types/h2o2/tsconfig.json b/types/h2o2/tsconfig.json
index 7cc2bc6d91..9d5b689ee1 100644
--- a/types/h2o2/tsconfig.json
+++ b/types/h2o2/tsconfig.json
@@ -28,4 +28,4 @@
         "index.d.ts",
         "h2o2-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/hapi-auth-basic/hapi-auth-basic-tests.ts b/types/hapi-auth-basic/hapi-auth-basic-tests.ts
index 875a53c104..e984656537 100644
--- a/types/hapi-auth-basic/hapi-auth-basic-tests.ts
+++ b/types/hapi-auth-basic/hapi-auth-basic-tests.ts
@@ -39,5 +39,5 @@ server.register(Basic).then(() => {
     server.auth.strategy('simple', 'basic', { validate });
 	server.auth.default('simple');
 
-    server.route({ method: 'GET', path: '/', config: { auth: 'simple' } });
+    server.route({ method: 'GET', path: '/', options: { auth: 'simple' } });
 });
diff --git a/types/hapi/definitions/plugin/plugin-registered.d.ts b/types/hapi/definitions/plugin/plugin-registered.d.ts
deleted file mode 100644
index 6ce68e5e85..0000000000
--- a/types/hapi/definitions/plugin/plugin-registered.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverregistrations)
- */
-export interface PluginsListRegistered {
-}
-
-/**
- * An object of the currently registered plugins where each key is a registered plugin name and the value is an
- * object containing:
- * * version - the plugin version.
- * * name - the plugin name.
- * * options - (optional) options passed to the plugin during registration.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverregistrations)
- */
-export interface PluginRegistered {
-
-    /**
-     * the plugin version.
-     */
-    version: string;
-
-    /**
-     * the plugin name.
-     */
-    name: string;
-
-    /**
-     * options used to register the plugin.
-     */
-    options: object;
-
-}
diff --git a/types/hapi/definitions/plugin/plugin.d.ts b/types/hapi/definitions/plugin/plugin.d.ts
deleted file mode 100644
index 925ac02205..0000000000
--- a/types/hapi/definitions/plugin/plugin.d.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import {Server, ServerRegisterOptions} from "hapi";
-
-export interface PluginsStates {
-}
-
-export interface PluginSpecificConfiguration {
-
-}
-
-export interface PluginNameVersion {
-    /**
-     * (required) the plugin name string. The name is used as a unique key. Published plugins (e.g. published in the npm
-     * registry) should use the same name as the name field in their 'package.json' file. Names must be
-     * unique within each application.
-     */
-    name: string;
-
-    /** optional plugin version. The version is only used informatively to enable other plugins to find out the versions loaded. The version should be the same as the one specified in the plugin's 'package.json' file. */
-    version?: string;
-}
-
-export interface PluginPackage {
-
-    /**
-     * Alternatively, the name and version can be included via the pkg property containing the 'package.json' file for the module which already has the name and version included
-     */
-    pkg: any;
-}
-
-/**
- * Plugins provide a way to organize application code by splitting the server logic into smaller components. Each
- * plugin can manipulate the server through the standard server interface, but with the added ability to sandbox
- * certain properties. For example, setting a file path in one plugin doesn't affect the file path set
- * in another plugin.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#plugins)
- *
- * The type T is the type of the plugin options.
- */
-export interface PluginBase<T> {
-
-    /**
-     * (required) the registration function with the signature async function(server, options) where:
-     * * 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>;
-
-    /** (optional) if true, allows the plugin to be registered multiple times with the same server. Defaults to false. */
-    multiple?: boolean;
-
-    /** (optional) a string or an array of strings indicating a plugin dependency. Same as setting dependencies via server.dependency(). */
-    dependencies?: string | string[];
-
-    /** once - (optional) if true, will only register the plugin once per server. If set, overrides the once option passed to server.register(). Defaults to no override. */
-    once?: boolean;
-}
-
-export type Plugin<T> = PluginBase<T> & (PluginNameVersion | PluginPackage);
diff --git a/types/hapi/definitions/request/request-auth.d.ts b/types/hapi/definitions/request/request-auth.d.ts
deleted file mode 100644
index d2f22e81cd..0000000000
--- a/types/hapi/definitions/request/request-auth.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * User-extensible type for request.auth credentials.
- */
-export interface AuthCredentials {
-    user?: string;
-}
-
-/**
- * Authentication information:
- * * artifacts - an artifact object received from the authentication strategy and used in authentication-related actions.
- * * credentials - the credential object received during the authentication process. The presence of an object does not mean successful authentication.
- * * error - the authentication error is failed and mode set to 'try'.
- * * isAuthenticated - true if the request has been successfully authenticated, otherwise false.
- * * isAuthorized - true is the request has been successfully authorized against the route authentication access configuration. If the route has not access rules defined or if the request failed authorization, set to false.
- * * mode - the route authentication mode.
- * * strategy - the name of the strategy used.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestauth)
- */
-export interface RequestAuth {
-    /** an artifact object received from the authentication strategy and used in authentication-related actions. */
-    artifacts: object;
-    /** the credential object received during the authentication process. The presence of an object does not mean successful authentication. */
-    credentials: AuthCredentials;
-    /** the authentication error is failed and mode set to 'try'. */
-    error: Error;
-    /** true if the request has been successfully authenticated, otherwise false. */
-    isAuthenticated: boolean;
-    /** true is the request has been successfully authorized against the route authentication access configuration. If the route has not access rules defined or if the request failed authorization, set to false. */
-    isAuthorized: boolean;
-    /** the route authentication mode. */
-    mode: string;
-    /** the name of the strategy used. */
-    strategy: string;
-}
diff --git a/types/hapi/definitions/request/request-events.d.ts b/types/hapi/definitions/request/request-events.d.ts
deleted file mode 100644
index dfcb004d24..0000000000
--- a/types/hapi/definitions/request/request-events.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import * as Podium from "podium";
-import {PeekListener} from "hapi";
-
-/**
- * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
- * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
- * 'disconnect' - emitted when a request errors or aborts unexpectedly.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
- */
-export type RequestEventType = "peek" | "finish" | "disconnect";
-
-/**
- * Access: read only and the public podium interface.
- * The request.events supports the following events:
- * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
- * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
- * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
- */
-export interface RequestEvents extends Podium {
-
-    /**
-     * Access: read only and the public podium interface.
-     * The request.events supports the following events:
-     * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
-     * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
-     * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
-     */
-    on(criteria: "peek", listener: PeekListener): void;
-    on(criteria: "finish" | "disconnect", listener: () => void): void;
-    on(criteria: RequestEventType, listener: Function): void;
-
-    /**
-     * Access: read only and the public podium interface.
-     * The request.events supports the following events:
-     * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
-     * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
-     * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
-     */
-    once(criteria: "peek", listener: PeekListener): void;
-    once(criteria: "finish" | "disconnect", listener: () => void): void;
-    once(criteria: RequestEventType, listener: Function): void;
-}
diff --git a/types/hapi/definitions/request/request-info.d.ts b/types/hapi/definitions/request/request-info.d.ts
deleted file mode 100644
index a4892438a2..0000000000
--- a/types/hapi/definitions/request/request-info.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Request information:
- * * acceptEncoding - the request preferred encoding.
- * * cors - if CORS is enabled for the route, contains the following:
- * * isOriginMatch - true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
- * * host - content of the HTTP 'Host' header (e.g. 'example.com:8080').
- * * hostname - the hostname part of the 'Host' header (e.g. 'example.com').
- * * id - a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').
- * * received - request reception timestamp.
- * * referrer - content of the HTTP 'Referrer' (or 'Referer') header.
- * * remoteAddress - remote client IP address.
- * * remotePort - remote client port.
- * * responded - request response timestamp (0 is not responded yet).
- * Note that the request.info object is not meant to be modified.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestinfo)
- */
-export interface RequestInfo {
-    /** the request preferred encoding. */
-    acceptEncoding: string;
-    /** if CORS is enabled for the route, contains the following: */
-    cors: {
-        /**
-         * true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
-         */
-        isOriginMatch?: boolean;
-    };
-    /** content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
-    host: string;
-    /** the hostname part of the 'Host' header (e.g. 'example.com'). */
-    hostname: string;
-    /** request reception timestamp. */
-    received: number;
-    /** content of the HTTP 'Referrer' (or 'Referer') header. */
-    referrer: string;
-    /** remote client IP address. */
-    remoteAddress: string;
-    /** remote client port. */
-    remotePort: string;
-    /** request response timestamp (0 is not responded yet). */
-    responded: number;
-}
diff --git a/types/hapi/definitions/request/request-route.d.ts b/types/hapi/definitions/request/request-route.d.ts
deleted file mode 100644
index fbafd033a6..0000000000
--- a/types/hapi/definitions/request/request-route.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import {Request, RouteOptions, ServerRealm, Util} from "hapi";
-
-/**
- * The request route information object, where:
- * * method - the route HTTP method.
- * * path - the route path.
- * * vhost - the route vhost option if configured.
- * * realm - the active realm associated with the route.
- * * settings - the route options object with all defaults applied.
- * * fingerprint - the route internal normalized string representing the normalized path.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestroute)
- */
-export interface RequestRoute {
-
-    /** the route HTTP method. */
-    method: Util.HTTP_METHODS_PARTIAL;
-
-    /** the route path. */
-    path: string;
-
-    /** the route vhost option if configured. */
-    vhost?: string | string[];
-
-    /** the active realm associated with the route.*/
-    realm: ServerRealm;
-
-    /** the route options object with all defaults applied. */
-    settings: RouteOptions;
-
-    /** the route internal normalized string representing the normalized path. */
-    fingerprint: string;
-
-    auth: {
-        /**
-         * Validates a request against the route's authentication access configuration, where:
-         * @param request - the request object.
-         * @return Return value: true if the request would have passed the route's access requirements.
-         * Note that the route's authentication mode and strategies are ignored. The only match is made between the request.auth.credentials scope and entity information and the route access configuration.
-         * If the route uses dynamic scopes, the scopes are constructed against the request.query, request.params, request.payload, and request.auth.credentials which may or may not match between the route and the request's route. If this method is called using a request that has not been authenticated (yet or not at all), it will return false if the route requires any authentication.
-         * [See docs](https://hapijs.com/api/17.0.1#-requestrouteauthaccessrequest)
-         */
-        access(request: Request): boolean;
-    }
-
-}
diff --git a/types/hapi/definitions/request/request.d.ts b/types/hapi/definitions/request/request.d.ts
deleted file mode 100644
index f04a57be96..0000000000
--- a/types/hapi/definitions/request/request.d.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import * as stream from "stream";
-import * as url from "url";
-import * as http from "http";
-import * as Podium from "podium";
-import {ApplicationState, PluginsStates, RequestAuth, RequestEvents, RequestInfo, RequestRoute, ResponseObject, ResponseValue, Server, Util} from "hapi";
-
-/**
- * An object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestorig)
- */
-export interface RequestOrig {
-    params: object;
-    query: object;
-    payload: object;
-}
-
-export interface RequestLog {
-    request: string;
-    timestamp: number;
-    tags: string[];
-    data: string | object;
-    channel: string;
-}
-
-/**
- * The request object is created internally for each incoming request. It is not the same object received from the node
- * HTTP server callback (which is available via [request.raw.req](https://github.com/hapijs/hapi/blob/master/API.md#request.raw)). The request properties change throughout
- * the request [lifecycle](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle).
- */
-export interface Request extends Podium {
-
-    /**
-     * Application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestapp)
-     */
-    app: ApplicationState;
-
-    /**
-     * Authentication information:
-     * * artifacts - an artifact object received from the authentication strategy and used in authentication-related actions.
-     * * credentials - the credential object received during the authentication process. The presence of an object does not mean successful authentication.
-     * * error - the authentication error is failed and mode set to 'try'.
-     * * isAuthenticated - true if the request has been successfully authenticated, otherwise false.
-     * * isAuthorized - true is the request has been successfully authorized against the route authentication access configuration. If the route has not access rules defined or if the request failed authorization, set to false.
-     * * mode - the route authentication mode.
-     * * strategy - the name of the strategy used.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestauth)
-     */
-    readonly auth: RequestAuth;
-
-    /**
-     * Access: read only and the public podium interface.
-     * The request.events supports the following events:
-     * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
-     * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
-     * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
-     */
-    events: RequestEvents;
-
-    /**
-     * The raw request headers (references request.raw.req.headers).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestheaders)
-     */
-    readonly headers: Util.Dictionary<string>;
-
-    /**
-     * Request information:
-     * * acceptEncoding - the request preferred encoding.
-     * * cors - if CORS is enabled for the route, contains the following:
-     * * isOriginMatch - true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
-     * * host - content of the HTTP 'Host' header (e.g. 'example.com:8080').
-     * * hostname - the hostname part of the 'Host' header (e.g. 'example.com').
-     * * id - a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').
-     * * received - request reception timestamp.
-     * * referrer - content of the HTTP 'Referrer' (or 'Referer') header.
-     * * remoteAddress - remote client IP address.
-     * * remotePort - remote client port.
-     * * responded - request response timestamp (0 is not responded yet).
-     * Note that the request.info object is not meant to be modified.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestinfo)
-     */
-    readonly info: RequestInfo;
-
-    /**
-     * An array containing the logged request events.
-     * Note that this array will be empty if route log.collect is set to false.
-     */
-    readonly logs: RequestLog[];
-
-    /**
-     * The request method in lower case (e.g. 'get', 'post').
-     */
-    readonly method: Util.HTTP_METHODS_PARTIAL_LOWERCASE;
-
-    /**
-     * The parsed content-type header. Only available when payload parsing enabled and no payload error occurred.
-     */
-    readonly mime: string;
-
-    /**
-     * An object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.
-     */
-    readonly orig: RequestOrig;
-
-    /**
-     * An object where each key is a path parameter name with matching value as described in [Path parameters](https://github.com/hapijs/hapi/blob/master/API.md#path-parameters).
-     */
-    readonly params: Util.Dictionary<string>;
-
-    /**
-     * An array containing all the path params values in the order they appeared in the path.
-     */
-    readonly paramsArray: string[];
-
-    /**
-     * The request URI's pathname component.
-     */
-    readonly path: string;
-
-    /**
-     * The request payload based on the route payload.output and payload.parse settings.
-     * TODO check this typing and add references / links.
-     */
-    readonly payload: stream.Readable | Buffer | string | object;
-
-    /**
-     * Plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.
-     */
-    plugins: PluginsStates;
-
-    /**
-     * An object where each key is the name assigned by a route pre-handler methods function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.
-     */
-    readonly pre: Util.Dictionary<object>;
-
-    /**
-     * Access: read / write (see limitations below).
-     * 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 | null;
-
-    /**
-     * Same as pre but represented as the response object created by the pre method.
-     */
-    readonly preResponses: Util.Dictionary<object>;
-
-    /**
-     * By default the object outputted from node's URL parse() method. Might also be set indirectly via request.setUrl in which case it may be a string (if url is set to an object with the query attribute as an unparsed string).
-     */
-    readonly query: any;
-
-    /**
-     * An object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.
-     * * req - the node request object.
-     * * res - the node response object.
-     */
-    readonly raw: {
-        req: http.IncomingMessage;
-        res: http.ServerResponse;
-    };
-
-    /**
-     * The request route information object and method
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestroute)
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestrouteauthaccessrequest)
-     */
-    readonly route: RequestRoute;
-
-    /**
-     * Access: read only and the public server interface.
-     * The server object.
-     */
-    server: Server;
-
-    /**
-     * An object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition.
-     */
-    readonly state: Util.Dictionary<any>;
-
-    /**
-     * The parsed request URI.
-     */
-    readonly url: url.Url;
-
-    /**
-     * Returns a response which you can pass into the reply interface where:
-     * @param source - the value to set as the source of the reply interface, optional.
-     * @param options - options for the method, optional.
-     * @return ResponseObject
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestgenerateresponsesource-options)
-     */
-    generateResponse(source: string | object | null, options?: {variety?: string; prepare?: (response: ResponseObject) => Promise<ResponseObject>; marshal?: (response: ResponseObject) => Promise<ResponseValue>; close?: (response: ResponseObject) => void; }): ResponseObject;
-
-    /**
-     * Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
-     * @param tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.
-     * @param data - (optional) an message string or object with the application data being logged. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners.
-     * Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
-     * @return void
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestlogtags-data)
-     */
-    log(tags: string | string[], data?: string | object | (() => string | object)): void;
-
-    /**
-     * Changes the request method before the router begins processing the request where:
-     * @param method - is the request HTTP method (e.g. 'GET').
-     * @return void
-     * Can only be called from an 'onRequest' extension method.
-     * [See docs](https://hapijs.com/api/17.0.1#-requestsetmethodmethod)
-     */
-    setMethod(method: Util.HTTP_METHODS_PARTIAL): void;
-
-    /**
-     * Changes the request URI before the router begins processing the request where:
-     * Can only be called from an 'onRequest' extension method.
-     * @param url - the new request URI. If url is a string, it is parsed with node's URL parse() method with parseQueryString set to true. url can also be set to an object compatible with node's URL parse() method output.
-     * @param stripTrailingSlash - if true, strip the trailing slash from the path. Defaults to false.
-     * @return void
-     * [See docs](https://hapijs.com/api/17.0.1#-requestseturlurl-striptrailingslash)
-     */
-    setUrl(url: string | url.URL, stripTrailingSlash?: boolean): void;
-
-}
diff --git a/types/hapi/definitions/response/response-events.d.ts b/types/hapi/definitions/response/response-events.d.ts
deleted file mode 100644
index b31fe0c21e..0000000000
--- a/types/hapi/definitions/response/response-events.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import * as Podium from "podium";
-import {PeekListener} from "hapi";
-
-/**
- * Access: read only and the public podium interface.
- * The response.events object supports the following events:
- * * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
- * * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
- * [See docs](https://hapijs.com/api/17.0.1#-responseevents)
- */
-export interface ResponseEvents extends Podium {
-
-    /**
-     * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
-     * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
-     */
-    on(criteria: 'peek', listener: PeekListener): void;
-    on(criteria: 'finish', listener: () => void): void;
-    on(criteria: 'peek' | 'finish', listener: Function): void;
-
-    /**
-     * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
-     * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
-     */
-    once(criteria: 'peek', listener: PeekListener): void;
-    once(criteria: 'finish', listener: () => void): void;
-    once(criteria: 'peek' | 'finish', listener: Function): void;
-
-}
diff --git a/types/hapi/definitions/response/response-object.d.ts b/types/hapi/definitions/response/response-object.d.ts
deleted file mode 100644
index 4382338551..0000000000
--- a/types/hapi/definitions/response/response-object.d.ts
+++ /dev/null
@@ -1,288 +0,0 @@
-import * as Podium from "podium";
-import {ApplicationState, Json, Lifecycle, PluginsStates, ResponseEvents, ResponseSettings, ServerStateCookieOptions, Util} from "hapi";
-
-/**
- * Object where:
- *  * append - if true, the value is appended to any existing header value using separator. Defaults to false.
- *  * separator - string used as separator when appending to an existing value. Defaults to ','.
- *  * override - if false, the header value is not set if an existing value present. Defaults to true.
- *  * duplicate - if false, the header value is not modified if the provided value is already included. Does not apply when append is false or if the name is 'set-cookie'. Defaults to true.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseheadername-value-options)
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#response-object)
- */
-export interface ResponseObjectHeaderOptions {
-    append?: boolean;
-    separator?: string;
-    override?: boolean;
-    duplicate?: boolean;
-}
-
-/**
- * The response object contains the request response value along with various HTTP headers and flags. When a lifecycle
- * method returns a value, the value is wrapped in a response object along with some default flags (e.g. 200 status
- * code). In order to customize a response before it is returned, the h.response() method is provided.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#response-object)
- * TODO, check extending from Podium is correct.  Extending because of "The response object supports the following events" [See docs](https://hapijs.com/api/17.0.1#-responseevents)
- */
-export interface ResponseObject extends Podium {
-
-    /**
-     * Default value: {}.
-     * Application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseapp)
-     */
-    app: ApplicationState;
-
-    /**
-     * Access: read only and the public podium interface.
-     * The response.events object supports the following events:
-     * * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
-     * * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
-     * [See docs](https://hapijs.com/api/17.0.1#-responseevents)
-     */
-    readonly events: ResponseEvents;
-
-    /**
-     * Default value: {}.
-     * An object containing the response headers where each key is a header field name and the value is the string header value or array of string.
-     * Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepared for transmission.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseheaders)
-     */
-    readonly headers: Util.Dictionary<string | string[]>;
-
-    /**
-     * Default value: {}.
-     * Plugin-specific state. Provides a place to store and pass request-level plugin data. plugins is an object where each key is a plugin name and the value is the state.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseplugins)
-     */
-    plugins: PluginsStates;
-
-    /**
-     * Object containing the response handling flags.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesettings)
-     */
-    readonly settings: ResponseSettings;
-
-    /**
-     * The raw value returned by the lifecycle method.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesource)
-     */
-    readonly source: Lifecycle.ReturnValue;
-
-    /**
-     * Default value: 200.
-     * The HTTP response status code.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsestatuscode)
-     */
-    readonly statusCode: number;
-
-    /**
-     * A string indicating the type of source with available values:
-     * * 'plain' - a plain response such as string, number, null, or simple object.
-     * * 'buffer' - a Buffer.
-     * * 'stream' - a Stream.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsevariety)
-     */
-    readonly variety: 'plain' | 'buffer' | 'stream';
-
-    /**
-     * Sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
-     * @param length - the header value. Must match the actual payload size.
-     * @return Return value: the current response object.
-     * [See docs](https://hapijs.com/api/17.0.1#-responsebyteslength)
-     */
-    bytes(length: number): ResponseObject;
-
-    /**
-     * Sets the 'Content-Type' HTTP header 'charset' property where:
-     * @param charset - the charset property value.
-     * @return Return value: the current response object.
-     * [See docs](https://hapijs.com/api/17.0.1#-responsecharsetcharset)
-     */
-    charset(charset: string): ResponseObject;
-
-    /**
-     * Sets the 'Content-Type' HTTP header 'charset' property where:
-     * $param charset - the charset property value.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsecodestatuscode)
-     */
-    code(statusCode: number): ResponseObject;
-
-    /**
-     * Sets the HTTP status message where:
-     * @param httpMessage - the HTTP status message (e.g. 'Ok' for status code 200).
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsemessagehttpmessage)
-     */
-    message(httpMessage: string): ResponseObject;
-
-    /**
-     * Sets the HTTP status code to Created (201) and the HTTP 'Location' header where:
-     * @param uri - an absolute or relative URI used as the 'Location' header value.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsecreateduri)
-     */
-    created(uri: string): ResponseObject;
-
-    /**
-     * Sets the string encoding scheme used to serial data into the HTTP payload where:
-     * @param encoding  the encoding property value (see node Buffer encoding [See docs](https://nodejs.org/api/buffer.html#buffer_buffers_and_character_encodings)).
-     *  * 'ascii' - for 7-bit ASCII data only. This encoding is fast and will strip the high bit if set.
-     *  * 'utf8' - Multibyte encoded Unicode characters. Many web pages and other document formats use UTF-8.
-     *  * 'utf16le' - 2 or 4 bytes, little-endian encoded Unicode characters. Surrogate pairs (U+10000 to U+10FFFF) are supported.
-     *  * 'ucs2' - Alias of 'utf16le'.
-     *  * 'base64' - Base64 encoding. When creating a Buffer from a string, this encoding will also correctly accept "URL and Filename Safe Alphabet" as specified in RFC4648, Section 5.
-     *  * 'latin1' - A way of encoding the Buffer into a one-byte encoded string (as defined by the IANA in RFC1345, page 63, to be the Latin-1 supplement block and C0/C1 control codes).
-     *  * 'binary' - Alias for 'latin1'.
-     *  * 'hex' - Encode each byte as two hexadecimal characters.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseencodingencoding)
-     */
-    encoding(encoding: 'ascii' | 'utf8' | 'utf16le' | 'ucs2' | 'base64' | 'latin1' | 'binary' | 'hex'): ResponseObject;
-
-    /**
-     * Sets the representation entity tag where:
-     * @param tag - the entity tag string without the double-quote.
-     * @param options - (optional) settings where:
-     *  * weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
-     *  * vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseetagtag-options)
-     */
-    etag(tag: string, options?: {weak: boolean, vary: boolean}): ResponseObject;
-
-    /**
-     * Sets an HTTP header where:
-     * @param name - the header name.
-     * @param value - the header value.
-     * @param options - (optional) object where:
-     *  * append - if true, the value is appended to any existing header value using separator. Defaults to false.
-     *  * separator - string used as separator when appending to an existing value. Defaults to ','.
-     *  * override - if false, the header value is not set if an existing value present. Defaults to true.
-     *  * duplicate - if false, the header value is not modified if the provided value is already included. Does not apply when append is false or if the name is 'set-cookie'. Defaults to true.
-     *  @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseheadername-value-options)
-     */
-    header(name: string, value: string, options?: ResponseObjectHeaderOptions): ResponseObject;
-
-    /**
-     * Sets the HTTP 'Location' header where:
-     * @param uri - an absolute or relative URI used as the 'Location' header value.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responselocationuri)
-     */
-    location(uri: string): ResponseObject;
-
-    /**
-     * Sets an HTTP redirection response (302) and decorates the response with additional methods, where:
-     * @param uri - an absolute or relative URI used to redirect the client to another resource.
-     * @return Return value: the current response object.
-     * Decorates the response object with the response.temporary(), response.permanent(), and response.rewritable() methods to easily change the default redirection code (302).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseredirecturi)
-     */
-    redirect(uri: string): ResponseObject;
-
-    /**
-     * Sets the JSON.stringify() replacer argument where:
-     * @param method - the replacer function or array. Defaults to none.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsereplacermethod)
-     */
-    replacer(method: Json.StringifyReplacer): ResponseObject;
-
-    /**
-     * Sets the JSON.stringify() space argument where:
-     * @param count - the number of spaces to indent nested object keys. Defaults to no indentation.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsespacescount)
-     */
-    spaces(count: number): ResponseObject;
-
-    /**
-     * Sets an HTTP cookie where:
-     * @param name - the cookie name.
-     * @param value - the cookie value. If no options.encoding is defined, must be a string. See server.state() for supported encoding values.
-     * @param options - (optional) configuration. If the state was previously registered with the server using server.state(), the specified keys in options are merged with the default server definition.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsestatename-value-options)
-     */
-    state(name: string, value: object | string, options?: ServerStateCookieOptions): ResponseObject;
-
-    /**
-     * Sets a string suffix when the response is process via JSON.stringify() where:
-     * @param suffix - the string suffix.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesuffixsuffix)
-     */
-    suffix(suffix: string): ResponseObject;
-
-    /**
-     * Overrides the default route cache expiration rule for this response instance where:
-     * @param msec - the time-to-live value in milliseconds.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsettlmsec)
-     */
-    ttl(msec: number): ResponseObject;
-
-    /**
-     * Sets the HTTP 'Content-Type' header where:
-     * @param mimeType - is the mime type.
-     * @return Return value: the current response object.
-     * Should only be used to override the built-in default for each response type.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsetypemimetype)
-     */
-    type(mimeType: string): ResponseObject;
-
-    /**
-     * Clears the HTTP cookie by setting an expired value where:
-     * @param name - the cookie name.
-     * @param options - (optional) configuration for expiring cookie. If the state was previously registered with the server using server.state(), the specified options are merged with the server definition.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseunstatename-options)
-     */
-    unstate(name: string, options?: ServerStateCookieOptions): ResponseObject;
-
-    /**
-     * Adds the provided header to the list of inputs affected the response generation via the HTTP 'Vary' header where:
-     * @param header - the HTTP request header name.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsevaryheader)
-     */
-    vary(header: string): ResponseObject;
-
-    /**
-     * Marks the response object as a takeover response.
-     * @return Return value: the current response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsetakeover)
-     */
-    takeover(): ResponseObject;
-
-    /**
-     * Sets the status code to 302 or 307 (based on the response.rewritable() setting) where:
-     * @param isTemporary - if false, sets status to permanent. Defaults to true.
-     * @return Return value: the current response object.
-     * Only available after calling the response.redirect() method.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsetemporaryistemporary)
-     */
-    temporary(isTemporary: boolean): ResponseObject;
-
-    /**
-     * Sets the status code to 301 or 308 (based on the response.rewritable() setting) where:
-     * @param isPermanent - if false, sets status to temporary. Defaults to true.
-     * @return Return value: the current response object.
-     * Only available after calling the response.redirect() method.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsepermanentispermanent)
-     */
-    permanent(isPermanent: boolean): ResponseObject;
-
-    /**
-     * Sets the status code to 301/302 for rewritable (allows changing the request method from 'POST' to 'GET') or 307/308 for non-rewritable (does not allow changing the request method from 'POST' to 'GET'). Exact code based on the response.temporary() or response.permanent() setting. Arguments:
-     * @param isRewritable - if false, sets to non-rewritable. Defaults to true.
-     * @return Return value: the current response object.
-     * Only available after calling the response.redirect() method.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responserewritableisrewritable)
-     */
-    rewritable(isRewritable: boolean): ResponseObject;
-
-}
diff --git a/types/hapi/definitions/response/response-settings.d.ts b/types/hapi/definitions/response/response-settings.d.ts
deleted file mode 100644
index 0926878d1c..0000000000
--- a/types/hapi/definitions/response/response-settings.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {Json} from "hapi";
-
-/**
- * Object containing the response handling flags.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesettings)
- */
-export interface ResponseSettings {
-
-    /**
-     * Defaults value: true.
-     * If true and source is a Stream, copies the statusCode and headers properties of the stream object to the outbound response.
-     */
-    readonly passThrough: boolean;
-
-    /**
-     * Default value: null (use route defaults).
-     * Override the route json options used when source value requires stringification.
-     */
-    readonly stringify: Json.StringifyArguments;
-
-    /**
-     * Default value: null (use route defaults).
-     * If set, overrides the route cache with an expiration value in milliseconds.
-     */
-    readonly ttl: number;
-
-    /**
-     * Default value: false.
-     * If true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.
-     */
-    varyEtag: boolean;
-
-}
diff --git a/types/hapi/definitions/response/response-toolkit.d.ts b/types/hapi/definitions/response/response-toolkit.d.ts
deleted file mode 100644
index 8fb64a6ea3..0000000000
--- a/types/hapi/definitions/response/response-toolkit.d.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import {Request, ResponseObject, ServerRealm, ServerStateCookieOptions} from "hapi";
-
-/**
- * See more about Lifecycle
- * https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle
- *
- */
-
-export type ResponseValue = string | object;
-
-export interface AuthenticationData {
-    credentials: object;
-    artifacts?: object;
-}
-
-/**
- * The response toolkit is a collection of properties and utilities passed to every [lifecycle method](https://github.com/hapijs/hapi/blob/master/API.md#lifecycle-methods)
- * It is somewhat hard to define as it provides both utilities for manipulating responses as well as other information. Since the
- * toolkit is passed as a function argument, developers can name it whatever they want. For the purpose of this
- * document the h notation is used. It is named in the spirit of the RethinkDB r method, with h for hapi.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#response-toolkit)
- */
-export interface ResponseToolkit {
-
-    /**
-     * A response symbol. When returned by a lifecycle method, the request lifecycle skips to the finalizing step
-     * without further interaction with the node response stream. It is the developer's responsibility to write
-     * and end the response directly via [request.raw.res](https://github.com/hapijs/hapi/blob/master/API.md#request.raw).
-     */
-    readonly abandon: symbol;
-
-    /**
-     * A response symbol. When returned by a lifecycle method, the request lifecycle skips to the finalizing step after
-     * calling request.raw.res.end()) to close the the node response stream.
-     */
-    readonly close: symbol;
-
-    /**
-     * A response symbol. Provides access to the route or server context set via the route [bind](https://github.com/hapijs/hapi/blob/master/API.md#route.options.bind)
-     * option or [server.bind()](https://github.com/hapijs/hapi/blob/master/API.md#server.bind()).
-     */
-    readonly context: any;
-
-    /**
-     * A response symbol. When returned by a lifecycle method, the request lifecycle continues without changing the response.
-     */
-    readonly continue: symbol;
-
-    /**
-     * The [server realm](https://github.com/hapijs/hapi/blob/master/API.md#server.realm) associated with the matching
-     * route. Defaults to the root server realm in the onRequest step.
-     */
-    readonly realm: ServerRealm;
-
-    /**
-     * Access: read only and public request interface.
-     * The [request] object. This is a duplication of the request lifecycle method argument used by
-     * [toolkit decorations](https://github.com/hapijs/hapi/blob/master/API.md#server.decorate()) to access the current request.
-     */
-    readonly request: Readonly<Request>
-
-    /**
-     * Used by the [authentication] method to pass back valid credentials where:
-     * @param data - an object with:
-     * * credentials - (required) object representing the authenticated entity.
-     * * artifacts - (optional) authentication artifacts object specific to the authentication scheme.
-     * @return Return value: an internal authentication object.
-     */
-    authenticated(data: AuthenticationData): object;
-
-    /**
-     * Sets the response 'ETag' and 'Last-Modified' headers and checks for any conditional request headers to decide if
-     * the response is going to qualify for an HTTP 304 (Not Modified). If the entity values match the request
-     * conditions, h.entity() returns a response object for the lifecycle method to return as its value which will
-     * set a 304 response. Otherwise, it sets the provided entity headers and returns undefined.
-     * The method argumetns are:
-     * @param options - a required configuration object with:
-     * * etag - the ETag string. Required if modified is not present. Defaults to no header.
-     * * modified - the Last-Modified header value. Required if etag is not present. Defaults to no header.
-     * * vary - same as the response.etag() option. Defaults to true.
-     * @return Return value: - a response object if the response is unmodified. - undefined if the response has changed.
-     * If undefined is returned, the developer must return a valid lifecycle method value. If a response is returned,
-     * it should be used as the return value (but may be customize using the response methods).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hentityoptions)
-     */
-    entity(options?: {etag?: string, modified?: string, vary?: boolean}): ResponseObject | undefined;
-
-    /**
-     * Redirects the client to the specified uri. Same as calling h.response().redirect(uri).
-     * @param url
-     * @return Returns a response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hredirecturi)
-     */
-    redirect(uri?: string): ResponseObject;
-
-    /**
-     * Wraps the provided value and returns a response object which allows customizing the response
-     * (e.g. setting the HTTP status code, custom headers, etc.), where:
-     * @param value - (optional) return value. Defaults to null.
-     * @return Returns a response object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hresponsevalue)
-     */
-    response(value?: ResponseValue): ResponseObject;
-
-    /**
-     * Sets a response cookie using the same arguments as response.state().
-     * @param name of the cookie
-     * @param value of the cookie
-     * @param (optional) ServerStateCookieOptions object.
-     * @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;
-
-    /**
-     * Used by the [authentication] method to indicate authentication failed and pass back the credentials received where:
-     * @param error - (required) the authentication error.
-     * @param data - (optional) an object with:
-     * * credentials - (required) object representing the authenticated entity.
-     * * artifacts - (optional) authentication artifacts object specific to the authentication scheme.
-     * @return void.
-     * The method is used to pass both the authentication error and the credentials. For example, if a request included
-     * expired credentials, it allows the method to pass back the user information (combined with a 'try'
-     * authentication mode) for error customization.
-     * There is no difference between throwing the error or passing it with the h.unauthenticated() method is no credentials are passed, but it might still be helpful for code clarity.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hunauthenticatederror-data)
-     */
-    unauthenticated(error: Error, data?: AuthenticationData): void;
-
-    /**
-     * Clears a response cookie using the same arguments as
-     * @param name of the cookie
-     * @param options (optional) ServerStateCookieOptions object.
-     * @return void.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hunstatename-options)
-     */
-    unstate(name: string, options?: ServerStateCookieOptions): void;
-
-}
diff --git a/types/hapi/definitions/route/route-options-access.d.ts b/types/hapi/definitions/route/route-options-access.d.ts
deleted file mode 100644
index 2446d7b1c4..0000000000
--- a/types/hapi/definitions/route/route-options-access.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-
-export type RouteOptionsAccessScope = false | string | string[];
-
-export type RouteOptionsAccessEntity = 'any' | 'user' | 'app';
-
-export interface RouteOptionsAccessScopeObject {
-    scope: RouteOptionsAccessScope;
-}
-
-export interface RouteOptionsAccessEntityObject {
-    entity: RouteOptionsAccessEntity;
-}
-
-export type RouteOptionsAccessObject = RouteOptionsAccessScopeObject | RouteOptionsAccessEntityObject | (RouteOptionsAccessScopeObject & RouteOptionsAccessEntityObject);
-
-/**
- * Route Authentication Options
- */
-export interface RouteOptionsAccess {
-
-    /**
-     * Default value: none.
-     * An object or array of objects specifying the route access rules. Each rule is evaluated against an incoming request and access is granted if at least one of the rules matches. Each rule object must include at least one of scope or entity.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthaccess)
-     */
-    access?: RouteOptionsAccessObject | RouteOptionsAccessObject[];
-
-    /**
-     * Default value: false (no scope requirements).
-     * The application scope required to access the route. Value can be a scope string or an array of scope strings. When authenticated, the credentials object scope property must contain at least one of the scopes defined to access the route.
-     * If a scope string begins with a + character, that scope is required. If a scope string begins with a ! character, that scope is forbidden. For example, the scope ['!a', '+b', 'c', 'd'] means the incoming request credentials' scope must not include 'a', must include 'b', and must include one of 'c' or 'd'.
-     * You may also access properties on the request object (query, params, payload, and credentials) to populate a dynamic scope by using the '{' and '}' characters around the property name, such as 'user-{params.id}'.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthaccessscope)
-     */
-    scope?: RouteOptionsAccessScope;
-
-    /**
-     * Default value: 'any'.
-     * The required authenticated entity type. If set, must match the entity value of the request authenticated credentials. Available values:
-     * * 'any' - the authentication can be on behalf of a user or application.
-     * * 'user' - the authentication must be on behalf of a user which is identified by the presence of a 'user' attribute in the credentials object returned by the authentication strategy.
-     * * 'app' - the authentication must be on behalf of an application which is identified by the lack of presence of a user attribute in the credentials object returned by the authentication strategy.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthaccessentity)
-     */
-    entity?: RouteOptionsAccessEntity;
-
-    /**
-     * Default value: 'required'.
-     * The authentication mode. Available values:
-     * * 'required' - authentication is required.
-     * * 'optional' - authentication is optional - the request must include valid credentials or no credentials at all.
-     * * 'try' - similar to 'optional', any request credentials are attempted authentication, but if the credentials are invalid, the request proceeds regardless of the authentication error.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthmode)
-     */
-    mode?: 'required' | 'optional' | 'try';
-
-    /**
-     * Default value: false, unless the scheme requires payload authentication.
-     * If set, the incoming request payload is authenticated after it is processed. Requires a strategy with payload authentication support (e.g. Hawk). Cannot be set to a value other than 'required' when the scheme sets the authentication options.payload to true.
-     * Available values:
-     * * false - no payload authentication.
-     * * 'required' - payload authentication required.
-     * * 'optional' - payload authentication performed only when the client includes payload authentication information (e.g. hash attribute in Hawk).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthpayload)
-     */
-    payload?: false | 'required' | 'optional';
-
-    /**
-     * Default value: the default strategy set via server.auth.default().
-     * An array of string strategy names in the order they should be attempted. Cannot be used together with strategy.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthstrategies)
-     */
-    strategies?: string[];
-
-    /**
-     * Default value: the default strategy set via server.auth.default().
-     * A string strategy names. Cannot be used together with strategies.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthstrategy)
-     */
-    strategy?: string;
-
-}
diff --git a/types/hapi/definitions/route/route-options-cache.d.ts b/types/hapi/definitions/route/route-options-cache.d.ts
deleted file mode 100644
index 1b17ee4e96..0000000000
--- a/types/hapi/definitions/route/route-options-cache.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Values are:
- * * * 'default' - no privacy flag.
- * * * 'public' - mark the response as suitable for public caching.
- * * * 'private' - mark the response as suitable only for private caching.
- * * expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
- * * expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn.
- * * statuses - an array of HTTP response status code numbers (e.g. 200) which are allowed to include a valid caching directive.
- * * otherwise - a string with the value of the 'Cache-Control' header when caching is disabled.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscache)
- */
-export type RouteOptionsCache = {
-    privacy?: 'default' | 'public' | 'privacy';
-    statuses?: number[];
-    otherwise?: string;
-} & (
-    {
-    expiresIn?: number;
-    expiresAt?: undefined;
-    } | {
-    expiresIn?: undefined;
-    expiresAt?: string;
-    } | {
-    expiresIn?: undefined;
-    expiresAt?: undefined;
-    }
-);
diff --git a/types/hapi/definitions/route/route-options-cors.d.ts b/types/hapi/definitions/route/route-options-cors.d.ts
deleted file mode 100644
index 8264680ec8..0000000000
--- a/types/hapi/definitions/route/route-options-cors.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Default value: false (no CORS headers).
- * The Cross-Origin Resource Sharing protocol allows browsers to make cross-origin API calls. CORS is required by web applications running inside a browser which are loaded from a different domain than the API server. To enable, set cors to true, or to an object with the following options:
- * * origin - an array of allowed origin servers strings ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '*' character, or a single '*' origin string. If set to 'ignore', any incoming Origin header is ignored (present or not) and the 'Access-Control-Allow-Origin' header is set to '*'. Defaults to any origin ['*'].
- * * maxAge - number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in policy. Defaults to 86400 (one day).
- * * headers - a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'].
- * * additionalHeaders - a strings array of additional headers to headers. Use this to keep the default headers in place.
- * * exposedHeaders - a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization'].
- * * additionalExposedHeaders - a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place.
- * * 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)
- */
-export interface RouteOptionsCors {
-    /**
-     * an array of allowed origin servers strings ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '*' character, or a single '*' origin string. If set to 'ignore', any incoming Origin header is ignored (present or not) and the 'Access-Control-Allow-Origin' header is set to '*'. Defaults to any origin ['*'].
-     */
-    origin?: string[] | '*'| 'ignore';
-    /**
-     * number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in policy. Defaults to 86400 (one day).
-     */
-    maxAge?: number;
-    /**
-     * a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'].
-     */
-    headers?: string[];
-    /**
-     * a strings array of additional headers to headers. Use this to keep the default headers in place.
-     */
-    additionalHeaders?: string[];
-    /**
-     * a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization'].
-     */
-    exposedHeaders?: string[];
-    /**
-     * a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place.
-     */
-    additionalExposedHeaders?: string[];
-    /**
-     * if true, allows user credentials to be sent ('Access-Control-Allow-Credentials'). Defaults to false.
-     */
-    credentials?: boolean;
-}
diff --git a/types/hapi/definitions/route/route-options-payload.d.ts b/types/hapi/definitions/route/route-options-payload.d.ts
deleted file mode 100644
index a13db35c32..0000000000
--- a/types/hapi/definitions/route/route-options-payload.d.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import {Lifecycle, Util} from "hapi";
-
-/**
- * The value must be one of:
- * * 'data' - the incoming payload is read fully into memory. If parse is true, the payload is parsed (JSON, form-decoded, multipart) based on the 'Content-Type' header. If parse is false, a raw Buffer is returned.
- * * 'stream' - the incoming payload is made available via a Stream.Readable interface. If the payload is 'multipart/form-data' and parse is true, field values are presented as text while files are provided as streams. File streams from a 'multipart/form-data' upload will also have a hapi property containing the filename and headers properties. Note that payload streams for multipart payloads are a synthetic interface created on top of the entire mutlipart content loaded into memory. To avoid loading large multipart payloads into memory, set parse to false and handle the multipart payload in the handler using a streaming parser (e.g. pez).
- * * 'file' - the incoming payload is written to temporary file in the directory specified by the uploads settings. If the payload is 'multipart/form-data' and parse is true, field values are presented as text while files are saved to disk. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform cleanup.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadoutput)
- */
-export type PayloadOutput = 'data' | 'stream' | 'file';
-
-/**
-  * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadcompression)
- */
-export type PayloadCompressionDecoderSettings = object;
-
-/**
- * Determines how the request payload is processed.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayload)
- */
-export interface RouteOptionsPayload {
-
-    /**
-     * Default value: allows parsing of the following mime types:
-     * * application/json
-     * * application/*+json
-     * * application/octet-stream
-     * * application/x-www-form-urlencoded
-     * * multipart/form-data
-     * * text/*
-     * A string or an array of strings with the allowed mime types for the endpoint. Use this settings to limit the set of allowed mime types. Note that allowing additional mime types not listed above will not enable them to be parsed, and if parse is true, the request will result in an error response.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadallow)
-     */
-    allow?: string | string[];
-
-    /**
-     * Default value: none.
-     * An object where each key is a content-encoding name and each value is an object with the desired decoder settings. Note that encoder settings are set in compression.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadcompression)
-     */
-    compression?: Util.Dictionary<PayloadCompressionDecoderSettings>;
-
-    /**
-     * Default value: 'application/json'.
-     * The default content type if the 'Content-Type' request header is missing.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloaddefaultcontenttype)
-     */
-    defaultContentType?: string;
-
-    /**
-     * Default value: 'error' (return a Bad Request (400) error response).
-     * A failAction value which determines how to handle payload parsing errors.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadfailaction)
-     */
-    failAction?: Lifecycle.FailAction;
-
-    /**
-     * Default value: 1048576 (1MB).
-     * Limits the size of incoming payloads to the specified byte count. Allowing very large payloads may cause the server to run out of memory.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadmaxbytes)
-     */
-    maxBytes?: number;
-
-    /**
-     * Default value: none.
-     * Overrides payload processing for multipart requests. Value can be one of:
-     * * false - disable multipart processing.
-     * an object with the following required options:
-     * * output - same as the output option with an additional value option:
-     * * * annotated - wraps each multipart part in an object with the following keys: // TODO type this?
-     * * * * headers - the part headers.
-     * * * * filename - the part file name.
-     * * * * payload - the processed part payload.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadmultipart)
-     */
-    multipart?: false | {
-        output: PayloadOutput | 'annotated';
-    };
-
-    /**
-     * Default value: 'data'.
-     * The processed payload format. The value must be one of:
-     * * 'data' - the incoming payload is read fully into memory. If parse is true, the payload is parsed (JSON, form-decoded, multipart) based on the 'Content-Type' header. If parse is false, a raw Buffer is returned.
-     * * 'stream' - the incoming payload is made available via a Stream.Readable interface. If the payload is 'multipart/form-data' and parse is true, field values are presented as text while files are provided as streams. File streams from a 'multipart/form-data' upload will also have a hapi property containing the filename and headers properties. Note that payload streams for multipart payloads are a synthetic interface created on top of the entire mutlipart content loaded into memory. To avoid loading large multipart payloads into memory, set parse to false and handle the multipart payload in the handler using a streaming parser (e.g. pez).
-     * * 'file' - the incoming payload is written to temporary file in the directory specified by the uploads settings. If the payload is 'multipart/form-data' and parse is true, field values are presented as text while files are saved to disk. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform cleanup.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadoutput)
-     */
-    output?: PayloadOutput;
-
-    /**
-     * Default value: none.
-     * A mime type string overriding the 'Content-Type' header value received.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadoverride)
-     */
-    override?: string;
-
-    /**
-     * Default value: true.
-     * Determines if the incoming payload is processed or presented raw. Available values:
-     * * true - if the request 'Content-Type' matches the allowed mime types set by allow (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Any known content encoding is decoded.
-     * * false - the raw payload is returned unmodified.
-     * * 'gunzip' - the raw payload is returned unmodified after any known content encoding is decoded.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadparse)
-     */
-    parse?: boolean | 'gunzip';
-
-    /**
-     * Default value: to 10000 (10 seconds).
-     * Payload reception timeout in milliseconds. Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.
-     * Set to false to disable.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadtimeout)
-     */
-    timeout?: false | number;
-
-    /**
-     * Default value: os.tmpdir().
-     * The directory used for writing file uploads.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloaduploads)
-     */
-    uploads?: string;
-
-}
diff --git a/types/hapi/definitions/route/route-options-pre.d.ts b/types/hapi/definitions/route/route-options-pre.d.ts
deleted file mode 100644
index 8745bf5a00..0000000000
--- a/types/hapi/definitions/route/route-options-pre.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {Lifecycle} from "hapi";
-
-/**
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
- */
-export type RouteOptionsPreArray = RouteOptionsPreAllOptions[];
-
-/**
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
- */
-export type RouteOptionsPreAllOptions = RouteOptionsPreObject | RouteOptionsPreObject[] | Lifecycle.Method;
-
-/**
- * An object with:
- * * method - a lifecycle method.
- * * assign - key name used to assign the response of the method to in request.pre and request.preResponses.
- * * failAction - A failAction value which determine what to do when a pre-handler method throws an error. If assign is specified and the failAction setting is not 'error', the error will be assigned.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
- */
-export interface RouteOptionsPreObject {
-    /**
-     * a lifecycle method.
-     */
-    method: Lifecycle.Method;
-    /**
-     * key name used to assign the response of the method to in request.pre and request.preResponses.
-     */
-    assign: string;
-    /**
-     * A failAction value which determine what to do when a pre-handler method throws an error. If assign is specified and the failAction setting is not 'error', the error will be assigned.
-     */
-    failAction?: Lifecycle.FailAction;
-}
diff --git a/types/hapi/definitions/route/route-options-response.d.ts b/types/hapi/definitions/route/route-options-response.d.ts
deleted file mode 100644
index b0c3925bfe..0000000000
--- a/types/hapi/definitions/route/route-options-response.d.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import {Lifecycle, Util} from "hapi";
-import {ValidationOptions} from "joi";
-
-export type RouteOptionsResponseSchema = boolean | ValidationOptions | ((value: object | Buffer | string, options: ValidationOptions) => Promise<any>);
-
-/**
- * Processing rules for the outgoing response.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponse)
- */
-export interface RouteOptionsResponse {
-
-    /**
-     * Default value: 200.
-     * The default HTTP status code when the payload is considered empty. Value can be 200 or 204. Note that a 200 status code is converted to a 204 only at the time of response transmission (the response status code will remain 200 throughout the request lifecycle unless manually set).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseemptystatuscode)
-     */
-    emptyStatusCode?: 200 | 204;
-
-    /**
-     * Default value: 'error' (return an Internal Server Error (500) error response).
-     * A failAction value which defines what to do when a response fails payload validation.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsefailaction)
-     */
-    failAction?: Lifecycle.FailAction;
-
-    /**
-     * Default value: false.
-     * If true, applies the validation rule changes to the response payload.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsemodify)
-     */
-    modify?: boolean;
-
-    /**
-     * Default value: none.
-     * [joi](http://github.com/hapijs/joi) options object pass to the validation function. Useful to set global options such as stripUnknown or abortEarly (the complete list is available here). If a custom validation function is defined via schema or status then options can an arbitrary object that will be passed to this function as the second argument.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseoptions)
-     */
-    options?: ValidationOptions; // TODO needs validation
-
-    /**
-     * Default value: true.
-     * If false, payload range support is disabled.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseranges)
-     */
-    ranges?: boolean;
-
-    /**
-     * Default value: 100 (all responses).
-     * The percent of response payloads validated (0 - 100). Set to 0 to disable all validation.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsesample)
-     */
-    sample?: number;
-
-    /**
-     * Default value: true (no validation).
-     * The default response payload validation rules (for all non-error responses) expressed as one of:
-     * * true - any payload allowed (no validation).
-     * * false - no payload allowed.
-     * * a joi validation object. The options along with the request context ({ headers, params, query, payload, app, auth }) are passed to the validation function.
-     * * a validation function using the signature async function(value, options) where:
-     * * * value - the pending response payload.
-     * * * options - The options along with the request context ({ headers, params, query, payload, app, auth }).
-     * * * if the function returns a value and modify is true, the value is used as the new response. If the original response is an error, the return value is used to override the original error output.payload. If an error is thrown, the error is processed according to failAction.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseschema)
-     */
-    schema?: RouteOptionsResponseSchema;
-
-    /**
-     * Default value: none.
-     * Validation schemas for specific HTTP status codes. Responses (excluding errors) not matching the listed status codes are validated using the default schema.
-     * status is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsestatus)
-     */
-    status?: Util.Dictionary<RouteOptionsResponseSchema>;
-
-}
diff --git a/types/hapi/definitions/route/route-options-secure.d.ts b/types/hapi/definitions/route/route-options-secure.d.ts
deleted file mode 100644
index 669d1371ed..0000000000
--- a/types/hapi/definitions/route/route-options-secure.d.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Default value: false (security headers disabled).
- * Sets common security headers. To enable, set security to true or to an object with the following options:
- * * hsts - controls the 'Strict-Transport-Security' header, where:
- * * * true - the header will be set to max-age=15768000. This is the default value.
- * * * a number - the maxAge parameter will be set to the provided value.
- * * * an object with the following fields:
- * * * * maxAge - the max-age portion of the header, as a number. Default is 15768000.
- * * * * includeSubDomains - a boolean specifying whether to add the includeSubDomains flag to the header.
- * * * * preload - a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header.
- * * xframe - controls the 'X-Frame-Options' header, where:
- * * * true - the header will be set to 'DENY'. This is the default value.
- * * * 'deny' - the headers will be set to 'DENY'.
- * * * 'sameorigin' - the headers will be set to 'SAMEORIGIN'.
- * * * an object for specifying the 'allow-from' rule, where:
- * * * * rule - one of:
- * * * * * 'deny'
- * * * * * 'sameorigin'
- * * * * * 'allow-from'
- * * * * source - when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'.
- * * xss - boolean that controls the 'X-XSS-PROTECTION' header for Internet Explorer. Defaults to true which sets the header to equal '1; mode=block'.
- *       Note: this setting can create a security vulnerability in versions of Internet Exploere below 8, as well as unpatched versions of IE8. See here and here for more information. If you actively support old versions of IE, it may be wise to explicitly set this flag to false.
- * * noOpen - boolean controlling the 'X-Download-Options' header for Internet Explorer, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'.
- * * noSniff - boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff'.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionssecurity)
- */
-export interface RouteOptionsSecureObject {
-    /**
-     * hsts - controls the 'Strict-Transport-Security' header
-     */
-    hsts?: boolean | number | {
-        /**
-         * the max-age portion of the header, as a number. Default is 15768000.
-         */
-        maxAge: number;
-        /**
-         * a boolean specifying whether to add the includeSubDomains flag to the header.
-         */
-        includeSubdomains: boolean;
-        /**
-         * a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header.
-         */
-        preload: boolean;
-    };
-    /**
-     * controls the 'X-Frame-Options' header
-     */
-    xframe?: true | 'deny' | 'sameorigin' | {
-        /**
-         * an object for specifying the 'allow-from' rule,
-         */
-        rule: 'deny' | 'sameorigin' | 'allow-from';
-        /**
-         * when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'.
-         */
-        source: string;
-    };
-    /**
-     * boolean that controls the 'X-XSS-PROTECTION' header for Internet Explorer. Defaults to true which sets the header to equal '1; mode=block'.
-     * Note: this setting can create a security vulnerability in versions of Internet Exploere below 8, as well as unpatched versions of IE8. See here and here for more information. If you actively support old versions of IE, it may be wise to explicitly set this flag to false.
-     */
-    xss: boolean;
-    /**
-     * boolean controlling the 'X-Download-Options' header for Internet Explorer, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'.
-     */
-    noOpen?: boolean;
-    /**
-     * boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff'.
-     */
-    noSniff?: boolean;
-}
-
-
-export type RouteOptionsSecure = boolean | RouteOptionsSecureObject;
diff --git a/types/hapi/definitions/route/route-options-validate.d.ts b/types/hapi/definitions/route/route-options-validate.d.ts
deleted file mode 100644
index 7fa61d5bef..0000000000
--- a/types/hapi/definitions/route/route-options-validate.d.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import {Lifecycle, RouteOptionsResponseSchema} from "hapi";
-import {ValidationOptions} from "joi";
-
-/**
- * Default value: { headers: true, params: true, query: true, payload: true, failAction: 'error' }.
- * Request input validation rules for various request components.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidate)
- */
-export interface RouteOptionsValidate {
-
-    /**
-     * Default value: none.
-     * An optional object with error fields copied into every validation error response.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateerrorfields)
-     */
-    errorFields?: object;
-
-    /**
-     * Default value: 'error' (return a Bad Request (400) error response).
-     * A failAction value which determines how to handle failed validations. When set to a function, the err argument includes the type of validation error under err.output.payload.validation.source.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidatefailaction)
-     */
-    failAction?: Lifecycle.FailAction;
-
-    /**
-     * Default value: true (no validation).
-     * Validation rules for incoming request headers:
-     * * true - any headers allowed (no validation performed).
-     * * a joi validation object.
-     * * a validation function using the signature async function(value, options) where:
-     * * * value - the request.headers object containing the request headers.
-     * * * options - options.
-     * * * if a value is returned, the value is used as the new request.headers value and the original value is stored in request.orig.headers. Otherwise, the headers are left unchanged. If an error is thrown, the error is handled according to failAction.
-     * Note that all header field names must be in lowercase to match the headers normalized by node.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateheaders)
-     */
-    headers?: RouteOptionsResponseSchema;
-
-    /**
-     * Default value: none.
-     * An options object passed to the joi rules or the custom validation methods. Used for setting global options such as stripUnknown or abortEarly (the complete list is available here).
-     * If a custom validation function (see headers, params, query, or payload above) is defined then options can an arbitrary object that will be passed to this function as the second parameter.
-     * The values of the other inputs (i.e. headers, query, params, payload, app, and auth) are added to the options object under the validation context (accessible in rules as Joi.ref('$query.key')).
-     * Note that validation is performed in order (i.e. headers, params, query, and payload) and if type casting is used (e.g. converting a string to a number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.
-     * If the validation rules for headers, params, query, and payload are defined at both the server routes level and at the route level, the individual route settings override the routes defaults (the rules are not merged).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateparams)
-     */
-    options?: ValidationOptions | object;
-
-    /**
-     * Default value: true (no validation).
-     * Validation rules for incoming request path parameters, after matching the path against the route, extracting any parameters, and storing them in request.params, where:
-     * * true - any path parameter value allowed (no validation performed).
-     * * a joi validation object.
-     * * a validation function using the signature async function(value, options) where:
-     * * * value - the request.params object containing the request path parameters.
-     * * * options - options.
-     * if a value is returned, the value is used as the new request.params value and the original value is stored in request.orig.params. Otherwise, the path parameters are left unchanged. If an error is thrown, the error is handled according to failAction.
-     * Note that failing to match the validation rules to the route path parameters definition will cause all requests to fail.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateparams)
-     */
-    params?: RouteOptionsResponseSchema;
-
-    /**
-     * Default value: true (no validation).
-     * Validation rules for incoming request payload (request body), where:
-     * * true - any payload allowed (no validation performed). false - no payload allowed.
-     * * a joi validation object. Note that empty payloads are represented by a null value. If a validation schema is provided and empty payload are allowed, the schema must be explicitly defined by setting the rule to a joi schema with null allowed (e.g. Joi.object({  keys here  }).allow(null)).
-     * * a validation function using the signature async function(value, options) where:
-     * * * value - the request.query object containing the request query parameters.
-     * * * options - options.
-     * if a value is returned, the value is used as the new request.payload value and the original value is stored in request.orig.payload. Otherwise, the payload is left unchanged. If an error is thrown, the error is handled according to failAction.
-     * Note that validating large payloads and modifying them will cause memory duplication of the payload (since the original is kept), as well as the significant performance cost of validating large amounts of data.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidatepayload)
-     */
-    payload?: RouteOptionsResponseSchema;
-
-    /**
-     * Default value: true (no validation).
-     * Validation rules for incoming request URI query component (the key-value part of the URI between '?' and '#'). The query is parsed into its individual key-value pairs, decoded, and stored in request.query prior to validation. Where:
-     * * true - any query parameter value allowed (no validation performed). false - no query parameter value allowed.
-     * * a joi validation object.
-     * * a validation function using the signature async function(value, options) where:
-     * * * value - the request.query object containing the request query parameters.
-     * * * options - options.
-     * if a value is returned, the value is used as the new request.query value and the original value is stored in request.orig.query. Otherwise, the query parameters are left unchanged. If an error is thrown, the error is handled according to failAction.
-     * Note that changes to the query parameters will not be reflected in request.url.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidatequery)
-     */
-    query?: RouteOptionsResponseSchema;
-
-}
diff --git a/types/hapi/definitions/route/route-options.d.ts b/types/hapi/definitions/route/route-options.d.ts
deleted file mode 100644
index e66668c75c..0000000000
--- a/types/hapi/definitions/route/route-options.d.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-import {
-    Json,
-    Lifecycle,
-    PluginSpecificConfiguration,
-    RouteOptionsAccess,
-    RouteOptionsCache,
-    RouteOptionsCors,
-    RouteOptionsPayload,
-    RouteOptionsPreArray,
-    RouteOptionsResponse,
-    RouteOptionsSecure,
-    RouteOptionsValidate,
-    Util
-} from "hapi";
-
-/**
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscompression)
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverencoderencoding-encoder)
- */
-export type RouteCompressionEncoderSettings = object;
-
-/**
- * Each route can be customized to change the default behavior of the request lifecycle.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#route-options)
- */
-export interface RouteOptions {
-
-    /**
-     * Application-specific route configuration state. Should not be used by plugins which should use options.plugins[name] instead.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsapp)
-     */
-    app?: any;
-
-    /**
-     * Route authentication configuration. Value can be:
-     * false to disable authentication if a default strategy is set.
-     * a string with the name of an authentication strategy registered with server.auth.strategy(). The strategy will be set to 'required' mode.
-     * an authentication configuration object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsapp)
-     */
-    auth?: false | string | RouteOptionsAccess;
-
-    /**
-     * Default value: null.
-     * An object passed back to the provided handler (via this) when called. Ignored if the method is an arrow function.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsbind)
-     */
-    bind?: object | null;
-
-    /**
-     * Default value: { privacy: 'default', statuses: [200], otherwise: 'no-cache' }.
-     * If the route method is 'GET', the route can be configured to include HTTP caching directives in the response. Caching can be customized using an object with the following options:
-     * privacy - determines the privacy flag included in client-side caching using the 'Cache-Control' header. Values are:
-     * * * 'default' - no privacy flag.
-     * * * 'public' - mark the response as suitable for public caching.
-     * * * 'private' - mark the response as suitable only for private caching.
-     * * expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
-     * * expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn.
-     * * statuses - an array of HTTP response status code numbers (e.g. 200) which are allowed to include a valid caching directive.
-     * * otherwise - a string with the value of the 'Cache-Control' header when caching is disabled.
-     * The default Cache-Control: no-cache header can be disabled by setting cache to false.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscache)
-     */
-    cache?: false | RouteOptionsCache;
-
-    /**
-     * An object where each key is a content-encoding name and each value is an object with the desired encoder settings. Note that decoder settings are set in compression.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscompression)
-     */
-    compression?: Util.Dictionary<RouteCompressionEncoderSettings>;
-
-    /**
-     * Default value: false (no CORS headers).
-     * The Cross-Origin Resource Sharing protocol allows browsers to make cross-origin API calls. CORS is required by web applications running inside a browser which are loaded from a different domain than the API server. To enable, set cors to true, or to an object with the following options:
-     * * origin - an array of allowed origin servers strings ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '*' character, or a single '*' origin string. If set to 'ignore', any incoming Origin header is ignored (present or not) and the 'Access-Control-Allow-Origin' header is set to '*'. Defaults to any origin ['*'].
-     * * maxAge - number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in policy. Defaults to 86400 (one day).
-     * * headers - a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'].
-     * * additionalHeaders - a strings array of additional headers to headers. Use this to keep the default headers in place.
-     * * exposedHeaders - a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization'].
-     * * additionalExposedHeaders - a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place.
-     * * 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;
-
-    /**
-     * Default value: none.
-     * Route description used for generating documentation (string).
-     * This setting is not available when setting server route defaults using server.options.routes.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsdescription)
-     */
-    description?: string;
-
-    /**
-     * Default value: none.
-     * Route-level request extension points by setting the option to an object with a key for each of the desired extension points ('onRequest' is not allowed), and the value is the same as the server.ext(events) event argument.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsext)
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle)
-     */
-    ext?: object;
-
-    /**
-     * Default value: { relativeTo: '.' }.
-     * Defines the behavior for accessing files:
-     * * relativeTo - determines the folder relative paths are resolved against.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsfiles)
-     */
-    files?: {
-        relativeTo: string;
-    }
-
-    /**
-     * Default value: none.
-     * The route handler function performs the main business logic of the route and sets the response. handler can be assigned:
-     * * a lifecycle method.
-     * * an object with a single property using the name of a handler type registred with the server.handler() method. The matching property value is passed as options to the registered handler generator.
-     * Note: handlers using a fat arrow style function cannot be bound to any bind property. Instead, the bound context is available under h.context.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionshandler)
-     */
-    handler?: Lifecycle.Method | object;
-
-    /**
-     * Default value: none.
-     * An optional unique identifier used to look up the route using server.lookup(). Cannot be assigned to routes added with an array of methods.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsid)
-     */
-    id?: string;
-
-    /**
-     * Default value: false.
-     * If true, the route cannot be accessed through the HTTP listener but only through the server.inject() interface with the allowInternals option set to true. Used for internal routes that should not be accessible to the outside world.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsisinternal)
-     */
-    isInternal?: boolean;
-
-    /**
-     * Default value: none.
-     * Optional arguments passed to JSON.stringify() when converting an object or error response to a string payload or escaping it after stringification. Supports the following:
-     * * replacer - the replacer function or array. Defaults to no action.
-     * * space - number of spaces to indent nested object keys. Defaults to no indentation.
-     * * suffix - string suffix added after conversion to JSON string. Defaults to no suffix.
-     * * escape - calls Hoek.jsonEscape() after conversion to JSON string. Defaults to false.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsjson)
-     */
-    json?: Json.StringifyArguments;
-
-    /**
-     * Default value: none.
-     * Enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.
-     * For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'. Cannot be used with stream responses.
-     * The 'Content-Type' response header is set to 'text/javascript' and the 'X-Content-Type-Options' response header is set to 'nosniff', and will override those headers even if explicitly set by response.type().
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsjsonp)
-     */
-    jsonp?: string;
-
-    /**
-     * Default value: { collect: false }.
-     * Request logging options:
-     * collect - if true, request-level logs (both internal and application) are collected and accessible via request.logs.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionslog)
-     */
-    log?: {
-        collect: boolean;
-    }
-
-    /**
-     * Default value: none.
-     * Route notes used for generating documentation (string or array of strings).
-     * This setting is not available when setting server route defaults using server.options.routes.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsnotes)
-     */
-    notes?: string | string[];
-
-    /**
-     * Determines how the request payload is processed.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayload)
-     */
-    payload?: RouteOptionsPayload;
-
-    /**
-     * Default value: {}.
-     * Plugin-specific configuration. plugins is an object where each key is a plugin name and the value is the plugin configuration.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsplugins)
-     */
-    plugins?: Util.Dictionary<PluginSpecificConfiguration>;
-
-    /**
-     * Default value: none.
-     * The pre option allows defining methods for performing actions before the handler is called. These methods allow breaking the handler logic into smaller, reusable components that can be shared ascross routes, as well as provide a cleaner error handling of prerequisite operations (e.g. load required reference data from a database).
-     * pre is assigned an ordered array of methods which are called serially in order. If the pre array contains another array of methods as one of its elements, those methods are called in parallel. Note that during parallel execution, if any of the methods error, return a takeover response, or abort signal, the other parallel methods will continue to execute but will be ignored once completed.
-     * pre can be assigned a mixed array of:
-     * * an array containing the elements listed below, which are executed in parallel.
-     * * an object with:
-     * * * method - a lifecycle method.
-     * * * assign - key name used to assign the response of the method to in request.pre and request.preResponses.
-     * * * failAction - A failAction value which determine what to do when a pre-handler method throws an error. If assign is specified and the failAction setting is not 'error', the error will be assigned.
-     * * a method function - same as including an object with a single method key.
-     * Note that pre-handler methods do not behave the same way other lifecycle methods do when a value is returned. Instead of the return value becoming the new response payload, the value is used to assign the corresponding request.pre and request.preResponses properties. Otherwise, the handling of errors, takeover response response, or abort signal behave the same as any other lifecycle methods.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
-     */
-    pre?: RouteOptionsPreArray;
-
-    /**
-     * Processing rules for the outgoing response.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponse)
-     */
-    response?: RouteOptionsResponse;
-
-    /**
-     * Default value: false (security headers disabled).
-     * Sets common security headers. To enable, set security to true or to an object with the following options:
-     * * hsts - controls the 'Strict-Transport-Security' header, where:
-     * * * true - the header will be set to max-age=15768000. This is the default value.
-     * * * a number - the maxAge parameter will be set to the provided value.
-     * * * an object with the following fields:
-     * * * * maxAge - the max-age portion of the header, as a number. Default is 15768000.
-     * * * * includeSubDomains - a boolean specifying whether to add the includeSubDomains flag to the header.
-     * * * * preload - a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header.
-     * * xframe - controls the 'X-Frame-Options' header, where:
-     * * * true - the header will be set to 'DENY'. This is the default value.
-     * * * 'deny' - the headers will be set to 'DENY'.
-     * * * 'sameorigin' - the headers will be set to 'SAMEORIGIN'.
-     * * * an object for specifying the 'allow-from' rule, where:
-     * * * * rule - one of:
-     * * * * * 'deny'
-     * * * * * 'sameorigin'
-     * * * * * 'allow-from'
-     * * * * source - when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'.
-     * * xss - boolean that controls the 'X-XSS-PROTECTION' header for Internet Explorer. Defaults to true which sets the header to equal '1; mode=block'.
-     *       Note: this setting can create a security vulnerability in versions of Internet Exploere below 8, as well as unpatched versions of IE8. See here and here for more information. If you actively support old versions of IE, it may be wise to explicitly set this flag to false.
-     * * noOpen - boolean controlling the 'X-Download-Options' header for Internet Explorer, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'.
-     * * noSniff - boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff'.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionssecurity)
-     */
-    security?: RouteOptionsSecure;
-
-    /**
-     * Default value: { parse: true, failAction: 'error' }.
-     * HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265). state supports the following options:
-     * parse - determines if incoming 'Cookie' headers are parsed and stored in the request.state object.
-     * failAction - A failAction value which determines how to handle cookie parsing errors. Defaults to 'error' (return a Bad Request (400) error response).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsstate)
-     */
-    state?: {
-        parse?: boolean;
-        failAction?: Lifecycle.FailAction;
-    }
-
-    /**
-     * Default value: none.
-     * Route tags used for generating documentation (array of strings).
-     * This setting is not available when setting server route defaults using server.options.routes.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionstags)
-     */
-    tags?: string[];
-
-    /**
-     * Default value: { server: false }.
-     * Timeouts for processing durations.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionstimeout)
-     */
-    timeout?: {
-
-        /**
-         * Response timeout in milliseconds. Sets the maximum time allowed for the server to respond to an incoming request before giving up and responding with a Service Unavailable (503) error response.
-         */
-        server?: boolean | number;
-
-        /**
-         * Default value: none (use node default of 2 minutes).
-         * By default, node sockets automatically timeout after 2 minutes. Use this option to override this behavior. Set to false to disable socket timeouts.
-         */
-        socket?: boolean | number;
-
-    };
-
-    /**
-     * Default value: { headers: true, params: true, query: true, payload: true, failAction: 'error' }.
-     * Request input validation rules for various request components.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidate)
-     */
-    validate?: RouteOptionsValidate;
-
-}
diff --git a/types/hapi/definitions/server/server-auth-scheme.d.ts b/types/hapi/definitions/server/server-auth-scheme.d.ts
deleted file mode 100644
index 5eed01f0a0..0000000000
--- a/types/hapi/definitions/server/server-auth-scheme.d.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import {Lifecycle, Request, ResponseToolkit, Server} from "hapi";
-
-/**
- * The scheme options argument passed to server.auth.strategy() when instantiation a strategy.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme)
- */
-export type ServerAuthSchemeOptions = object;
-
-/**
- * the method implementing the scheme with signature function(server, options) where:
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme)
- * @param server - a reference to the server object the scheme is added to.
- * @param options - (optional) the scheme options argument passed to server.auth.strategy() when instantiation a strategy.
- */
-export interface ServerAuthScheme {
-    (server: Server, options?: ServerAuthSchemeOptions): ServerAuthSchemeObject;
-}
-
-export interface ServerAuthSchemeObjectApi {
-}
-
-/**
- * The scheme method must return an object with the following
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#authentication-scheme)
- */
-export interface ServerAuthSchemeObject {
-
-    /**
-     * optional object which is exposed via the [server.auth.api](https://github.com/hapijs/hapi/blob/master/API.md#server.auth.api) object.
-     */
-    api?: ServerAuthSchemeObjectApi;
-
-    /**
-     * A lifecycle method function called for each incoming request configured with the authentication scheme. The
-     * method is provided with two special toolkit methods for returning an authenticated or an unauthenticate result:
-     * * h.authenticated() - indicate request authenticated successfully.
-     * * h.unauthenticated() - indicate request failed to authenticate.
-     * @param request the request object.
-     * @param h the ResponseToolkit
-     * @return the Lifecycle.ReturnValue
-     */
-    authenticate(request: Request, h: ResponseToolkit): Lifecycle.ReturnValue;
-
-    /**
-     * A lifecycle method to authenticate the request payload.
-     * When the scheme payload() method returns an error with a message, it means payload validation failed due to bad
-     * payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')),
-     * authentication may still be successful if the route auth.payload configuration is set to 'optional'.
-     * @param request the request object.
-     * @param h the ResponseToolkit
-     * @return the Lifecycle.ReturnValue
-     */
-    payload?(request: Request, h: ResponseToolkit): Lifecycle.ReturnValue;
-
-    /**
-     * A lifecycle method to decorate the response with authentication headers before the response headers or payload is written.
-     * @param request the request object.
-     * @param h the ResponseToolkit
-     * @return the Lifecycle.ReturnValue
-     */
-    response?(request: Request, h: ResponseToolkit): Lifecycle.ReturnValue;
-
-    /**
-     * An object with the following keys:
-     * * payload
-     */
-    options?: {
-        /**
-         * if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.
-         */
-        payload?: boolean;
-    };
-
-}
diff --git a/types/hapi/definitions/server/server-auth.d.ts b/types/hapi/definitions/server/server-auth.d.ts
deleted file mode 100644
index 92cb0c4c98..0000000000
--- a/types/hapi/definitions/server/server-auth.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import {Request, RouteOptionsAccess, ServerAuthScheme, Util} from "hapi";
-
-/**
- * An authentication configuration object using the same format as the route auth handler options.
- * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthdefaultoptions)
- */
-export interface ServerAuthConfig extends RouteOptionsAccess {
-
-}
-
-export interface ServerAuth {
-
-    /**
-     * An object where each key is an authentication strategy name and the value is the exposed strategy API.
-     * Available only when the authentication scheme exposes an API by returning an api key in the object
-     * returned from its implementation function.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthapi)
-     */
-    api: Util.Dictionary<any>;
-
-    /**
-     * Contains the default authentication configuration is a default strategy was set via
-     * [server.auth.default()](https://github.com/hapijs/hapi/blob/master/API.md#server.auth.default()).
-     */
-    readonly settings: {
-        default: ServerAuthConfig;
-    }
-
-    /**
-     * Sets a default strategy which is applied to every route where:
-     * @param options - one of:
-     * * a string with the default strategy name
-     * * an authentication configuration object using the same format as the route auth handler options.
-     * @return void.
-     * The default does not apply when a route config specifies auth as false, or has an authentication strategy
-     * configured (contains the strategy or strategies authentication settings). Otherwise, the route authentication
-     * config is applied to the defaults.
-     * Note that if the route has authentication configured, the default only applies at the time of adding the route,
-     * not at runtime. This means that calling server.auth.default() after adding a route with some authentication
-     * config will have no impact on the routes added prior. However, the default will apply to routes added
-     * before server.auth.default() is called if those routes lack any authentication config.
-     * The default auth strategy configuration can be accessed via server.auth.settings.default. To obtain the active
-     * authentication configuration of a route, use server.auth.lookup(request.route).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthdefaultoptions)
-     */
-    default(options: string | ServerAuthConfig): void;
-
-    /**
-     * Registers an authentication scheme where:
-     * @param name the scheme name.
-     * @param scheme - the method implementing the scheme with signature function(server, options) where:
-     * * server - a reference to the server object the scheme is added to.
-     * * options - (optional) the scheme options argument passed to server.auth.strategy() when instantiation a strategy.
-     * @return void.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme)
-     */
-    scheme(name: string, scheme: ServerAuthScheme): void;
-
-    /**
-     * Registers an authentication strategy where:
-     * @param name - the strategy name.
-     * @param scheme - the scheme name (must be previously registered using server.auth.scheme()).
-     * @param options - scheme options based on the scheme requirements.
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthstrategyname-scheme-options)
-     */
-    strategy(name: string, scheme: string, options?: object): void;
-
-    /**
-     * Tests a request against an authentication strategy where:
-     * @param strategy - the strategy name registered with server.auth.strategy().
-     * @param request - the request object.
-     * @return Return value: the authentication credentials object if authentication was successful, otherwise throws an error.
-     * Note that the test() method does not take into account the route authentication configuration. It also does not
-     * perform payload authentication. It is limited to the basic strategy authentication execution. It does not
-     * include verifying scope, entity, or other route properties.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverauthteststrategy-request)
-     */
-    test(strategy: string, request: Request): Promise<any>;
-
-}
-
diff --git a/types/hapi/definitions/server/server-cache.d.ts b/types/hapi/definitions/server/server-cache.d.ts
deleted file mode 100644
index 730f5e8675..0000000000
--- a/types/hapi/definitions/server/server-cache.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import * as catbox from "catbox";
-import {ServerOptionsCache} from "hapi";
-
-/**
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
- */
-export interface ServerCache {
-
-    /**
-     * Provisions a cache segment within the server cache facility where:
-     * @param options - [catbox policy](https://github.com/hapijs/catbox#policy) configuration where:
-     * * expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
-     * * expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
-     * * generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is async function(id, flags) where:
-     * - `id` - the `id` string or object provided to the `get()` method.
-     * - `flags` - an object used to pass back additional flags to the cache where:
-     * - `ttl` - the cache ttl value in milliseconds. Set to `0` to skip storing in the cache. Defaults to the cache global policy.
-     * * staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
-     * * staleTimeout - number of milliseconds to wait before checking if an item is stale.
-     * * generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests. Required if generateFunc is present. Set to false to disable timeouts which may cause all get() requests to get stuck forever.
-     * * generateOnReadError - if false, an upstream cache read error will stop the cache.get() method from calling the generate function and will instead pass back the cache error. Defaults to true.
-     * * generateIgnoreWriteError - if false, an upstream cache write error when calling cache.get() will be passed back with the generated value when calling. Defaults to true.
-     * * dropOnError - if true, an error or timeout in the generateFunc causes the stale value to be evicted from the cache. Defaults to true.
-     * * pendingGenerateTimeout - number of milliseconds while generateFunc call is in progress for a given id, before a subsequent generateFunc call is allowed. Defaults to 0 (no blocking of concurrent generateFunc calls beyond staleTimeout).
-     * * cache - the cache name configured in server.cache. Defaults to the default cache.
-     * * segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. When called within a server method, defaults to '#name' where 'name' is the server method name. Required when called outside of a plugin.
-     * * shared - if true, allows multiple cache provisions to share the same segment. Default to false.
-     * @return Catbox Policy.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
-     */
-    (options: ServerOptionsCache): catbox.Policy;
-
-    /**
-     * Provisions a server cache as described in server.cache where:
-     * @param options - same as the server cache configuration options.
-     * @return Return value: none.
-     * Note that if the server has been initialized or started, the cache will be automatically started to match the state of any other provisioned server cache.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-servercacheprovisionoptions)
-     */
-    provision(options: ServerOptionsCache): Promise<void>;
-
-}
diff --git a/types/hapi/definitions/server/server-events.d.ts b/types/hapi/definitions/server/server-events.d.ts
deleted file mode 100644
index b1e0c05405..0000000000
--- a/types/hapi/definitions/server/server-events.d.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import * as Podium from "podium";
-
-/**
- * an event name string.
- * an event options object.
- * a podium emitter object.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventevents)
- */
-export type ServerEventsApplication = string | ServerEventsApplicationObject | Podium;
-
-/**
- * Object that it will be used in Event
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventevents)
- */
-export interface ServerEventsApplicationObject {
-    /** the event name string (required). */
-    name: string;
-    /** a string or array of strings specifying the event channels available. Defaults to no channel restrictions (event updates can specify a channel or not). */
-    channels?: string | string[];
-    /** if true, the data object passed to server.events.emit() is cloned before it is passed to the listeners (unless an override specified by each listener). Defaults to false (data is passed as-is). */
-    clone?: boolean;
-    /** if true, the data object passed to server.event.emit() must be an array and the listener method is called with each array element passed as a separate argument (unless an override specified by each listener). This should only be used when the emitted data structure is known and predictable. Defaults to false (data is emitted as a single argument regardless of its type). */
-    spread?: boolean;
-    /** if true and the criteria object passed to server.event.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to the arguments list at the end. A configuration override can be set by each listener. Defaults to false. */
-    tags?: boolean;
-    /** if true, the same event name can be registered multiple times where the second registration is ignored. Note that if the registration config is changed between registrations, only the first configuration is used. Defaults to false (a duplicate registration will throw an error). */
-    shared?: boolean;
-}
-
-/**
- * A criteria object with the following optional keys (unless noted otherwise):
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventsoncriteria-listener)
- */
-export interface ServerEventCriteria {
-    /** (required) the event name string. */
-    name: string;
-    /** a string or array of strings specifying the event channels to subscribe to. If the event registration specified a list of allowed channels, the channels array must match the allowed channels. If channels are specified, event updates without any channel designation will not be included in the subscription. Defaults to no channels filter. */
-    channels?: string | string[];
-    /** if true, the data object passed to server.event.emit() is cloned before it is passed to the listener method. Defaults to the event registration option (which defaults to false). */
-    clone?: boolean;
-    /** a positive integer indicating the number of times the listener can be called after which the subscription is automatically removed. A count of 1 is the same as calling server.events.once(). Defaults to no limit. */
-    count?: number;
-    /**
-     * filter - the event tags (if present) to subscribe to which can be one of:
-     * * a tag string.
-     * * an array of tag strings.
-     * * an object with the following:
-     * * * tags - a tag string or array of tag strings.
-     * * * all - if true, all tags must be present for the event update to match the subscription. Defaults to false (at least one matching tag).
-     */
-    filter?: string | string[] | {tags: string | string[], all?: boolean};
-    /** if true, and the data object passed to server.event.emit() is an array, the listener method is called with each array element passed as a separate argument. This should only be used when the emitted data structure is known and predictable. Defaults to the event registration option (which defaults to false). */
-    spread?: boolean;
-    /** if true and the criteria object passed to server.event.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to the arguments list at the end. Defaults to the event registration option (which defaults to false). */
-    tags?: boolean;
-}
-
-/**
- * Access: podium public interface.
- * The server events emitter. Utilizes the podium with support for event criteria validation, channels, and filters.
- * Use the following methods to interact with server.events:
- * [server.event(events)](https://github.com/hapijs/hapi/blob/master/API.md#server.event()) - register application events.
- * [server.events.emit(criteria, data)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.emit()) - emit server events.
- * [server.events.on(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.on()) - subscribe to all events.
- * [server.events.once(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.once()) - subscribe to
- * Other methods include: server.events.removeListener(name, listener), server.events.removeAllListeners(name), and server.events.hasListeners(name).
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
- */
-export interface ServerEvents extends Podium {
-
-    /**
-     * Emits a custom application event to all the subscribed listeners where:
-     * @param criteria - the event update criteria which must be one of:
-     * * the event name string.
-     * * an object with the following optional keys (unless noted otherwise):
-     * * * name - the event name string (required).
-     * * * channel - the channel name string.
-     * * * tags - a tag string or array of tag strings.
-     * @param data - the value emitted to the subscribers. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners. If no listeners match the event, the data function is not invoked.
-     * @return Return value: none.
-     * Note that events must be registered before they can be emitted or subscribed to by calling server.event(events). This is done to detect event name misspelling and invalid event activities.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-servereventsemitcriteria-data)
-     */
-    emit(criteria: string, data: any | Function): Promise<void>;
-    emit(criteria: {name: string, channel?: string, tags?: string | string[]}, data: any): Promise<void>;
-
-    /**
-     * Subscribe to an event where:
-     * @param criteria - the subscription criteria which must be one of:
-     * * event name string which can be any of the built-in server events
-     * * a custom application event registered with server.event().
-     * * a criteria object
-     * @param listener - the handler method set to receive event updates. The function signature depends on the event argument, and the spread and tags options.
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventsoncriteria-listener)
-     * See ['log' event](https://github.com/hapijs/hapi/blob/master/API.md#-log-event)
-     * See ['request' event](https://github.com/hapijs/hapi/blob/master/API.md#-request-event)
-     * See ['response' event](https://github.com/hapijs/hapi/blob/master/API.md#-response-event)
-     * See ['route' event](https://github.com/hapijs/hapi/blob/master/API.md#-route-event)
-     * See ['start' event](https://github.com/hapijs/hapi/blob/master/API.md#-start-event)
-     * See ['stop' event](https://github.com/hapijs/hapi/blob/master/API.md#-stop-event)
-     */
-    on(criteria: string | ServerEventsApplicationObject | ServerEventCriteria, listener: Function): void;
-
-    /**
-     * Same as calling [server.events.on()](https://github.com/hapijs/hapi/blob/master/API.md#server.events.on()) with the count option set to 1.
-     * @param criteria - the subscription criteria which must be one of:
-     * * event name string which can be any of the built-in server events
-     * * a custom application event registered with server.event().
-     * * a criteria object
-     * @param listener - the handler method set to receive event updates. The function signature depends on the event argument, and the spread and tags options.
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventsoncecriteria-listener)
-     */
-    once(criteria: string | ServerEventsApplicationObject | ServerEventCriteria, listener: Function): void;
-
-    /**
-     * Same as calling server.events.on() with the count option set to 1.
-     * @param criteria - the subscription criteria which must be one of:
-     * * event name string which can be any of the built-in server events
-     * * a custom application event registered with server.event().
-     * * a criteria object
-     * @return Return value: a promise that resolves when the event is emitted.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-servereventsoncecriteria)
-     */
-    once(criteria: string | ServerEventsApplicationObject | ServerEventCriteria): Promise<any>;
-
-    /**
-     * The follow method is only mentioned in Hapi API. The doc about that method can be found [here](https://github.com/hapijs/podium/blob/master/API.md#podiumremovelistenername-listener)
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
-     */
-    removeListener(name: string, listener: Podium.Listener): Podium;
-
-    /**
-     * The follow method is only mentioned in Hapi API. The doc about that method can be found [here](https://github.com/hapijs/podium/blob/master/API.md#podiumremovealllistenersname)
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
-     */
-    removeAllListeners(name: string): Podium;
-
-    /**
-     * The follow method is only mentioned in Hapi API. The doc about that method can be found [here](https://github.com/hapijs/podium/blob/master/API.md#podiumhaslistenersname)
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
-     */
-    hasListeners(name: string): boolean;
-
-}
diff --git a/types/hapi/definitions/server/server-ext.d.ts b/types/hapi/definitions/server/server-ext.d.ts
deleted file mode 100644
index 8bd29cbb18..0000000000
--- a/types/hapi/definitions/server/server-ext.d.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import {Lifecycle, Server} from "hapi";
-
-/**
- * The extension point event name. The available extension points include the request extension points as well as the following server extension points:
- * 'onPreStart' - called before the connection listeners are started.
- * 'onPostStart' - called after the connection listeners are started.
- * 'onPreStop' - called before the connection listeners are stopped.
- * 'onPostStop' - called after the connection listeners are stopped.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle)
- */
-export type ServerExtType = 'onRequest' | 'onPreStart' | 'onPostStart' | 'onPreStop' | 'onPostStop'| 'onPreResponse';
-
-/**
- * The extension point event name for Request
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle)
- */
-export type ServerExtRequestType = '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:
- * @param events - an object or array of objects with the following:
- * * type - (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
- * * * 'onPreStart' - called before the connection listeners are started.
- * * * 'onPostStart' - called after the connection listeners are started.
- * * * 'onPreStop' - called before the connection listeners are stopped.
- * * * 'onPostStop' - called after the connection listeners are stopped.
- * * method - (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
- * * * server extension points: async function(server) where:
- * * * * server - the server object.
- * * * * this - the object provided via options.bind or the current active context set with server.bind().
- * * * request extension points: a lifecycle method.
- * * 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.
- * @return void
- */
-export interface ServerExtEventsObject {
-    /**
-     * (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
-     * * 'onPreStart' - called before the connection listeners are started.
-     * * 'onPostStart' - called after the connection listeners are started.
-     * * 'onPreStop' - called before the connection listeners are stopped.
-     */
-    type: ServerExtType;
-    /**
-     * (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
-     * * server extension points: async function(server) where:
-     * * * server - the server object.
-     * * * this - the object provided via options.bind or the current active context set with server.bind().
-     * * request extension points: a lifecycle method.
-     */
-    method: ServerExtPointFunction | ServerExtPointFunction[] | Function;
-    /**
-     * 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;
-}
-
-/**
- * [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:
- * @param events - an object or array of objects with the following:
- * * type - (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
- * * * 'onPreStart' - called before the connection listeners are started.
- * * * 'onPostStart' - called after the connection listeners are started.
- * * * 'onPreStop' - called before the connection listeners are stopped.
- * * * 'onPostStop' - called after the connection listeners are stopped.
- * * method - (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
- * * * server extension points: async function(server) where:
- * * * * server - the server object.
- * * * * this - the object provided via options.bind or the current active context set with server.bind().
- * * * request extension points: a lifecycle method.
- * * 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.
- * @return void
- */
-export interface ServerExtEventsRequestObject {
-    /**
-     * (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
-     * * 'onPreStart' - called before the connection listeners are started.
-     * * 'onPostStart' - called after the connection listeners are started.
-     * * 'onPreStop' - called before the connection listeners are stopped.
-     * * 'onPostStop' - called after the connection listeners are stopped.
-     */
-    type: ServerExtRequestType;
-    /**
-     * (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
-     * * server extension points: async function(server) where:
-     * * * server - the server object.
-     * * * this - the object provided via options.bind or the current active context set with server.bind().
-     * * request extension points: a lifecycle method.
-     */
-    method: Lifecycle.Method | Lifecycle.Method[];
-    /**
-     * (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 ServerExtPointFunction {
-    (server: Server): void;
-}
-
-/**
- * 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.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
- */
-export interface ServerExtOptions {
-    /**
-     * 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.
-     */
-    before: string | string[];
-    /**
-     * 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.
-     */
-    after: string | string[];
-    /**
-     * a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function.
-     */
-    bind: object;
-    /**
-     * 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.
-     */
-    sandbox?: 'server' | 'plugin';
-}
-
diff --git a/types/hapi/definitions/server/server-info.d.ts b/types/hapi/definitions/server/server-info.d.ts
deleted file mode 100644
index 399543e08e..0000000000
--- a/types/hapi/definitions/server/server-info.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverinfo)
- * An object containing information about the server where:
- */
-export interface ServerInfo {
-
-    /**
-     * a unique server identifier (using the format '{hostname}:{pid}:{now base36}').
-     */
-    id: string;
-
-    /**
-     * server creation timestamp.
-     */
-    created: number;
-
-    /**
-     * server start timestamp (0 when stopped).
-     */
-    started: number;
-
-    /**
-     * the connection [port](https://github.com/hapijs/hapi/blob/master/API.md#server.options.port) based on the following rules:
-     *  * before the server has been started: the configured port value.
-     *  * after the server has been started: the actual port assigned when no port is configured or was set to 0.
-     */
-    port: number | string;
-
-    /**
-     * The [host](https://github.com/hapijs/hapi/blob/master/API.md#server.options.host) configuration value.
-     */
-    host: string;
-
-    /**
-     * the active IP address the connection was bound to after starting. Set to undefined until the server has been
-     * started or when using a non TCP port (e.g. UNIX domain socket).
-     */
-    address: undefined | string;
-
-    /**
-     *  the protocol used:
-     * * 'http' - HTTP.
-     * * 'https' - HTTPS.
-     * * 'socket' - UNIX domain socket or Windows named pipe.
-     */
-    protocol: 'http' | 'https' | 'socket';
-
-    /**
-     * a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains
-     * the uri value if set, otherwise constructed from the available settings. If no port is configured or is set
-     * to 0, the uri will not include a port component until the server is started.
-     */
-    uri: string;
-
-}
diff --git a/types/hapi/definitions/server/server-inject.d.ts b/types/hapi/definitions/server/server-inject.d.ts
deleted file mode 100644
index 99789febfe..0000000000
--- a/types/hapi/definitions/server/server-inject.d.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import {AuthCredentials, PluginsStates, Request} from "hapi";
-import * as Shot from "shot";
-
-/**
- * An object with:
- * * method - (optional) the request HTTP method (e.g. 'POST'). Defaults to 'GET'.
- * * url - (required) the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.
- * * headers - (optional) an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default shot headers.
- * * payload - (optional) an string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.
- * * credentials - (optional) an credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.
- * * artifacts - (optional) an artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.
- * * app - (optional) sets the initial value of request.app, defaults to {}.
- * * plugins - (optional) sets the initial value of request.plugins, defaults to {}.
- * * allowInternals - (optional) allows access to routes with config.isInternal set to true. Defaults to false.
- * * remoteAddress - (optional) sets the remote address for the incoming connection.
- * * simulate - (optional) an object with options used to simulate client request stream conditions for testing:
- * * error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
- * * close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
- * * end - if false, does not end the stream. Defaults to true.
- * * split - indicates whether the request payload will be split into chunks. Defaults to undefined, meaning payload will not be chunked.
- * * validate - (optional) if false, the options inputs are not validated. This is recommended for run-time usage of inject() to make it perform faster where input validation can be tested separately.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinjectoptions)
- * For context [Shot module](https://github.com/hapijs/shot)
- */
-export interface ServerInjectOptions extends Shot.RequestOptions {
-    /**
-     * an credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.
-     */
-    credentials?: AuthCredentials;
-    /**
-     * (an artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.
-     */
-    artifacts?: object;
-    /**
-     * sets the initial value of request.app, defaults to {}.
-     */
-    app?: any;
-    /**
-     * sets the initial value of request.plugins, defaults to {}.
-     */
-    plugins?: PluginsStates;
-    /**
-     * allows access to routes with config.isInternal set to true. Defaults to false.
-     */
-    allowInternals?: boolean;
-}
-
-/**
- * A response object with the following properties:
- * * statusCode - the HTTP status code.
- * * headers - an object containing the headers set.
- * * payload - the response payload string.
- * * rawPayload - the raw response payload buffer.
- * * raw - an object with the injection request and response objects:
- * * req - the simulated node request object.
- * * res - the simulated node response object.
- * * result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
- * * request - the request object.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinjectoptions)
- * For context [Shot module](https://github.com/hapijs/shot)
- */
-export interface ServerInjectResponse extends Shot.ResponseObject {
-    /**
-     * the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
-     */
-    result: object | undefined;
-    /**
-     * the request object.
-     */
-    request: Request;
-}
diff --git a/types/hapi/definitions/server/server-method.d.ts b/types/hapi/definitions/server/server-method.d.ts
deleted file mode 100644
index 920560086a..0000000000
--- a/types/hapi/definitions/server/server-method.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import * as catbox from "catbox";
-
-/**
- * The method function with a signature async function(...args, [flags]) where:
- * * ...args - the method function arguments (can be any number of arguments or none).
- * * flags - when caching is enabled, an object used to set optional method result flags:
- * * * ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
- * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
- */
-export type ServerMethod = (...args: any[]) => Promise<any>;
-
-/**
- * The same cache configuration used in server.cache().
- * The generateTimeout option is required.
- * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
- * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
- */
-export interface ServerMethodCache extends catbox.PolicyOptions {
-    generateTimeout: number | false;
-}
-
-/**
- * Configuration object:
- * * bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is an arrow function.
- * * cache - the same cache configuration used in server.cache(). The generateTimeout option is required.
- * * generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the flags argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).
- * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
- */
-export interface ServerMethodOptions {
-    /**
-     * a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is an arrow function.
-     */
-    bind?: object;
-    /**
-     * the same cache configuration used in server.cache(). The generateTimeout option is required.
-     */
-    cache?: ServerMethodCache;
-    /**
-     * a function used to generate a unique key (for caching) from the arguments passed to the method function (the flags argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).
-     */
-    generateKey?: Function;
-}
-
-/**
- * An object or an array of objects where each one contains:
- * * name - the method name.
- * * method - the method function.
- * * options - (optional) settings.
- * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodmethods)
- */
-export interface ServerMethodConfigurationObject {
-    /**
-     * the method name.
-     */
-    name: string;
-    /**
-     * the method function.
-     */
-    method: ServerMethod;
-    /**
-     * (optional) settings.
-     */
-    options?: ServerMethodOptions;
-}
diff --git a/types/hapi/definitions/server/server-options-cache.d.ts b/types/hapi/definitions/server/server-options-cache.d.ts
deleted file mode 100644
index 1e75ebe857..0000000000
--- a/types/hapi/definitions/server/server-options-cache.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import * as Catbox from "catbox";
-
-/**
- * hapi uses catbox for its cache implementation which includes support for common storage solutions (e.g. Redis,
- * MongoDB, Memcached, Riak, among others). Caching is only utilized if methods and plugins explicitly store their state in the cache.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-cache)
- */
-export interface ServerOptionsCache extends Catbox.PolicyOptions {
-
-    /** a class, a prototype function, or a catbox engine object. */
-    engine?: Catbox.EnginePrototypeOrObject;
-
-    /** an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisioned as well. */
-    name?: string;
-
-    /** if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false. */
-    shared?: boolean;
-
-    /** (optional) string used to isolate cached data. Defaults to 'hapi-cache'. */
-    partition?: string;
-
-    /** other options passed to the catbox strategy used. Other options are only passed to catbox when engine above is a class or function and ignored if engine is a catbox engine object). */
-    [s: string]: any;
-
-}
diff --git a/types/hapi/definitions/server/server-options.d.ts b/types/hapi/definitions/server/server-options.d.ts
deleted file mode 100644
index 2f74c17bb4..0000000000
--- a/types/hapi/definitions/server/server-options.d.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import * as http from "http";
-import * as https from "https";
-import * as catbox from "catbox";
-import {MimosOptions} from "mimos";
-import {PluginSpecificConfiguration, RouteOptions, ServerOptionsCache} from "hapi";
-
-export interface ServerOptionsCompression {
-    minBytes: number;
-}
-
-/**
- * The server options control the behavior of the server object. Note that the options object is deeply cloned
- * (with the exception of listener which is shallowly copied) and should not contain any values that are unsafe to perform deep copy on.
- * All options are optionals.
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-server-options)
- */
-export interface ServerOptions {
-
-    /**
-     * Default value: '0.0.0.0' (all available network interfaces).
-     * Sets the hostname or IP address the server will listen on. If not configured, defaults to host if present, otherwise to all available network interfaces. Set to '127.0.0.1' or 'localhost' to restrict the server to only those coming from the same host.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsaddress)
-     */
-    address?: string;
-
-    /**
-     * Default value: {}.
-     * Provides application-specific configuration which can later be accessed via server.settings.app. The framework does not interact with this object. It is simply a reference made available anywhere a server reference is provided.
-     * Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsapp)
-     */
-    app?: any;
-
-    /**
-     * Default value: true.
-     * Used to disable the automatic initialization of the listener. When false, indicates that the listener will be started manually outside the framework.
-     * Cannot be set to true along with a port value.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsautolisten)
-     */
-    autoListen?: boolean;
-
-    /**
-     * Default value: { engine: require('catbox-memory' }.
-     * Sets up server-side caching providers. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities.
-     * hapi uses catbox for its cache implementation which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, Riak, among others). Caching is only utilized if methods and plugins explicitly store their state in the cache.
-     * The server cache configuration only defines the storage container itself. The configuration can be assigned one or more (array):
-     * * a class or prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')). A new catbox client will be created internally using this function.
-     * * a configuration object with the following:
-     * * * engine - a class, a prototype function, or a catbox engine object.
-     * * * name - an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisioned as well.
-     * * * shared - if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
-     * * * partition - (optional) string used to isolate cached data. Defaults to 'hapi-cache'.
-     * * * other options passed to the catbox strategy used. Other options are only passed to catbox when engine above is a class or function and ignored if engine is a catbox engine object).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionscache)
-     */
-    cache?: catbox.EnginePrototype | ServerOptionsCache | ServerOptionsCache[];
-
-    /**
-     * Default value: { minBytes: 1024 }.
-     * Defines server handling of content encoding requests. If false, response content encoding is disabled and no compression is performed by the server.
-     */
-    compression?: boolean | ServerOptionsCompression;
-
-    /**
-     * Default value: { request: ['implementation'] }.
-     * Determines which logged events are sent to the console. This should only be used for development and does not affect which events are actually logged internally and recorded. Set to false to disable all console logging, or to an object with:
-     * * log - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. Defaults to no output.
-     * * request - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. To display all request logs, set it to '*'. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.
-     * For example, to display all errors, set the log or request to ['error']. To turn off all output set the log or request to false. To display all server logs, set the log or request to '*'. To disable all debug information, set debug to false.
-     */
-    debug?: false | {
-        log?: string[] | false;
-        request?: string[] | false;
-    };
-
-    /**
-     * Default value: the operating system hostname and if not available, to 'localhost'.
-     * The public hostname or IP address. Used to set server.info.host and server.info.uri and as address is none provided.
-     */
-    host?: string;
-
-    /**
-     * Default value: none.
-     * An optional node HTTP (or HTTPS) http.Server object (or an object with a compatible interface).
-     * If the listener needs to be manually started, set autoListen to false.
-     * If the listener uses TLS, set tls to true.
-     */
-    listener?: http.Server;
-
-    /**
-     * Default value: { sampleInterval: 0 }.
-     * Server excessive load handling limits where:
-     * * sampleInterval - the frequency of sampling in milliseconds. When set to 0, the other load options are ignored. Defaults to 0 (no sampling).
-     * * maxHeapUsedBytes - maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).
-     * * maxRssBytes - maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).
-     * * maxEventLoopDelay - maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).
-     */
-    load?: {
-        /** the frequency of sampling in milliseconds. When set to 0, the other load options are ignored. Defaults to 0 (no sampling). */
-        sampleInterval?: number;
-        /** maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit). */
-        maxHeapUsedBytes?: number;
-        /** maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).*/
-        maxRssBytes?: number;
-        /** maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).*/
-        maxEventLoopDelay?: number;
-    };
-
-    /**
-     * Default value: none.
-     * Options passed to the mimos module when generating the mime database used by the server (and accessed via server.mime):
-     * * override - an object hash that is merged into the built in mime information specified here. Each key value pair represents a single mime object. Each override value must contain:
-     * * key - the lower-cased mime-type string (e.g. 'application/javascript').
-     * * value - an object following the specifications outlined here. Additional values include:
-     * * * type - specify the type value of result objects, defaults to key.
-     * * * predicate - method with signature function(mime) when this mime type is found in the database, this function will execute to allows customizations.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsmime)
-     */
-    mime?: MimosOptions;
-
-    /**
-     * Default value: {}.
-     * Plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state.
-     */
-    plugins?: PluginSpecificConfiguration;
-
-    /**
-     * Default value: 0 (an ephemeral port).
-     * The TCP port the server will listen to. Defaults the next available port when the server is started (and assigned to server.info.port).
-     * If port is a string containing a '/' character, it is used as a UNIX domain socket path. If it starts with '\.\pipe', it is used as a Windows named pipe.
-     */
-    port?: number | string;
-
-    /**
-     * Default value: { isCaseSensitive: true, stripTrailingSlash: false }.
-     * Controls how incoming request URIs are matched against the routing table:
-     * * isCaseSensitive - determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.
-     * * stripTrailingSlash - removes trailing slashes on incoming paths. Defaults to false.
-     */
-    router?: {
-        isCaseSensitive?: boolean;
-        stripTrailingSlash?: boolean;
-    };
-
-    /**
-     * Default value: none.
-     * A route options object used as the default configuration for every route.
-     */
-    routes?: RouteOptions;
-
-    /**
-     Default value:
-     {
-         strictHeader: true,
-         ignoreErrors: false,
-         isSecure: true,
-         isHttpOnly: true,
-         isSameSite: 'Strict',
-         encoding: 'none'
-     }
-     Sets the default configuration for every state (cookie) set explicitly via server.state() or implicitly (without definition) using the state configuration object.
-     */
-    // TODO I am not sure if I need to use all the server.state() definition (like the default value) OR only the options below. The v16 use "any" here.
-    // state?: ServerStateCookieOptions;
-    state?: {
-        strictHeader?: boolean,
-        ignoreErrors?: boolean,
-        isSecure?: boolean,
-        isHttpOnly?: boolean,
-        isSameSite?: false | 'Strict' | 'Lax',
-        encoding?: 'none' | 'base64' | 'base64json' | 'form' | 'iron'
-    };
-
-    /**
-     * Default value: none.
-     * Used to create an HTTPS connection. The tls object is passed unchanged to the node HTTPS server as described in the node HTTPS documentation.
-     */
-    tls?: true | https.RequestOptions;
-
-    /**
-     * Default value: constructed from runtime server information.
-     * The full public URI without the path (e.g. 'http://example.com:8080'). If present, used as the server server.info.uri, otherwise constructed from the server settings.
-     */
-    uri?: string;
-
-}
diff --git a/types/hapi/definitions/server/server-realm.d.ts b/types/hapi/definitions/server/server-realm.d.ts
deleted file mode 100644
index eb921a1699..0000000000
--- a/types/hapi/definitions/server/server-realm.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {PluginsStates} from "hapi";
-
-/**
- * The realm object contains sandboxed server settings specific to each plugin or authentication strategy. When registering a plugin or an authentication scheme, a server object reference is provided with a new server.realm container specific to that registration. It allows each plugin to maintain its own settings without leaking and affecting other plugins.
- * For example, a plugin can set a default file path for local resources without breaking other plugins' configured paths. When calling server.bind(), the active realm's settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
- * 
- * https://github.com/hapijs/hapi/blob/master/API.md#server.realm
- */
-export interface ServerRealm {
-    /** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes: */
-    modifiers: {
-        /** routes preferences: */
-        route: {
-            /** the route path prefix used by any calls to server.route() from the server. Note that if a prefix is used and the route path is set to '/', the resulting path will not include the trailing slash. */
-            prefix: string;
-            /** the route virtual host settings used by any calls to server.route() from the server. */
-            vhost: string;
-        }
-    };
-    /** the realm of the parent server object, or null for the root server. */
-    parent: ServerRealm | null;
-    /** the active plugin name (empty string if at the server root). */
-    plugin: string;
-    /** the plugin options object passed at registration. */
-    pluginOptions: object;
-    /** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
-    plugins: PluginsStates;
-    /** settings overrides */
-    settings: {
-        files: {
-            relativeTo: string;
-        };
-        bind: object;
-    };
-}
diff --git a/types/hapi/definitions/server/server-register.d.ts b/types/hapi/definitions/server/server-register.d.ts
deleted file mode 100644
index 313a3c164e..0000000000
--- a/types/hapi/definitions/server/server-register.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import {Plugin} from "hapi";
-
-/**
- * Registration options (different from the options passed to the registration function):
- * * once - if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the second time a plugin is registered on the server.
- * * routes - modifiers applied to each route added by the plugin:
- * * * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
- * * * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
- * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverregisterplugins-options)
- */
-export interface ServerRegisterOptions {
-    /**
-     * if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the second time a plugin is registered on the server.
-     */
-    once?: boolean;
-    /**
-     * modifiers applied to each route added by the plugin:
-     */
-    routes?: {
-        /**
-         * string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
-         */
-        prefix: string;
-        /**
-         * virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
-         */
-        vhost: string | string[];
-    };
-}
-
-/**
- * An object with the following:
- * * plugin - a plugin object.
- * * options - (optional) options passed to the plugin during registration.
- * * once - if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the second time a plugin is registered on the server.
- * * routes - modifiers applied to each route added by the plugin:
- * * * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
- * * * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
- * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverregisterplugins-options)
- *
- * The type parameter T is the type of the plugin configuration options.
- */
-export interface ServerRegisterPluginObject<T> extends ServerRegisterOptions {
-    /**
-     * a plugin object.
-     */
-    plugin: Plugin<T>;
-    /**
-     * options passed to the plugin during registration.
-     */
-    options?: T;
-}
-
-export interface ServerRegisterPluginObjectArray<T, U, V, W, X, Y, Z> extends Array<ServerRegisterPluginObject<T> | ServerRegisterPluginObject<U> | ServerRegisterPluginObject<V> | ServerRegisterPluginObject<W> | ServerRegisterPluginObject<X> | ServerRegisterPluginObject<Y> | ServerRegisterPluginObject<Z> | undefined> {
-    0: ServerRegisterPluginObject<T>;
-    1?: ServerRegisterPluginObject<U>;
-    2?: ServerRegisterPluginObject<V>;
-    3?: ServerRegisterPluginObject<W>;
-    4?: ServerRegisterPluginObject<X>;
-    5?: ServerRegisterPluginObject<Y>;
-    6?: ServerRegisterPluginObject<Z>;
-}
diff --git a/types/hapi/definitions/server/server-route.d.ts b/types/hapi/definitions/server/server-route.d.ts
deleted file mode 100644
index 7c9087bddd..0000000000
--- a/types/hapi/definitions/server/server-route.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import {Lifecycle, RouteOptions, Server, Util} from "hapi";
-
-export interface ServerRouteConfig {
-}
-
-/**
- * A route configuration object or an array of configuration objects where each object contains:
- * * path - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the server's router configuration. The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.
- * * method - (required) the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has the same result as adding the same route with different methods manually.
- * * vhost - (optional) a domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the header only (excluding the port). Defaults to all hosts.
- * * handler - (required when handler is not set) the route handler function called to generate the response after successful authentication and validation.
- * * options - additional route options. The options value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being added to and this is bound to the current realm's bind option.
- * * rules - route custom rules object. The object is passed to each rules processor registered with server.rules(). Cannot be used if route.options.rules is defined.
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrouteroute)
- */
-export interface ServerRoute {
-
-    /**
-     * (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the server's router configuration. The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.
-     * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrouteroute)
-     * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#path-parameters)
-     */
-    path: string;
-
-    /**
-     * (required) the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has the same result as adding the same route with different methods manually.
-     */
-    method: Util.HTTP_METHODS_PARTIAL | Util.HTTP_METHODS_PARTIAL[] | string | string[];
-
-    /**
-     * (optional) a domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the header only (excluding the port). Defaults to all hosts.
-     */
-    vhost?: string | string[];
-
-    /**
-     * (required when handler is not set) the route handler function called to generate the response after successful authentication and validation.
-     */
-    handler?: Lifecycle.Method | object;
-
-    /**
-     * additional route options. The options value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being added to and this is bound to the current realm's bind option.
-     */
-    options?: RouteOptions | ((server: Server) => RouteOptions);
-
-    /**
-     * route custom rules object. The object is passed to each rules processor registered with server.rules(). Cannot be used if route.options.rules is defined.
-     */
-    rules?: object;
-
-    /**
-     * Missing documentation. Exist only in examples and test files.
-     */
-    config?: ServerRouteConfig;
-
-}
diff --git a/types/hapi/definitions/server/server-state-options.d.ts b/types/hapi/definitions/server/server-state-options.d.ts
deleted file mode 100644
index f95eb4b794..0000000000
--- a/types/hapi/definitions/server/server-state-options.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Request } from "hapi";
-import { SealOptions, SealOptionsSub } from "iron";
-
-/**
- * Optional cookie settings
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstatename-options)
- */
-export interface ServerStateCookieOptions {
-    /** time-to-live in milliseconds. Defaults to null (session time-life - cookies are deleted when the browser is closed). */
-    ttl?: number | null;
-    /** sets the 'Secure' flag. Defaults to true. */
-    isSecure?: boolean;
-    /** sets the 'HttpOnly' flag. Defaults to true. */
-    isHttpOnly?: boolean;
-    /**
-     * sets the 'SameSite' flag. The value must be one of:
-     *  * false - no flag.
-     *  * 'Strict' - sets the value to 'Strict' (this is the default value).
-     *  * 'Lax' - sets the value to 'Lax'.
-     */
-    isSameSite?: false | 'Strict' | 'Lax';
-    /** the path scope. Defaults to null (no path). */
-    path?: string | null;
-    /** the domain scope. Defaults to null (no domain). */
-    domain?: string | null;
-    /**
-     * if present and the cookie was not received from the client or explicitly set by the route handler, the
-     * cookie is automatically added to the response with the provided value. The value can be
-     * a function with signature async function(request) where:
-     */
-    autoValue?(request: Request): void;
-    /**
-     * encoding performs on the provided value before serialization. Options are:
-     *  * 'none' - no encoding. When used, the cookie value must be a string. This is the default value.
-     *  * 'base64' - string value is encoded using Base64.
-     *  * 'base64json' - object value is JSON-stringified then encoded using Base64.
-     *  * 'form' - object value is encoded using the x-www-form-urlencoded method.
-     *  * 'iron' - Encrypts and sign the value using iron.
-     */
-    encoding?: 'none' | 'base64' | 'base64json' | 'form' | 'iron';
-    /**
-     * an object used to calculate an HMAC for cookie integrity validation. This does not provide privacy, only a mean
-     * to verify that the cookie value was generated by the server. Redundant when 'iron' encoding is used. Options are:
-     *  * integrity - algorithm options. Defaults to require('iron').defaults.integrity.
-     *  * password - password used for HMAC key generation (must be at least 32 characters long).
-     */
-    sign?: {
-        integrity?: SealOptionsSub;
-        password: string;
-    };
-    /** password used for 'iron' encoding (must be at least 32 characters long). */
-    password?: string;
-    /** options for 'iron' encoding. Defaults to require('iron').defaults. */
-    iron?: SealOptions;
-    /** if true, errors are ignored and treated as missing cookies. */
-    ignoreErrors?: boolean;
-    /** if true, automatically instruct the client to remove invalid cookies. Defaults to false. */
-    clearInvalid?: boolean;
-    /** if false, allows any cookie value including values in violation of RFC 6265. Defaults to true. */
-    strictHeader?: boolean;
-    /** used by proxy plugins (e.g. h2o2). */
-    passThrough?: any;
-}
diff --git a/types/hapi/definitions/server/server-state.d.ts b/types/hapi/definitions/server/server-state.d.ts
deleted file mode 100644
index 119e06073c..0000000000
--- a/types/hapi/definitions/server/server-state.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { ServerStateCookieOptions, Util } from "hapi";
-
-/**
- * A single object or an array of object where each contains:
- * * name - the cookie name.
- * * value - the cookie value.
- * * options - cookie configuration to override the server settings.
- */
-export interface ServerStateFormat {
-    name: string;
-    value: string;
-    options: ServerStateCookieOptions;
-}
-
-/**
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstatename-options)
- * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsstate)
- */
-export interface ServerState {
-    /**
-     * The server cookies manager.
-     * Access: read only and statehood public interface.
-     */
-    readonly states: object;
-
-    /**
-     * The server cookies manager settings. The settings are based on the values configured in [server.options.state](https://github.com/hapijs/hapi/blob/master/API.md#server.options.state).
-     */
-    readonly settings: ServerStateCookieOptions;
-
-    /**
-     * An object containing the configuration of each cookie added via [server.state()](https://github.com/hapijs/hapi/blob/master/API.md#server.state()) where each key is the
-     * cookie name and value is the configuration object.
-     */
-    readonly cookies: object;
-
-    /**
-     * An array containing the names of all configued cookies.
-     */
-    readonly names: string[];
-
-    /**
-     * Same as calling [server.state()](https://github.com/hapijs/hapi/blob/master/API.md#server.state()).
-     */
-    add(name: string, options?: ServerStateCookieOptions): void;
-
-    /**
-     * Formats an HTTP 'Set-Cookie' header based on the server.options.state where:
-     * @param cookies - a single object or an array of object where each contains:
-     * * name - the cookie name.
-     * * value - the cookie value.
-     * * options - cookie configuration to override the server settings.
-     * @return Return value: a header string.
-     * Note that this utility uses the server configuration but does not change the server state. It is provided for manual cookie formating (e.g. when headers are set manually).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-async-serverstatesformatcookies)
-     */
-    format(cookies: ServerStateFormat | ServerStateFormat[]): string;
-
-    /**
-     * Parses an HTTP 'Cookies' header based on the server.options.state where:
-     * @param header - the HTTP header.
-     * @return Return value: an object where each key is a cookie name and value is the parsed cookie.
-     * Note that this utility uses the server configuration but does not change the server state. It is provided for manual cookie parsing (e.g. when server parsing is disabled).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-async-serverstatesparseheader)
-     */
-    parse(header: string): Util.Dictionary<string>;
-}
diff --git a/types/hapi/definitions/server/server.d.ts b/types/hapi/definitions/server/server.d.ts
deleted file mode 100644
index 0133a35775..0000000000
--- a/types/hapi/definitions/server/server.d.ts
+++ /dev/null
@@ -1,563 +0,0 @@
-import * as http from "http";
-import * as zlib from "zlib";
-import * as Podium from "podium";
-import {
-    ApplicationState,
-    Lifecycle,
-    PayloadCompressionDecoderSettings,
-    Plugin,
-    PluginsListRegistered,
-    Request,
-    RequestRoute,
-    ResponseToolkit,
-    RouteCompressionEncoderSettings,
-    ServerAuth,
-    ServerCache,
-    ServerEvents,
-    ServerEventsApplication,
-    ServerExtEventsObject,
-    ServerExtEventsRequestObject,
-    ServerExtOptions,
-    ServerExtPointFunction,
-    ServerExtType,
-    ServerInfo,
-    ServerInjectOptions,
-    ServerInjectResponse,
-    ServerMethod,
-    ServerMethodConfigurationObject,
-    ServerMethodOptions,
-    ServerOptions,
-    ServerRealm,
-    ServerRegisterOptions,
-    ServerRegisterPluginObject,
-    ServerRegisterPluginObjectArray,
-    ServerRoute,
-    ServerState,
-    ServerStateCookieOptions,
-    Util,
-} from "hapi";
-
-/**
- * The server object is the main application container. The server manages all incoming requests along with all
- * the facilities provided by the framework. Each server supports a single connection (e.g. listen to port 80).
- * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#server)
- */
-export class Server extends Podium {
-
-    /**
-     * Creates a new server object
-     * @constructor
-     */
-    constructor();
-
-    /**
-     * Creates a new server object where:
-     * @constructor
-     * @param options server configuration object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptions)
-     */
-    constructor(options: ServerOptions);
-
-    /**
-     * Provides a safe place to store server-specific run-time application data without potential conflicts with
-     * the framework internals. The data can be accessed whenever the server is accessible.
-     * Initialized with an empty object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverapp)
-     */
-    app?: ApplicationState;
-
-    /**
-     * Server Auth: properties and methods
-     */
-    auth: ServerAuth;
-
-    /**
-     * Provides access to the decorations already applied to various framework interfaces. The object must not be
-     * modified directly, but only through server.decorate.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdecorations)
-     */
-    readonly decorations: {
-        /**
-         * decorations on the request object.
-         */
-        request: string[],
-        /**
-         * decorations on the response toolkit.
-         */
-        toolkit: string[],
-        /**
-         * decorations on the server object.
-         */
-        server: string[]
-    };
-
-    /**
-     * Register custom application events where:
-     * @param events must be one of:
-     * * an event name string.
-     * * an event options object with the following optional keys (unless noted otherwise):
-     * * * name - the event name string (required).
-     * * * channels - a string or array of strings specifying the event channels available. Defaults to no channel restrictions (event updates can specify a channel or not).
-     * * * clone - if true, the data object passed to server.events.emit() is cloned before it is passed to the listeners (unless an override specified by each listener). Defaults to false (data is passed as-is).
-     * * * spread - if true, the data object passed to server.event.emit() must be an array and the listener method is called with each array element passed as a separate argument (unless an override specified by each listener). This should only be used when the emitted data structure is known and predictable. Defaults to false (data is emitted as a single argument regardless of its type).
-     * * * tags - if true and the criteria object passed to server.event.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to the arguments list at the end. A configuration override can be set by each listener. Defaults to false.
-     * * * shared - if true, the same event name can be registered multiple times where the second registration is ignored. Note that if the registration config is changed between registrations, only the first configuration is used. Defaults to false (a duplicate registration will throw an error).
-     * * a podium emitter object.
-     * * an array containing any of the above.
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
-     */
-    event(events: ServerEventsApplication | ServerEventsApplication[]): void;
-
-    /**
-     * Access: podium public interface.
-     * The server events emitter. Utilizes the podium with support for event criteria validation, channels, and filters.
-     * Use the following methods to interact with server.events:
-     * [server.events.emit(criteria, data)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.emit()) - emit server events.
-     * [server.events.on(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.on()) - subscribe to all events.
-     * [server.events.once(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.once()) - subscribe to
-     * Other methods include: server.events.removeListener(name, listener), server.events.removeAllListeners(name), and server.events.hasListeners(name).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
-     */
-    events: ServerEvents;
-
-    /**
-     * An object containing information about the server where:
-     * * id - a unique server identifier (using the format '{hostname}:{pid}:{now base36}').
-     * * created - server creation timestamp.
-     * * started - server start timestamp (0 when stopped).
-     * * port - the connection port based on the following rules:
-     * * host - The host configuration value.
-     * * address - the active IP address the connection was bound to after starting. Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).
-     * * protocol - the protocol used:
-     * * 'http' - HTTP.
-     * * 'https' - HTTPS.
-     * * 'socket' - UNIX domain socket or Windows named pipe.
-     * * uri - a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri value if set, otherwise constructed from the available settings. If no port is configured or is set to 0, the uri will not include a port component until the server is started.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverinfo)
-     */
-    readonly info: ServerInfo;
-
-    /**
-     * Access: read only and listener public interface.
-     * The node HTTP server object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverlistener)
-     */
-    listener: http.Server;
-
-    /**
-     * An object containing the process load metrics (when load.sampleInterval is enabled):
-     * * eventLoopDelay - event loop delay milliseconds.
-     * * heapUsed - V8 heap usage.
-     * * rss - RSS memory usage.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverload)
-     */
-    readonly load: {
-        /**
-         * event loop delay milliseconds.
-         */
-        eventLoopDelay: number;
-        /**
-         * V8 heap usage.
-         */
-        heapUsed: number;
-        /**
-         * RSS memory usage.
-         */
-        rss: number;
-    };
-
-    /**
-     * Server methods are functions registered with the server and used throughout the application as a common utility.
-     * Their advantage is in the ability to configure them to use the built-in cache and share across multiple request
-     * handlers without having to create a common module.
-     * sever.methods is an object which provides access to the methods registered via server.method() where each
-     * server method name is an object property.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethods
-     */
-    readonly methods: Util.Dictionary<ServerMethod>;
-
-    /**
-     * Provides access to the server MIME database used for setting content-type information. The object must not be
-     * modified directly but only through the [mime](https://github.com/hapijs/hapi/blob/master/API.md#server.options.mime) server setting.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermime)
-     */
-    mime: any;
-
-    /**
-     * An object containing the values exposed by each registered plugin where each key is a plugin name and the values
-     * are the exposed properties by each plugin using server.expose(). Plugins may set the value of
-     * the server.plugins[name] object directly or via the server.expose() method.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverplugins)
-     */
-    plugins: any;
-
-    /**
-     * The realm object contains sandboxed server settings specific to each plugin or authentication strategy. When
-     * registering a plugin or an authentication scheme, a server object reference is provided with a new server.realm
-     * container specific to that registration. It allows each plugin to maintain its own settings without leaking
-     * and affecting other plugins.
-     * For example, a plugin can set a default file path for local resources without breaking other plugins' configured
-     * paths. When calling server.bind(), the active realm's settings.bind property is set which is then used by
-     * routes and extensions added at the same level (server root or plugin).
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrealm)
-     */
-    readonly realm: ServerRealm;
-
-    /**
-     * An object of the currently registered plugins where each key is a registered plugin name and the value is
-     * an object containing:
-     * * version - the plugin version.
-     * * name - the plugin name.
-     * * options - (optional) options passed to the plugin during registration.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverregistrations)
-     */
-    readonly registrations: PluginsListRegistered;
-
-    /**
-     * The server configuration object after defaults applied.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serversettings)
-     */
-    readonly settings: ServerOptions;
-
-    /**
-     * The server cookies manager.
-     * Access: read only and statehood public interface.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstates)
-     */
-    readonly states: ServerState;
-
-    /**
-     * A string indicating the listener type where:
-     * * 'socket' - UNIX domain socket or Windows named pipe.
-     * * 'tcp' - an HTTP listener.
-     */
-    readonly type: 'socket' | 'tcp';
-
-    /**
-     * The hapi module version number.
-     */
-    readonly version: string;
-
-    /**
-     * Sets a global context used as the default bind object when adding a route or an extension where:
-     * @param context - the object used to bind this in lifecycle methods such as the route handler and extension methods. The context is also made available as h.context.
-     * @return Return value: none.
-     * When setting a context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set. Ignored if the method being bound is an arrow function.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverbindcontext)
-     */
-    bind(context: object): void;
-
-    /**
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
-     */
-    cache: ServerCache;
-
-    /**
-     * Registers a custom content decoding compressor to extend the built-in support for 'gzip' and 'deflate' where:
-     * @param encoding - the decoder name string.
-     * @param decoder - a function using the signature function(options) where options are the encoding specific options configured in the route payload.compression configuration option, and the return value is an object compatible with the output of node's zlib.createGunzip().
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdecoderencoding-decoder)
-     */
-    decoder(encoding: string, decoder: ((options: PayloadCompressionDecoderSettings) => zlib.Gunzip)): void;
-
-    /**
-     * Extends various framework interfaces with custom methods where:
-     * @param type - the interface being decorated. Supported types:
-     * 'handler' - adds a new handler type to be used in routes handlers.
-     * 'request' - adds methods to the Request object.
-     * 'server' - adds methods to the Server object.
-     * 'toolkit' - adds methods to the response toolkit.
-     * @param property - the object decoration key name.
-     * @param method - the extension function or other value.
-     * @param options - (optional) supports the following optional settings:
-     * apply - when the type is 'request', if true, the method function is invoked using the signature function(request) where request is the current request object and the returned value is assigned as the decoration.
-     * extend - if true, overrides an existing decoration. The method must be a function with the signature function(existing) where:
-     * existing - is the previously set decoration method value.
-     * must return the new decoration function or value.
-     * cannot be used to extend handler decorations.
-     * @return void;
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdecoratetype-property-method-options)
-     */
-    decorate(type: 'request', property: string, method: ((request: Request) => Function), options?: {apply: true;  extend: false} ): void;
-    decorate(type: 'handler' | 'request' | 'server' | 'toolkit', property: string, method: Function, options?: {apply: boolean;  extend: boolean} ): void;
-
-    /**
-     * Used within a plugin to declare a required dependency on other plugins where:
-     * @param dependencies - a single string or an array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is initialized or started.
-     * @param after - (optional) a function that is called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is initialized or started. The function signature is async function(server) where:
-     * server - the server the dependency() method was called on.
-     * @return Return value: none.
-     * The after method is identical to setting a server extension point on 'onPreStart'.
-     * If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other).
-     * The method does not provide version dependency which should be implemented using npm peer dependencies.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdependencydependencies-after)
-     */
-    dependency(dependencies: string | string[], after?: ((server: Server) => void)): void;
-
-    /**
-     * Registers a custom content encoding compressor to extend the built-in support for 'gzip' and 'deflate' where:
-     * @param encoding - the encoder name string.
-     * @param encoder - a function using the signature function(options) where options are the encoding specific options configured in the route compression option, and the return value is an object compatible with the output of node's zlib.createGzip().
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverencoderencoding-encoder)
-     */
-    encoder(encoding: string, encoder: ((options: RouteCompressionEncoderSettings) => zlib.Gzip)): void;
-
-    /**
-     * Used within a plugin to expose a property via server.plugins[name] where:
-     * @param key - the key assigned (server.plugins[name][key]).
-     * @param value - the value assigned.
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverexposekey-value)
-     */
-    expose(key: string, value: any): void;
-
-    /**
-     * Merges an object into to the existing content of server.plugins[name] where:
-     * @param obj - the object merged into the exposed properties container.
-     * @return Return value: none.
-     * Note that all the properties of obj are deeply cloned into server.plugins[name], so avoid using this method
-     * for exposing large objects that may be expensive to clone or singleton objects such as database client
-     * objects. Instead favor server.expose(key, value), which only copies a reference to value.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverexposeobj)
-     */
-    expose(obj: object): void;
-
-    /**
-     * Registers an extension function in one of the request lifecycle extension points where:
-     * @param events - an object or array of objects with the following:
-     * * type - (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
-     * * * 'onPreStart' - called before the connection listeners are started.
-     * * * 'onPostStart' - called after the connection listeners are started.
-     * * * 'onPreStop' - called before the connection listeners are stopped.
-     * * * 'onPostStop' - called after the connection listeners are stopped.
-     * * method - (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
-     * * * server extension points: async function(server) where:
-     * * * * server - the server object.
-     * * * * this - the object provided via options.bind or the current active context set with server.bind().
-     * * * request extension points: a lifecycle method.
-     * * 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.
-     * @return void
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
-     */
-    ext(events: ServerExtEventsObject | ServerExtEventsObject[]): void;
-    ext(events: ServerExtEventsRequestObject | ServerExtEventsRequestObject[]): void;
-
-    /**
-     * Registers a single extension event using the same properties as used in server.ext(events), but passed as arguments.
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevent-method-options)
-     */
-    ext(event: ServerExtType, method: ServerExtPointFunction | Lifecycle.Method | Function, options?: ServerExtOptions): void;
-
-    /**
-     * Initializes the server (starts the caches, finalizes plugin registration) but does not start listening on the connection port.
-     * @return Return value: none.
-     * Note that if the method fails and throws an error, the server is considered to be in an undefined state and
-     * should be shut down. In most cases it would be impossible to fully recover as the various plugins, caches, and
-     * other event listeners will get confused by repeated attempts to start the server or make assumptions about the
-     * healthy state of the environment. It is recommended to abort the process when the server fails to start properly.
-     * If you must try to resume after an error, call server.stop() first to reset the server state.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinitialize)
-     */
-    initialize(): Promise<void>;
-
-    /**
-     * Injects a request into the server simulating an incoming HTTP request without making an actual socket connection. Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead and limitations of the network stack.
-     * The method utilizes the shot module for performing injections, with some additional options and response properties:
-     * @param options - can be assigned a string with the requested URI, or an object with:
-     * * method - (optional) the request HTTP method (e.g. 'POST'). Defaults to 'GET'.
-     * * url - (required) the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.
-     * * headers - (optional) an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default shot headers.
-     * * payload - (optional) an string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.
-     * * credentials - (optional) an credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.
-     * * artifacts - (optional) an artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.
-     * * app - (optional) sets the initial value of request.app, defaults to {}.
-     * * plugins - (optional) sets the initial value of request.plugins, defaults to {}.
-     * * allowInternals - (optional) allows access to routes with config.isInternal set to true. Defaults to false.
-     * * remoteAddress - (optional) sets the remote address for the incoming connection.
-     * * simulate - (optional) an object with options used to simulate client request stream conditions for testing:
-     * * error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
-     * * close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
-     * * end - if false, does not end the stream. Defaults to true.
-     * * split - indicates whether the request payload will be split into chunks. Defaults to undefined, meaning payload will not be chunked.
-     * * validate - (optional) if false, the options inputs are not validated. This is recommended for run-time usage of inject() to make it perform faster where input validation can be tested separately.
-     * @return Return value: a response object with the following properties:
-     * * statusCode - the HTTP status code.
-     * * headers - an object containing the headers set.
-     * * payload - the response payload string.
-     * * rawPayload - the raw response payload buffer.
-     * * raw - an object with the injection request and response objects:
-     * * req - the simulated node request object.
-     * * res - the simulated node response object.
-     * * result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
-     * * request - the request object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinjectoptions)
-     */
-    inject(options: string | ServerInjectOptions): Promise<ServerInjectResponse>;
-
-    /**
-     * Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
-     * @param tags - (required) a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
-     * @param data - (optional) an message string or object with the application data being logged. If data is a function, the function signature is function() and it called once to generate (return value) the actual data emitted to the listeners. If no listeners match the event, the data function is not invoked.
-     * @param timestamp - (optional) an timestamp expressed in milliseconds. Defaults to Date.now() (now).
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverlogtags-data-timestamp)
-     */
-    log(tags: string | string[], data?: string | object | (() => any), timestamp?: number): void;
-
-    /**
-     * Looks up a route configuration where:
-     * @param id - the route identifier.
-     * @return Return value: the route information if found, otherwise null.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverlookupid)
-     */
-    lookup(id: string): RequestRoute | null;
-
-    /**
-     * Looks up a route configuration where:
-     * @param method - the HTTP method (e.g. 'GET', 'POST').
-     * @param path - the requested path (must begin with '/').
-     * @param host - (optional) hostname (to match against routes with vhost).
-     * @return Return value: the route information if found, otherwise null.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermatchmethod-path-host)
-     */
-    match(method: Util.HTTP_METHODS, path: string, host?: string): RequestRoute | null;
-
-    /**
-     * Registers a server method where:
-     * @param name - a unique method name used to invoke the method via server.methods[name].
-     * @param method - the method function with a signature async function(...args, [flags]) where:
-     * * ...args - the method function arguments (can be any number of arguments or none).
-     * * flags - when caching is enabled, an object used to set optional method result flags:
-     * * * ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
-     * @param options - (optional) configuration object:
-     * * bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is an arrow function.
-     * * cache - the same cache configuration used in server.cache(). The generateTimeout option is required.
-     * * generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the flags argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).
-     * @return Return value: none.
-     * Method names can be nested (e.g. utils.users.get) which will automatically create the full path under server.methods (e.g. accessed via server.methods.utils.users.get).
-     * When configured with caching enabled, server.methods[name].cache is assigned an object with the following properties and methods: - await drop(...args) - a function that can be used to clear the cache for a given key. - stats - an object with cache statistics, see catbox for stats documentation.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
-     */
-    method(name: string, method: ServerMethod, options?: ServerMethodOptions): void;
-
-    /**
-     * Registers a server method function as described in server.method() using a configuration object where:
-     * @param methods - an object or an array of objects where each one contains:
-     * * name - the method name.
-     * * method - the method function.
-     * * options - (optional) settings.
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodmethods)
-     */
-    method(methods: ServerMethodConfigurationObject | ServerMethodConfigurationObject[]): void;
-
-    /**
-     * Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
-     * @param relativeTo - the path prefix added to any relative file path starting with '.'.
-     * @return Return value: none.
-     * Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the server default route configuration files.relativeTo settings is used. The path only applies to routes added after it has been set.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverpathrelativeto)
-     */
-    path(relativeTo: string): void;
-
-    /**
-     * Registers a plugin where:
-     * @param plugins - one or an array of:
-     * * a plugin object.
-     * * an object with the following:
-     * * * plugin - a plugin object.
-     * * * options - (optional) options passed to the plugin during registration.
-     * * * once, routes - (optional) plugin-specific registration options as defined below.
-     * @param options - (optional) registration options (different from the options passed to the registration function):
-     * * once - if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the second time a plugin is registered on the server.
-     * * routes - modifiers applied to each route added by the plugin:
-     * * * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
-     * * * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverregisterplugins-options)
-     */
-    register(plugins: Plugin<any> | Plugin<any>[], options?: ServerRegisterOptions): Promise<void>;
-    register<T, U, V, W, X, Y, Z>(plugins: ServerRegisterPluginObject<T> | ServerRegisterPluginObjectArray<T, U, V, W, X, Y, Z>, options?: ServerRegisterOptions): Promise<void>;
-
-    /**
-     * Adds a route where:
-     * @param route - a route configuration object or an array of configuration objects where each object contains:
-     * * path - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the server's router configuration. The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.
-     * * method - (required) the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has the same result as adding the same route with different methods manually.
-     * * vhost - (optional) a domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the header only (excluding the port). Defaults to all hosts.
-     * * handler - (required when handler is not set) the route handler function called to generate the response after successful authentication and validation.
-     * * options - additional route options. The options value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being added to and this is bound to the current realm's bind option.
-     * * rules - route custom rules object. The object is passed to each rules processor registered with server.rules(). Cannot be used if route.options.rules is defined.
-     * @return Return value: none.
-     * Note that the options object is deeply cloned (with the exception of bind which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrouteroute)
-     */
-    route(route: ServerRoute | ServerRoute[]): void;
-
-    /**
-     * Defines a route rules processor for converting route rules object into route configuration where:
-     * @param processor - a function using the signature function(rules, info) where:
-     * * rules -
-     * * info - an object with the following properties:
-     * * * method - the route method.
-     * * * path - the route path.
-     * * * vhost - the route virtual host (if any defined).
-     * * returns a route config object.
-     * @param options - optional settings:
-     * * validate - rules object validation:
-     * * * schema - joi schema.
-     * * * options - optional joi validation options. Defaults to { allowUnknown: true }.
-     * Note that the root server and each plugin server instance can only register one rules processor. If a route is added after the rules are configured, it will not include the rules config. Routes added by plugins apply the rules to each of the parent realms' rules from the root to the route's realm. This means the processor defined by the plugin override the config generated by the root processor if they overlap. The route config overrides the rules config if the overlap.
-     * @return void
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrulesprocessor-options)
-     */
-    rules(processor: (rules: object, info: {method: string, path: string, vhost?: string}) => object, options?: {validate: object}): void; // TODO needs implementation
-
-    /**
-     * Starts the server by listening for incoming requests on the configured port (unless the connection was configured with autoListen set to false).
-     * @return Return value: none.
-     * Note that if the method fails and throws an error, the server is considered to be in an undefined state and should be shut down. In most cases it would be impossible to fully recover as the various plugins, caches, and other event listeners will get confused by repeated attempts to start the server or make assumptions about the healthy state of the environment. It is recommended to abort the process when the server fails to start properly. If you must try to resume after an error, call server.stop() first to reset the server state.
-     * If a started server is started again, the second call to server.start() is ignored. No events will be emitted and no extension points invoked.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverstart)
-     */
-    start(): Promise<void>;
-
-    /**
-     * HTTP state management uses client cookies to persist a state across multiple requests.
-     * @param name - the cookie name string.
-     * @param options - are the optional cookie settings
-     * @return Return value: none.
-     * State defaults can be modified via the server default state configuration option.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstatename-options)
-     */
-    state(name: string, options?: ServerStateCookieOptions): void;
-
-    /**
-     * Stops the server's listener by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
-     * @param options - (optional) object with:
-     * * timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
-     * @return Return value: none.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverstopoptions)
-     */
-    stop(options?: {timeout: number}): Promise<void>;
-
-    /**
-     * Returns a copy of the routing table where:
-     * @param host - (optional) host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-     * @return Return value: an array of routes where each route contains:
-     * * settings - the route config with defaults applied.
-     * * method - the HTTP method in lower case.
-     * * path - the route path.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servertablehost)
-     */
-    table(host?: string): {settings: ServerRoute; method: Util.HTTP_METHODS_PARTIAL_LOWERCASE, path: string}[]; // TODO I am not sure if the ServerRoute is the object expected here
-
-}
diff --git a/types/hapi/definitions/util/common.d.ts b/types/hapi/definitions/util/common.d.ts
deleted file mode 100644
index 3873cc6900..0000000000
--- a/types/hapi/definitions/util/common.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/**
- *  User-extensible type for application specific state.
- */
-export interface ApplicationState {	
-}
-
-export type PeekListener = (chunk: string, encoding: string) => void;
\ No newline at end of file
diff --git a/types/hapi/definitions/util/json.d.ts b/types/hapi/definitions/util/json.d.ts
deleted file mode 100644
index 116f6bdf9a..0000000000
--- a/types/hapi/definitions/util/json.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-export namespace Json {
-
-    /**
-     * @see {@link https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#The_replacer_parameter}
-     */
-    export type StringifyReplacer = ((key: string, value: any) => any) | (string | number)[] | undefined;
-
-    /**
-     * Any value greater than 10 is truncated.
-     */
-    export type StringifySpace = number | string;
-
-    /**
-     * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsjson)
-     */
-    export interface StringifyArguments {
-        /** the replacer function or array. Defaults to no action. */
-        replacer?: StringifyReplacer;
-        /** number of spaces to indent nested object keys. Defaults to no indentation. */
-        space?: StringifySpace;
-        /** tring suffix added after conversion to JSON string. Defaults to no suffix. **/
-        suffix?: string;
-        /** calls Hoek.jsonEscape() after conversion to JSON string. Defaults to false. **/
-        escape?: boolean;
-    }
-
-}
diff --git a/types/hapi/definitions/util/lifecycle.d.ts b/types/hapi/definitions/util/lifecycle.d.ts
deleted file mode 100644
index 35f347dcd5..0000000000
--- a/types/hapi/definitions/util/lifecycle.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import * as Boom from "boom";
-import * as stream from "stream";
-import {Request, ResponseToolkit} from "hapi";
-
-export namespace Lifecycle {
-
-    /**
-     * Lifecycle methods are the interface between the framework and the application. Many of the request lifecycle steps:
-     * extensions, authentication, handlers, pre-handler methods, and failAction function values are lifecyle methods
-     * provided by the developer and executed by the framework.
-     * Each lifecycle method is a function with the signature await function(request, h, [err]) where:
-     * * request - the request object.
-     * * h - the response toolkit the handler must call to set a response and return control back to the framework.
-     * * err - an error object availble only when the method is used as a failAction value.
-     */
-    export interface Method {
-        (request: Request, h: ResponseToolkit): ReturnValue;
-        (request: Request, h: ResponseToolkit, err: Error): ReturnValue;
-    }
-
-    /**
-     * Each lifecycle method must return a value or a promise that resolves into a value. If a lifecycle method returns
-     * without a value or resolves to an undefined value, an Internal Server Error (500) error response is sent.
-     * The return value must be one of:
-     * * Plain value: null, string, number, boolean
-     * * Buffer object
-     * * Error object: plain Error OR a Boom object.
-     * * Stream object
-     * * any object or array
-     * * a toolkit signal:
-     * * a toolkit method response:
-     * * a promise object that resolve to any of the above values
-     * For more info please [See docs](https://github.com/hapijs/hapi/blob/master/API.md#lifecycle-methods)
-     */
-    export type ReturnValue = ReturnValueTypes | (Promise<ReturnValueTypes>);
-    export type ReturnValueTypes =
-        (null | string | number | boolean) |
-        (Buffer) |
-        (Error | Boom.BoomError) |
-        (stream.Stream) |
-        (object | object[]) |
-        Object |
-        ResponseToolkit;
-
-    /**
-     * Various configuration options allows defining how errors are handled. For example, when invalid payload is received or malformed cookie, instead of returning an error, the framework can be configured to perform another action. When supported the failAction option supports the following values:
-     * * 'error' - return the error object as the response.
-     * * 'log' - report the error but continue processing the request.
-     * * 'ignore' - take no action and continue processing the request.
-     * * a lifecycle method with the signature async function(request, h, err) where:
-     * * * request - the request object.
-     * * * h - the response toolkit.
-     * * * err - the error object.
-     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-failaction-configuration)
-     */
-    export type FailAction = 'error' | 'log' | 'ignore' | Method;
-
-}
-
diff --git a/types/hapi/definitions/util/util.d.ts b/types/hapi/definitions/util/util.d.ts
deleted file mode 100644
index fc9bc97a7c..0000000000
--- a/types/hapi/definitions/util/util.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export namespace Util {
-    interface Dictionary<T> {
-        [key: string]: T;
-    }
-    type HTTP_METHODS_PARTIAL_LOWERCASE = 'get' | 'post' | 'put' | 'patch' | 'delete' | 'options';
-    type HTTP_METHODS_PARTIAL = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | HTTP_METHODS_PARTIAL_LOWERCASE;
-    type HTTP_METHODS = 'HEAD' | 'head' | HTTP_METHODS_PARTIAL;
-}
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 46d4d07ca3..f65cee14d4 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -18,54 +18,3869 @@
 
 /// <reference types="node" />
 
-/** PLUGIN */
-export * from './definitions/plugin/plugin';
-export * from './definitions/plugin/plugin-registered';
+import * as Boom from "boom";
+import * as catbox from "catbox";
+import * as http from "http";
+import * as https from "https";
+import * as Shot from "shot";
+import * as stream from "stream";
+import * as url from "url";
+import * as zlib from "zlib";
 
-/** REQUEST */
-export * from './definitions/request/request';
-export * from './definitions/request/request-auth';
-export * from './definitions/request/request-events';
-export * from './definitions/request/request-info';
-export * from './definitions/request/request-route';
+import { MimosOptions } from "mimos";
+import { SealOptions, SealOptionsSub } from "iron";
+import { AnySchema, ValidationOptions } from "joi";
+import Podium = require("podium");
 
-/** RESPONSE */
-export * from './definitions/response/response-events';
-export * from './definitions/response/response-object';
-export * from './definitions/response/response-settings';
-export * from './definitions/response/response-toolkit';
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                      Plugin                                               +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 
-/** ROUTE */
-export * from './definitions/route/route-options';
-export * from './definitions/route/route-options-access';
-export * from './definitions/route/route-options-cache';
-export * from './definitions/route/route-options-cors';
-export * from './definitions/route/route-options-payload';
-export * from './definitions/route/route-options-pre';
-export * from './definitions/route/route-options-response';
-export * from './definitions/route/route-options-secure';
-export * from './definitions/route/route-options-validate';
+/**
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverregistrations)
+ */
 
-/** SERVER */
-export * from './definitions/server/server';
-export * from './definitions/server/server-auth';
-export * from './definitions/server/server-auth-scheme';
-export * from './definitions/server/server-cache';
-export * from './definitions/server/server-events';
-export * from './definitions/server/server-ext';
-export * from './definitions/server/server-info';
-export * from './definitions/server/server-inject';
-export * from './definitions/server/server-method';
-export * from './definitions/server/server-options';
-export * from './definitions/server/server-options-cache';
-export * from './definitions/server/server-realm';
-export * from './definitions/server/server-register';
-export * from './definitions/server/server-route';
-export * from './definitions/server/server-state';
-export * from './definitions/server/server-state-options';
+/* tslint:disable-next-line:no-empty-interface */
+export interface PluginsListRegistered {
+}
 
-/** UTIL */
-export * from './definitions/util/common';
-export * from './definitions/util/json';
-export * from './definitions/util/lifecycle';
-export * from './definitions/util/util';
+/**
+ * An object of the currently registered plugins where each key is a registered plugin name and the value is an
+ * object containing:
+ * * version - the plugin version.
+ * * name - the plugin name.
+ * * options - (optional) options passed to the plugin during registration.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverregistrations)
+ */
+export interface PluginRegistered {
+    /**
+     * the plugin version.
+     */
+    version: string;
+
+    /**
+     * the plugin name.
+     */
+    name: string;
+
+    /**
+     * options used to register the plugin.
+     */
+    options: object;
+}
+
+/* tslint:disable-next-line:no-empty-interface */
+export interface PluginsStates {
+}
+
+/* tslint:disable-next-line:no-empty-interface */
+export interface PluginSpecificConfiguration {
+}
+
+export interface PluginNameVersion {
+    /**
+     * (required) the plugin name string. The name is used as a unique key. Published plugins (e.g. published in the npm
+     * registry) should use the same name as the name field in their 'package.json' file. Names must be
+     * unique within each application.
+     */
+    name: string;
+
+    /**
+     * optional plugin version. The version is only used informatively to enable other plugins to find out the versions loaded. The version should be the same as the one specified in the plugin's
+     * 'package.json' file.
+     */
+    version?: string;
+}
+
+export interface PluginPackage {
+    /**
+     * Alternatively, the name and version can be included via the pkg property containing the 'package.json' file for the module which already has the name and version included
+     */
+    pkg: any;
+}
+
+/**
+ * Plugins provide a way to organize application code by splitting the server logic into smaller components. Each
+ * plugin can manipulate the server through the standard server interface, but with the added ability to sandbox
+ * certain properties. For example, setting a file path in one plugin doesn't affect the file path set
+ * in another plugin.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#plugins)
+ *
+ * The type T is the type of the plugin options.
+ */
+export interface PluginBase<T> {
+    /**
+     * (required) the registration function with the signature async function(server, options) where:
+     * * 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>;
+
+    /** (optional) if true, allows the plugin to be registered multiple times with the same server. Defaults to false. */
+    multiple?: boolean;
+
+    /** (optional) a string or an array of strings indicating a plugin dependency. Same as setting dependencies via server.dependency(). */
+    dependencies?: string | string[];
+
+    /** once - (optional) if true, will only register the plugin once per server. If set, overrides the once option passed to server.register(). Defaults to no override. */
+    once?: boolean;
+}
+
+export type Plugin<T> = PluginBase<T> & (PluginNameVersion | PluginPackage);
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                      Request                                              +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+/**
+ * User-extensible type for request.auth credentials.
+ */
+
+/* tslint:disable-next-line:no-empty-interface */
+export interface AuthCredentials {
+}
+
+/**
+ * Authentication information:
+ * * artifacts - an artifact object received from the authentication strategy and used in authentication-related actions.
+ * * credentials - the credential object received during the authentication process. The presence of an object does not mean successful authentication.
+ * * error - the authentication error is failed and mode set to 'try'.
+ * * isAuthenticated - true if the request has been successfully authenticated, otherwise false.
+ * * isAuthorized - true is the request has been successfully authorized against the route authentication access configuration. If the route has not access rules defined or if the request failed
+ * authorization, set to false.
+ * * mode - the route authentication mode.
+ * * strategy - the name of the strategy used.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestauth)
+ */
+export interface RequestAuth {
+    /** an artifact object received from the authentication strategy and used in authentication-related actions. */
+    artifacts: object;
+    /** the credential object received during the authentication process. The presence of an object does not mean successful authentication. */
+    credentials: AuthCredentials;
+    /** the authentication error is failed and mode set to 'try'. */
+    error: Error;
+    /** true if the request has been successfully authenticated, otherwise false. */
+    isAuthenticated: boolean;
+    /**
+     * true is the request has been successfully authorized against the route authentication access configuration. If the route has not access rules defined or if the request failed authorization,
+     * set to false.
+     */
+    isAuthorized: boolean;
+    /** the route authentication mode. */
+    mode: string;
+    /** the name of the strategy used. */
+    strategy: string;
+}
+
+/**
+ * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+ * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+ * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
+ */
+export type RequestEventType = "peek" | "finish" | "disconnect";
+
+/**
+ * Access: read only and the public podium interface.
+ * The request.events supports the following events:
+ * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+ * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+ * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
+ */
+export interface RequestEvents extends Podium {
+    /**
+     * Access: read only and the public podium interface.
+     * The request.events supports the following events:
+     * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+     * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+     * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
+     */
+    on(criteria: "peek", listener: PeekListener): void;
+
+    on(criteria: "finish" | "disconnect", listener: (data: undefined) => void): void;
+
+    /**
+     * Access: read only and the public podium interface.
+     * The request.events supports the following events:
+     * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+     * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+     * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
+     */
+    once(criteria: "peek", listener: PeekListener): void;
+
+    once(criteria: "finish" | "disconnect", listener: (data: undefined) => void): void;
+}
+
+/**
+ * Request information:
+ * * acceptEncoding - the request preferred encoding.
+ * * cors - if CORS is enabled for the route, contains the following:
+ * * isOriginMatch - true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only
+ * available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
+ * * host - content of the HTTP 'Host' header (e.g. 'example.com:8080').
+ * * hostname - the hostname part of the 'Host' header (e.g. 'example.com').
+ * * id - a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').
+ * * received - request reception timestamp.
+ * * referrer - content of the HTTP 'Referrer' (or 'Referer') header.
+ * * remoteAddress - remote client IP address.
+ * * remotePort - remote client port.
+ * * responded - request response timestamp (0 is not responded yet).
+ * Note that the request.info object is not meant to be modified.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestinfo)
+ */
+export interface RequestInfo {
+    /** the request preferred encoding. */
+    acceptEncoding: string;
+    /** if CORS is enabled for the route, contains the following: */
+    cors: {
+        /**
+         * true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after
+         * the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
+         */
+        isOriginMatch?: boolean;
+    };
+    /** content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
+    host: string;
+    /** the hostname part of the 'Host' header (e.g. 'example.com'). */
+    hostname: string;
+    /** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}') */
+    id: string;
+    /** request reception timestamp. */
+    received: number;
+    /** content of the HTTP 'Referrer' (or 'Referer') header. */
+    referrer: string;
+    /** remote client IP address. */
+    remoteAddress: string;
+    /** remote client port. */
+    remotePort: string;
+    /** request response timestamp (0 is not responded yet). */
+    responded: number;
+}
+
+/**
+ * The request route information object, where:
+ * * method - the route HTTP method.
+ * * path - the route path.
+ * * vhost - the route vhost option if configured.
+ * * realm - the active realm associated with the route.
+ * * settings - the route options object with all defaults applied.
+ * * fingerprint - the route internal normalized string representing the normalized path.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestroute)
+ */
+export interface RequestRoute {
+    /** the route HTTP method. */
+    method: Util.HTTP_METHODS_PARTIAL;
+
+    /** the route path. */
+    path: string;
+
+    /** the route vhost option if configured. */
+    vhost?: string | string[];
+
+    /** the active realm associated with the route. */
+    realm: ServerRealm;
+
+    /** the route options object with all defaults applied. */
+    settings: RouteOptions;
+
+    /** the route internal normalized string representing the normalized path. */
+    fingerprint: string;
+
+    auth: {
+        /**
+         * Validates a request against the route's authentication access configuration, where:
+         * @param request - the request object.
+         * @return Return value: true if the request would have passed the route's access requirements.
+         * Note that the route's authentication mode and strategies are ignored. The only match is made between the request.auth.credentials scope and entity information and the route access
+         *     configuration. If the route uses dynamic scopes, the scopes are constructed against the request.query, request.params, request.payload, and request.auth.credentials which may or may
+         *     not match between the route and the request's route. If this method is called using a request that has not been authenticated (yet or not at all), it will return false if the route
+         *     requires any authentication.
+         * [See docs](https://hapijs.com/api/17.0.1#-requestrouteauthaccessrequest)
+         */
+        access(request: Request): boolean;
+    };
+}
+
+/**
+ * An object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestorig)
+ */
+export interface RequestOrig {
+    params: object;
+    query: object;
+    payload: object;
+}
+
+export interface RequestLog {
+    request: string;
+    timestamp: number;
+    tags: string[];
+    data: string | object;
+    channel: string;
+}
+
+/**
+ * The request object is created internally for each incoming request. It is not the same object received from the node
+ * HTTP server callback (which is available via [request.raw.req](https://github.com/hapijs/hapi/blob/master/API.md#request.raw)). The request properties change throughout
+ * the request [lifecycle](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle).
+ */
+export interface Request extends Podium {
+    /**
+     * Application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestapp)
+     */
+    app: ApplicationState;
+
+    /**
+     * Authentication information:
+     * * artifacts - an artifact object received from the authentication strategy and used in authentication-related actions.
+     * * credentials - the credential object received during the authentication process. The presence of an object does not mean successful authentication.
+     * * error - the authentication error is failed and mode set to 'try'.
+     * * isAuthenticated - true if the request has been successfully authenticated, otherwise false.
+     * * isAuthorized - true is the request has been successfully authorized against the route authentication access configuration. If the route has not access rules defined or if the request failed
+     * authorization, set to false.
+     * * mode - the route authentication mode.
+     * * strategy - the name of the strategy used.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestauth)
+     */
+    readonly auth: RequestAuth;
+
+    /**
+     * Access: read only and the public podium interface.
+     * The request.events supports the following events:
+     * * 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+     * * 'finish' - emitted when the request payload finished reading. The event method signature is function ().
+     * * 'disconnect' - emitted when a request errors or aborts unexpectedly.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestevents)
+     */
+    events: RequestEvents;
+
+    /**
+     * The raw request headers (references request.raw.req.headers).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestheaders)
+     */
+    readonly headers: Util.Dictionary<string>;
+
+    /**
+     * Request information:
+     * * acceptEncoding - the request preferred encoding.
+     * * cors - if CORS is enabled for the route, contains the following:
+     * * isOriginMatch - true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only
+     * available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle.
+     * * host - content of the HTTP 'Host' header (e.g. 'example.com:8080').
+     * * hostname - the hostname part of the 'Host' header (e.g. 'example.com').
+     * * id - a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').
+     * * received - request reception timestamp.
+     * * referrer - content of the HTTP 'Referrer' (or 'Referer') header.
+     * * remoteAddress - remote client IP address.
+     * * remotePort - remote client port.
+     * * responded - request response timestamp (0 is not responded yet).
+     * Note that the request.info object is not meant to be modified.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestinfo)
+     */
+    readonly info: RequestInfo;
+
+    /**
+     * An array containing the logged request events.
+     * Note that this array will be empty if route log.collect is set to false.
+     */
+    readonly logs: RequestLog[];
+
+    /**
+     * The request method in lower case (e.g. 'get', 'post').
+     */
+    readonly method: Util.HTTP_METHODS_PARTIAL_LOWERCASE;
+
+    /**
+     * The parsed content-type header. Only available when payload parsing enabled and no payload error occurred.
+     */
+    readonly mime: string;
+
+    /**
+     * An object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.
+     */
+    readonly orig: RequestOrig;
+
+    /**
+     * An object where each key is a path parameter name with matching value as described in [Path parameters](https://github.com/hapijs/hapi/blob/master/API.md#path-parameters).
+     */
+    readonly params: Util.Dictionary<string>;
+
+    /**
+     * An array containing all the path params values in the order they appeared in the path.
+     */
+    readonly paramsArray: string[];
+
+    /**
+     * The request URI's pathname component.
+     */
+    readonly path: string;
+
+    /**
+     * The request payload based on the route payload.output and payload.parse settings.
+     * TODO check this typing and add references / links.
+     */
+    readonly payload: stream.Readable | Buffer | string | object;
+
+    /**
+     * Plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.
+     */
+    plugins: PluginsStates;
+
+    /**
+     * An object where each key is the name assigned by a route pre-handler methods function. The values are the raw values provided to the continuation function as argument. For the wrapped response
+     * object, use responses.
+     */
+    readonly pre: Util.Dictionary<object>;
+
+    /**
+     * Access: read / write (see limitations below).
+     * 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.BoomError | null;
+
+    /**
+     * Same as pre but represented as the response object created by the pre method.
+     */
+    readonly preResponses: Util.Dictionary<object>;
+
+    /**
+     * By default the object outputted from node's URL parse() method. Might also be set indirectly via request.setUrl in which case it may be a string (if url is set to an object with the query
+     * attribute as an unparsed string).
+     */
+    readonly query: any;
+
+    /**
+     * An object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.
+     * * req - the node request object.
+     * * res - the node response object.
+     */
+    readonly raw: {
+        req: http.IncomingMessage;
+        res: http.ServerResponse;
+    };
+
+    /**
+     * The request route information object and method
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestroute)
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestrouteauthaccessrequest)
+     */
+    readonly route: RequestRoute;
+
+    /**
+     * Access: read only and the public server interface.
+     * The server object.
+     */
+    server: Server;
+
+    /**
+     * An object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition.
+     */
+    readonly state: Util.Dictionary<any>;
+
+    /**
+     * The parsed request URI.
+     */
+    readonly url: url.Url;
+
+    /**
+     * Returns a response which you can pass into the reply interface where:
+     * @param source - the value to set as the source of the reply interface, optional.
+     * @param options - options for the method, optional.
+     * @return ResponseObject
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestgenerateresponsesource-options)
+     */
+    /* tslint:disable-next-line:max-line-length */
+    generateResponse(source: string | object | null, options?: { variety?: string; prepare?: (response: ResponseObject) => Promise<ResponseObject>; marshal?: (response: ResponseObject) => Promise<ResponseValue>; close?: (response: ResponseObject) => void; }): ResponseObject;
+
+    /**
+     * Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
+     * @param tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism
+     *     for describing and filtering events.
+     * @param data - (optional) an message string or object with the application data being logged. If data is a function, the function signature is function() and it called once to generate (return
+     *     value) the actual data emitted to the listeners. Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag
+     *     set to true.
+     * @return void
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-requestlogtags-data)
+     */
+    log(tags: string | string[], data?: string | object | (() => string | object)): void;
+
+    /**
+     * Changes the request method before the router begins processing the request where:
+     * @param method - is the request HTTP method (e.g. 'GET').
+     * @return void
+     * Can only be called from an 'onRequest' extension method.
+     * [See docs](https://hapijs.com/api/17.0.1#-requestsetmethodmethod)
+     */
+    setMethod(method: Util.HTTP_METHODS_PARTIAL): void;
+
+    /**
+     * Changes the request URI before the router begins processing the request where:
+     * Can only be called from an 'onRequest' extension method.
+     * @param url - the new request URI. If url is a string, it is parsed with node's URL parse() method with parseQueryString set to true. url can also be set to an object compatible with node's URL
+     *     parse() method output.
+     * @param stripTrailingSlash - if true, strip the trailing slash from the path. Defaults to false.
+     * @return void
+     * [See docs](https://hapijs.com/api/17.0.1#-requestseturlurl-striptrailingslash)
+     */
+    setUrl(url: string | url.URL, stripTrailingSlash?: boolean): void;
+}
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                      Response                                             +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+/**
+ * Access: read only and the public podium interface.
+ * The response.events object supports the following events:
+ * * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+ * * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+ * [See docs](https://hapijs.com/api/17.0.1#-responseevents)
+ */
+export interface ResponseEvents extends Podium {
+    /**
+     * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+     * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+     */
+    on(criteria: 'peek', listener: PeekListener): void;
+
+    on(criteria: 'finish', listener: (data: undefined) => void): void;
+
+    /**
+     * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+     * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+     */
+    once(criteria: 'peek', listener: PeekListener): void;
+
+    once(criteria: 'finish', listener: (data: undefined) => void): void;
+}
+
+/**
+ * Object where:
+ *  * append - if true, the value is appended to any existing header value using separator. Defaults to false.
+ *  * separator - string used as separator when appending to an existing value. Defaults to ','.
+ *  * override - if false, the header value is not set if an existing value present. Defaults to true.
+ *  * duplicate - if false, the header value is not modified if the provided value is already included. Does not apply when append is false or if the name is 'set-cookie'. Defaults to true.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseheadername-value-options)
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#response-object)
+ */
+export interface ResponseObjectHeaderOptions {
+    append?: boolean;
+    separator?: string;
+    override?: boolean;
+    duplicate?: boolean;
+}
+
+/**
+ * The response object contains the request response value along with various HTTP headers and flags. When a lifecycle
+ * method returns a value, the value is wrapped in a response object along with some default flags (e.g. 200 status
+ * code). In order to customize a response before it is returned, the h.response() method is provided.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#response-object)
+ * TODO, check extending from Podium is correct.  Extending because of "The response object supports the following events" [See docs](https://hapijs.com/api/17.0.1#-responseevents)
+ */
+export interface ResponseObject extends Podium {
+    /**
+     * Default value: {}.
+     * Application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseapp)
+     */
+    app: ApplicationState;
+
+    /**
+     * Access: read only and the public podium interface.
+     * The response.events object supports the following events:
+     * * 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+     * * 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+     * [See docs](https://hapijs.com/api/17.0.1#-responseevents)
+     */
+    readonly events: ResponseEvents;
+
+    /**
+     * Default value: {}.
+     * An object containing the response headers where each key is a header field name and the value is the string header value or array of string.
+     * Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepared for transmission.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseheaders)
+     */
+    readonly headers: Util.Dictionary<string | string[]>;
+
+    /**
+     * Default value: {}.
+     * Plugin-specific state. Provides a place to store and pass request-level plugin data. plugins is an object where each key is a plugin name and the value is the state.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseplugins)
+     */
+    plugins: PluginsStates;
+
+    /**
+     * Object containing the response handling flags.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesettings)
+     */
+    readonly settings: ResponseSettings;
+
+    /**
+     * The raw value returned by the lifecycle method.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesource)
+     */
+    readonly source: Lifecycle.ReturnValue;
+
+    /**
+     * Default value: 200.
+     * The HTTP response status code.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsestatuscode)
+     */
+    readonly statusCode: number;
+
+    /**
+     * A string indicating the type of source with available values:
+     * * 'plain' - a plain response such as string, number, null, or simple object.
+     * * 'buffer' - a Buffer.
+     * * 'stream' - a Stream.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsevariety)
+     */
+    readonly variety: 'plain' | 'buffer' | 'stream';
+
+    /**
+     * Sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
+     * @param length - the header value. Must match the actual payload size.
+     * @return Return value: the current response object.
+     * [See docs](https://hapijs.com/api/17.0.1#-responsebyteslength)
+     */
+    bytes(length: number): ResponseObject;
+
+    /**
+     * Sets the 'Content-Type' HTTP header 'charset' property where:
+     * @param charset - the charset property value.
+     * @return Return value: the current response object.
+     * [See docs](https://hapijs.com/api/17.0.1#-responsecharsetcharset)
+     */
+    charset(charset: string): ResponseObject;
+
+    /**
+     * Sets the 'Content-Type' HTTP header 'charset' property where:
+     * $param charset - the charset property value.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsecodestatuscode)
+     */
+    code(statusCode: number): ResponseObject;
+
+    /**
+     * Sets the HTTP status message where:
+     * @param httpMessage - the HTTP status message (e.g. 'Ok' for status code 200).
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsemessagehttpmessage)
+     */
+    message(httpMessage: string): ResponseObject;
+
+    /**
+     * Sets the HTTP status code to Created (201) and the HTTP 'Location' header where:
+     * @param uri - an absolute or relative URI used as the 'Location' header value.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsecreateduri)
+     */
+    created(uri: string): ResponseObject;
+
+    /**
+     * Sets the string encoding scheme used to serial data into the HTTP payload where:
+     * @param encoding  the encoding property value (see node Buffer encoding [See docs](https://nodejs.org/api/buffer.html#buffer_buffers_and_character_encodings)).
+     *  * 'ascii' - for 7-bit ASCII data only. This encoding is fast and will strip the high bit if set.
+     *  * 'utf8' - Multibyte encoded Unicode characters. Many web pages and other document formats use UTF-8.
+     *  * 'utf16le' - 2 or 4 bytes, little-endian encoded Unicode characters. Surrogate pairs (U+10000 to U+10FFFF) are supported.
+     *  * 'ucs2' - Alias of 'utf16le'.
+     *  * 'base64' - Base64 encoding. When creating a Buffer from a string, this encoding will also correctly accept "URL and Filename Safe Alphabet" as specified in RFC4648, Section 5.
+     *  * 'latin1' - A way of encoding the Buffer into a one-byte encoded string (as defined by the IANA in RFC1345, page 63, to be the Latin-1 supplement block and C0/C1 control codes).
+     *  * 'binary' - Alias for 'latin1'.
+     *  * 'hex' - Encode each byte as two hexadecimal characters.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseencodingencoding)
+     */
+    encoding(encoding: 'ascii' | 'utf8' | 'utf16le' | 'ucs2' | 'base64' | 'latin1' | 'binary' | 'hex'): ResponseObject;
+
+    /**
+     * Sets the representation entity tag where:
+     * @param tag - the entity tag string without the double-quote.
+     * @param options - (optional) settings where:
+     *  * weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
+     *  * vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by
+     *     a '-' character). Ignored when weak is true. Defaults to true.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseetagtag-options)
+     */
+    etag(tag: string, options?: {weak: boolean, vary: boolean}): ResponseObject;
+
+    /**
+     * Sets an HTTP header where:
+     * @param name - the header name.
+     * @param value - the header value.
+     * @param options - (optional) object where:
+     *  * append - if true, the value is appended to any existing header value using separator. Defaults to false.
+     *  * separator - string used as separator when appending to an existing value. Defaults to ','.
+     *  * override - if false, the header value is not set if an existing value present. Defaults to true.
+     *  * duplicate - if false, the header value is not modified if the provided value is already included. Does not apply when append is false or if the name is 'set-cookie'. Defaults to true.
+     *  @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseheadername-value-options)
+     */
+    header(name: string, value: string, options?: ResponseObjectHeaderOptions): ResponseObject;
+
+    /**
+     * Sets the HTTP 'Location' header where:
+     * @param uri - an absolute or relative URI used as the 'Location' header value.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responselocationuri)
+     */
+    location(uri: string): ResponseObject;
+
+    /**
+     * Sets an HTTP redirection response (302) and decorates the response with additional methods, where:
+     * @param uri - an absolute or relative URI used to redirect the client to another resource.
+     * @return Return value: the current response object.
+     * Decorates the response object with the response.temporary(), response.permanent(), and response.rewritable() methods to easily change the default redirection code (302).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseredirecturi)
+     */
+    redirect(uri: string): ResponseObject;
+
+    /**
+     * Sets the JSON.stringify() replacer argument where:
+     * @param method - the replacer function or array. Defaults to none.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsereplacermethod)
+     */
+    replacer(method: Json.StringifyReplacer): ResponseObject;
+
+    /**
+     * Sets the JSON.stringify() space argument where:
+     * @param count - the number of spaces to indent nested object keys. Defaults to no indentation.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsespacescount)
+     */
+    spaces(count: number): ResponseObject;
+
+    /**
+     * Sets an HTTP cookie where:
+     * @param name - the cookie name.
+     * @param value - the cookie value. If no options.encoding is defined, must be a string. See server.state() for supported encoding values.
+     * @param options - (optional) configuration. If the state was previously registered with the server using server.state(), the specified keys in options are merged with the default server
+     *     definition.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsestatename-value-options)
+     */
+    state(name: string, value: object | string, options?: ServerStateCookieOptions): ResponseObject;
+
+    /**
+     * Sets a string suffix when the response is process via JSON.stringify() where:
+     * @param suffix - the string suffix.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesuffixsuffix)
+     */
+    suffix(suffix: string): ResponseObject;
+
+    /**
+     * Overrides the default route cache expiration rule for this response instance where:
+     * @param msec - the time-to-live value in milliseconds.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsettlmsec)
+     */
+    ttl(msec: number): ResponseObject;
+
+    /**
+     * Sets the HTTP 'Content-Type' header where:
+     * @param mimeType - is the mime type.
+     * @return Return value: the current response object.
+     * Should only be used to override the built-in default for each response type.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsetypemimetype)
+     */
+    type(mimeType: string): ResponseObject;
+
+    /**
+     * Clears the HTTP cookie by setting an expired value where:
+     * @param name - the cookie name.
+     * @param options - (optional) configuration for expiring cookie. If the state was previously registered with the server using server.state(), the specified options are merged with the server
+     *     definition.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responseunstatename-options)
+     */
+    unstate(name: string, options?: ServerStateCookieOptions): ResponseObject;
+
+    /**
+     * Adds the provided header to the list of inputs affected the response generation via the HTTP 'Vary' header where:
+     * @param header - the HTTP request header name.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsevaryheader)
+     */
+    vary(header: string): ResponseObject;
+
+    /**
+     * Marks the response object as a takeover response.
+     * @return Return value: the current response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsetakeover)
+     */
+    takeover(): ResponseObject;
+
+    /**
+     * Sets the status code to 302 or 307 (based on the response.rewritable() setting) where:
+     * @param isTemporary - if false, sets status to permanent. Defaults to true.
+     * @return Return value: the current response object.
+     * Only available after calling the response.redirect() method.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsetemporaryistemporary)
+     */
+    temporary(isTemporary: boolean): ResponseObject;
+
+    /**
+     * Sets the status code to 301 or 308 (based on the response.rewritable() setting) where:
+     * @param isPermanent - if false, sets status to temporary. Defaults to true.
+     * @return Return value: the current response object.
+     * Only available after calling the response.redirect() method.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsepermanentispermanent)
+     */
+    permanent(isPermanent: boolean): ResponseObject;
+
+    /**
+     * Sets the status code to 301/302 for rewritable (allows changing the request method from 'POST' to 'GET') or 307/308 for non-rewritable (does not allow changing the request method from 'POST'
+     * to 'GET'). Exact code based on the response.temporary() or response.permanent() setting. Arguments:
+     * @param isRewritable - if false, sets to non-rewritable. Defaults to true.
+     * @return Return value: the current response object.
+     * Only available after calling the response.redirect() method.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responserewritableisrewritable)
+     */
+    rewritable(isRewritable: boolean): ResponseObject;
+}
+
+/**
+ * Object containing the response handling flags.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-responsesettings)
+ */
+export interface ResponseSettings {
+    /**
+     * Defaults value: true.
+     * If true and source is a Stream, copies the statusCode and headers properties of the stream object to the outbound response.
+     */
+    readonly passThrough: boolean;
+
+    /**
+     * Default value: null (use route defaults).
+     * Override the route json options used when source value requires stringification.
+     */
+    readonly stringify: Json.StringifyArguments;
+
+    /**
+     * Default value: null (use route defaults).
+     * If set, overrides the route cache with an expiration value in milliseconds.
+     */
+    readonly ttl: number;
+
+    /**
+     * Default value: false.
+     * If true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.
+     */
+    varyEtag: boolean;
+}
+
+/**
+ * See more about Lifecycle
+ * https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle
+ *
+ */
+
+export type ResponseValue = string | object;
+
+export interface AuthenticationData {
+    credentials: object;
+    artifacts?: object;
+}
+
+/**
+ * The response toolkit is a collection of properties and utilities passed to every [lifecycle method](https://github.com/hapijs/hapi/blob/master/API.md#lifecycle-methods)
+ * It is somewhat hard to define as it provides both utilities for manipulating responses as well as other information. Since the
+ * toolkit is passed as a function argument, developers can name it whatever they want. For the purpose of this
+ * document the h notation is used. It is named in the spirit of the RethinkDB r method, with h for hapi.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#response-toolkit)
+ */
+export interface ResponseToolkit {
+    /**
+     * A response symbol. When returned by a lifecycle method, the request lifecycle skips to the finalizing step
+     * without further interaction with the node response stream. It is the developer's responsibility to write
+     * and end the response directly via [request.raw.res](https://github.com/hapijs/hapi/blob/master/API.md#request.raw).
+     */
+    readonly abandon: symbol;
+
+    /**
+     * A response symbol. When returned by a lifecycle method, the request lifecycle skips to the finalizing step after
+     * calling request.raw.res.end()) to close the the node response stream.
+     */
+    readonly close: symbol;
+
+    /**
+     * A response symbol. Provides access to the route or server context set via the route [bind](https://github.com/hapijs/hapi/blob/master/API.md#route.options.bind)
+     * option or [server.bind()](https://github.com/hapijs/hapi/blob/master/API.md#server.bind()).
+     */
+    readonly context: any;
+
+    /**
+     * A response symbol. When returned by a lifecycle method, the request lifecycle continues without changing the response.
+     */
+    readonly continue: symbol;
+
+    /**
+     * The [server realm](https://github.com/hapijs/hapi/blob/master/API.md#server.realm) associated with the matching
+     * route. Defaults to the root server realm in the onRequest step.
+     */
+    readonly realm: ServerRealm;
+
+    /**
+     * Access: read only and public request interface.
+     * The [request] object. This is a duplication of the request lifecycle method argument used by
+     * [toolkit decorations](https://github.com/hapijs/hapi/blob/master/API.md#server.decorate()) to access the current request.
+     */
+    readonly request: Readonly<Request>;
+
+    /**
+     * Used by the [authentication] method to pass back valid credentials where:
+     * @param data - an object with:
+     * * credentials - (required) object representing the authenticated entity.
+     * * artifacts - (optional) authentication artifacts object specific to the authentication scheme.
+     * @return Return value: an internal authentication object.
+     */
+    authenticated(data: AuthenticationData): object;
+
+    /**
+     * Sets the response 'ETag' and 'Last-Modified' headers and checks for any conditional request headers to decide if
+     * the response is going to qualify for an HTTP 304 (Not Modified). If the entity values match the request
+     * conditions, h.entity() returns a response object for the lifecycle method to return as its value which will
+     * set a 304 response. Otherwise, it sets the provided entity headers and returns undefined.
+     * The method argumetns are:
+     * @param options - a required configuration object with:
+     * * etag - the ETag string. Required if modified is not present. Defaults to no header.
+     * * modified - the Last-Modified header value. Required if etag is not present. Defaults to no header.
+     * * vary - same as the response.etag() option. Defaults to true.
+     * @return Return value: - a response object if the response is unmodified. - undefined if the response has changed.
+     * If undefined is returned, the developer must return a valid lifecycle method value. If a response is returned,
+     * it should be used as the return value (but may be customize using the response methods).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hentityoptions)
+     */
+    entity(options?: {etag?: string, modified?: string, vary?: boolean}): ResponseObject | undefined;
+
+    /**
+     * Redirects the client to the specified uri. Same as calling h.response().redirect(uri).
+     * @param url
+     * @return Returns a response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hredirecturi)
+     */
+    redirect(uri?: string): ResponseObject;
+
+    /**
+     * Wraps the provided value and returns a response object which allows customizing the response
+     * (e.g. setting the HTTP status code, custom headers, etc.), where:
+     * @param value - (optional) return value. Defaults to null.
+     * @return Returns a response object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hresponsevalue)
+     */
+    response(value?: ResponseValue): ResponseObject;
+
+    /**
+     * Sets a response cookie using the same arguments as response.state().
+     * @param name of the cookie
+     * @param value of the cookie
+     * @param (optional) ServerStateCookieOptions object.
+     * @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;
+
+    /**
+     * Used by the [authentication] method to indicate authentication failed and pass back the credentials received where:
+     * @param error - (required) the authentication error.
+     * @param data - (optional) an object with:
+     * * credentials - (required) object representing the authenticated entity.
+     * * artifacts - (optional) authentication artifacts object specific to the authentication scheme.
+     * @return void.
+     * The method is used to pass both the authentication error and the credentials. For example, if a request included
+     * expired credentials, it allows the method to pass back the user information (combined with a 'try'
+     * authentication mode) for error customization.
+     * There is no difference between throwing the error or passing it with the h.unauthenticated() method is no credentials are passed, but it might still be helpful for code clarity.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hunauthenticatederror-data)
+     */
+    unauthenticated(error: Error, data?: AuthenticationData): void;
+
+    /**
+     * Clears a response cookie using the same arguments as
+     * @param name of the cookie
+     * @param options (optional) ServerStateCookieOptions object.
+     * @return void.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hunstatename-options)
+     */
+    unstate(name: string, options?: ServerStateCookieOptions): void;
+}
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                      Route                                                +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+export type RouteOptionsAccessScope = false | string | string[];
+
+export type RouteOptionsAccessEntity = 'any' | 'user' | 'app';
+
+export interface RouteOptionsAccessScopeObject {
+    scope: RouteOptionsAccessScope;
+}
+
+export interface RouteOptionsAccessEntityObject {
+    entity: RouteOptionsAccessEntity;
+}
+
+export type RouteOptionsAccessObject =
+    RouteOptionsAccessScopeObject
+    | RouteOptionsAccessEntityObject
+    | (RouteOptionsAccessScopeObject & RouteOptionsAccessEntityObject);
+
+/**
+ * Route Authentication Options
+ */
+export interface RouteOptionsAccess {
+    /**
+     * Default value: none.
+     * An object or array of objects specifying the route access rules. Each rule is evaluated against an incoming request and access is granted if at least one of the rules matches. Each rule object
+     * must include at least one of scope or entity.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthaccess)
+     */
+    access?: RouteOptionsAccessObject | RouteOptionsAccessObject[];
+
+    /**
+     * Default value: false (no scope requirements).
+     * The application scope required to access the route. Value can be a scope string or an array of scope strings. When authenticated, the credentials object scope property must contain at least
+     * one of the scopes defined to access the route. If a scope string begins with a + character, that scope is required. If a scope string begins with a ! character, that scope is forbidden. For
+     * example, the scope ['!a', '+b', 'c', 'd'] means the incoming request credentials' scope must not include 'a', must include 'b', and must include one of 'c' or 'd'. You may also access
+     * properties on the request object (query, params, payload, and credentials) to populate a dynamic scope by using the '{' and '}' characters around the property name, such as 'user-{params.id}'.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthaccessscope)
+     */
+    scope?: RouteOptionsAccessScope;
+
+    /**
+     * Default value: 'any'.
+     * The required authenticated entity type. If set, must match the entity value of the request authenticated credentials. Available values:
+     * * 'any' - the authentication can be on behalf of a user or application.
+     * * 'user' - the authentication must be on behalf of a user which is identified by the presence of a 'user' attribute in the credentials object returned by the authentication strategy.
+     * * 'app' - the authentication must be on behalf of an application which is identified by the lack of presence of a user attribute in the credentials object returned by the authentication
+     * strategy.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthaccessentity)
+     */
+    entity?: RouteOptionsAccessEntity;
+
+    /**
+     * Default value: 'required'.
+     * The authentication mode. Available values:
+     * * 'required' - authentication is required.
+     * * 'optional' - authentication is optional - the request must include valid credentials or no credentials at all.
+     * * 'try' - similar to 'optional', any request credentials are attempted authentication, but if the credentials are invalid, the request proceeds regardless of the authentication error.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthmode)
+     */
+    mode?: 'required' | 'optional' | 'try';
+
+    /**
+     * Default value: false, unless the scheme requires payload authentication.
+     * If set, the incoming request payload is authenticated after it is processed. Requires a strategy with payload authentication support (e.g. Hawk). Cannot be set to a value other than 'required'
+     * when the scheme sets the authentication options.payload to true. Available values:
+     * * false - no payload authentication.
+     * * 'required' - payload authentication required.
+     * * 'optional' - payload authentication performed only when the client includes payload authentication information (e.g. hash attribute in Hawk).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthpayload)
+     */
+    payload?: false | 'required' | 'optional';
+
+    /**
+     * Default value: the default strategy set via server.auth.default().
+     * An array of string strategy names in the order they should be attempted. Cannot be used together with strategy.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthstrategies)
+     */
+    strategies?: string[];
+
+    /**
+     * Default value: the default strategy set via server.auth.default().
+     * A string strategy names. Cannot be used together with strategies.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsauthstrategy)
+     */
+    strategy?: string;
+}
+
+/**
+ * Values are:
+ * * * 'default' - no privacy flag.
+ * * * 'public' - mark the response as suitable for public caching.
+ * * * 'private' - mark the response as suitable only for private caching.
+ * * expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+ * * expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn.
+ * * statuses - an array of HTTP response status code numbers (e.g. 200) which are allowed to include a valid caching directive.
+ * * otherwise - a string with the value of the 'Cache-Control' header when caching is disabled.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscache)
+ */
+export type RouteOptionsCache = {
+    privacy?: 'default' | 'public' | 'privacy';
+    statuses?: number[];
+    otherwise?: string;
+} & (
+    {
+        expiresIn?: number;
+        expiresAt?: undefined;
+    } | {
+    expiresIn?: undefined;
+    expiresAt?: string;
+} | {
+    expiresIn?: undefined;
+    expiresAt?: undefined;
+}
+    );
+
+/**
+ * Default value: false (no CORS headers).
+ * The Cross-Origin Resource Sharing protocol allows browsers to make cross-origin API calls. CORS is required by web applications running inside a browser which are loaded from a different domain
+ * than the API server. To enable, set cors to true, or to an object with the following options:
+ * * origin - an array of allowed origin servers strings ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a
+ * wildcard '*' character, or a single '*' origin string. If set to 'ignore', any incoming Origin header is ignored (present or not) and the 'Access-Control-Allow-Origin' header is set to '*'.
+ * Defaults to any origin ['*'].
+ * * maxAge - number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in policy.
+ * Defaults to 86400 (one day).
+ * * headers - a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'].
+ * * additionalHeaders - a strings array of additional headers to headers. Use this to keep the default headers in place.
+ * * exposedHeaders - a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization'].
+ * * additionalExposedHeaders - a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place.
+ * * 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)
+ */
+export interface RouteOptionsCors {
+    /**
+     * an array of allowed origin servers strings ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '*'
+     * character, or a single '*' origin string. If set to 'ignore', any incoming Origin header is ignored (present or not) and the 'Access-Control-Allow-Origin' header is set to '*'. Defaults to any
+     * origin ['*'].
+     */
+    origin?: string[] | '*' | 'ignore';
+    /**
+     * number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in policy.
+     * Defaults to 86400 (one day).
+     */
+    maxAge?: number;
+    /**
+     * a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'].
+     */
+    headers?: string[];
+    /**
+     * a strings array of additional headers to headers. Use this to keep the default headers in place.
+     */
+    additionalHeaders?: string[];
+    /**
+     * a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization'].
+     */
+    exposedHeaders?: string[];
+    /**
+     * a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place.
+     */
+    additionalExposedHeaders?: string[];
+    /**
+     * if true, allows user credentials to be sent ('Access-Control-Allow-Credentials'). Defaults to false.
+     */
+    credentials?: boolean;
+}
+
+/**
+ * The value must be one of:
+ * * 'data' - the incoming payload is read fully into memory. If parse is true, the payload is parsed (JSON, form-decoded, multipart) based on the 'Content-Type' header. If parse is false, a raw
+ * Buffer is returned.
+ * * 'stream' - the incoming payload is made available via a Stream.Readable interface. If the payload is 'multipart/form-data' and parse is true, field values are presented as text while files are
+ * provided as streams. File streams from a 'multipart/form-data' upload will also have a hapi property containing the filename and headers properties. Note that payload streams for multipart
+ * payloads are a synthetic interface created on top of the entire mutlipart content loaded into memory. To avoid loading large multipart payloads into memory, set parse to false and handle the
+ * multipart payload in the handler using a streaming parser (e.g. pez).
+ * * 'file' - the incoming payload is written to temporary file in the directory specified by the uploads settings. If the payload is 'multipart/form-data' and parse is true, field values are
+ * presented as text while files are saved to disk. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of
+ * which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform cleanup. For context [See
+ * docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadoutput)
+ */
+export type PayloadOutput = 'data' | 'stream' | 'file';
+
+/**
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadcompression)
+ */
+export type PayloadCompressionDecoderSettings = object;
+
+/**
+ * Determines how the request payload is processed.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayload)
+ */
+export interface RouteOptionsPayload {
+    /**
+     * Default value: allows parsing of the following mime types:
+     * * application/json
+     * * application/*+json
+     * * application/octet-stream
+     * * application/x-www-form-urlencoded
+     * * multipart/form-data
+     * * text/*
+     * A string or an array of strings with the allowed mime types for the endpoint. Use this settings to limit the set of allowed mime types. Note that allowing additional mime types not listed
+     * above will not enable them to be parsed, and if parse is true, the request will result in an error response.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadallow)
+     */
+    allow?: string | string[];
+
+    /**
+     * Default value: none.
+     * An object where each key is a content-encoding name and each value is an object with the desired decoder settings. Note that encoder settings are set in compression.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadcompression)
+     */
+    compression?: Util.Dictionary<PayloadCompressionDecoderSettings>;
+
+    /**
+     * Default value: 'application/json'.
+     * The default content type if the 'Content-Type' request header is missing.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloaddefaultcontenttype)
+     */
+    defaultContentType?: string;
+
+    /**
+     * Default value: 'error' (return a Bad Request (400) error response).
+     * A failAction value which determines how to handle payload parsing errors.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadfailaction)
+     */
+    failAction?: Lifecycle.FailAction;
+
+    /**
+     * Default value: 1048576 (1MB).
+     * Limits the size of incoming payloads to the specified byte count. Allowing very large payloads may cause the server to run out of memory.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadmaxbytes)
+     */
+    maxBytes?: number;
+
+    /**
+     * Default value: none.
+     * Overrides payload processing for multipart requests. Value can be one of:
+     * * false - disable multipart processing.
+     * an object with the following required options:
+     * * output - same as the output option with an additional value option:
+     * * * annotated - wraps each multipart part in an object with the following keys: // TODO type this?
+     * * * * headers - the part headers.
+     * * * * filename - the part file name.
+     * * * * payload - the processed part payload.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadmultipart)
+     */
+    multipart?: false | {
+        output: PayloadOutput | 'annotated';
+    };
+
+    /**
+     * Default value: 'data'.
+     * The processed payload format. The value must be one of:
+     * * 'data' - the incoming payload is read fully into memory. If parse is true, the payload is parsed (JSON, form-decoded, multipart) based on the 'Content-Type' header. If parse is false, a raw
+     * Buffer is returned.
+     * * 'stream' - the incoming payload is made available via a Stream.Readable interface. If the payload is 'multipart/form-data' and parse is true, field values are presented as text while files
+     * are provided as streams. File streams from a 'multipart/form-data' upload will also have a hapi property containing the filename and headers properties. Note that payload streams for multipart
+     * payloads are a synthetic interface created on top of the entire mutlipart content loaded into memory. To avoid loading large multipart payloads into memory, set parse to false and handle the
+     * multipart payload in the handler using a streaming parser (e.g. pez).
+     * * 'file' - the incoming payload is written to temporary file in the directory specified by the uploads settings. If the payload is 'multipart/form-data' and parse is true, field values are
+     * presented as text while files are saved to disk. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track
+     * of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform cleanup.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadoutput)
+     */
+    output?: PayloadOutput;
+
+    /**
+     * Default value: none.
+     * A mime type string overriding the 'Content-Type' header value received.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadoverride)
+     */
+    override?: string;
+
+    /**
+     * Default value: true.
+     * Determines if the incoming payload is processed or presented raw. Available values:
+     * * true - if the request 'Content-Type' matches the allowed mime types set by allow (for the whole payload as well as parts), the payload is converted into an object when possible. If the
+     * format is unknown, a Bad Request (400) error response is sent. Any known content encoding is decoded.
+     * * false - the raw payload is returned unmodified.
+     * * 'gunzip' - the raw payload is returned unmodified after any known content encoding is decoded.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadparse)
+     */
+    parse?: boolean | 'gunzip';
+
+    /**
+     * Default value: to 10000 (10 seconds).
+     * Payload reception timeout in milliseconds. Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408)
+     * error response. Set to false to disable.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloadtimeout)
+     */
+    timeout?: false | number;
+
+    /**
+     * Default value: os.tmpdir().
+     * The directory used for writing file uploads.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayloaduploads)
+     */
+    uploads?: string;
+}
+
+/**
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
+ */
+export type RouteOptionsPreArray = RouteOptionsPreAllOptions[];
+
+/**
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
+ */
+export type RouteOptionsPreAllOptions = RouteOptionsPreObject | RouteOptionsPreObject[] | Lifecycle.Method;
+
+/**
+ * An object with:
+ * * method - a lifecycle method.
+ * * assign - key name used to assign the response of the method to in request.pre and request.preResponses.
+ * * failAction - A failAction value which determine what to do when a pre-handler method throws an error. If assign is specified and the failAction setting is not 'error', the error will be assigned.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
+ */
+export interface RouteOptionsPreObject {
+    /**
+     * a lifecycle method.
+     */
+    method: Lifecycle.Method;
+    /**
+     * key name used to assign the response of the method to in request.pre and request.preResponses.
+     */
+    assign: string;
+    /**
+     * A failAction value which determine what to do when a pre-handler method throws an error. If assign is specified and the failAction setting is not 'error', the error will be assigned.
+     */
+    failAction?: Lifecycle.FailAction;
+}
+
+export interface ValidationObject {
+    [key: string]: AnySchema;
+}
+
+export type RouteOptionsResponseSchema =
+    boolean
+    | ValidationObject
+    | ((value: object | Buffer | string, options: ValidationOptions) => Promise<any>);
+
+/**
+ * Processing rules for the outgoing response.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponse)
+ */
+export interface RouteOptionsResponse {
+    /**
+     * Default value: 200.
+     * The default HTTP status code when the payload is considered empty. Value can be 200 or 204. Note that a 200 status code is converted to a 204 only at the time of response transmission (the
+     * response status code will remain 200 throughout the request lifecycle unless manually set).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseemptystatuscode)
+     */
+    emptyStatusCode?: 200 | 204;
+
+    /**
+     * Default value: 'error' (return an Internal Server Error (500) error response).
+     * A failAction value which defines what to do when a response fails payload validation.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsefailaction)
+     */
+    failAction?: Lifecycle.FailAction;
+
+    /**
+     * Default value: false.
+     * If true, applies the validation rule changes to the response payload.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsemodify)
+     */
+    modify?: boolean;
+
+    /**
+     * Default value: none.
+     * [joi](http://github.com/hapijs/joi) options object pass to the validation function. Useful to set global options such as stripUnknown or abortEarly (the complete list is available here). If a
+     * custom validation function is defined via schema or status then options can an arbitrary object that will be passed to this function as the second argument.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseoptions)
+     */
+    options?: ValidationOptions; // TODO needs validation
+
+    /**
+     * Default value: true.
+     * If false, payload range support is disabled.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseranges)
+     */
+    ranges?: boolean;
+
+    /**
+     * Default value: 100 (all responses).
+     * The percent of response payloads validated (0 - 100). Set to 0 to disable all validation.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsesample)
+     */
+    sample?: number;
+
+    /**
+     * Default value: true (no validation).
+     * The default response payload validation rules (for all non-error responses) expressed as one of:
+     * * true - any payload allowed (no validation).
+     * * false - no payload allowed.
+     * * a joi validation object. The options along with the request context ({ headers, params, query, payload, app, auth }) are passed to the validation function.
+     * * a validation function using the signature async function(value, options) where:
+     * * * value - the pending response payload.
+     * * * options - The options along with the request context ({ headers, params, query, payload, app, auth }).
+     * * * if the function returns a value and modify is true, the value is used as the new response. If the original response is an error, the return value is used to override the original error
+     * output.payload. If an error is thrown, the error is processed according to failAction.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponseschema)
+     */
+    schema?: RouteOptionsResponseSchema;
+
+    /**
+     * Default value: none.
+     * Validation schemas for specific HTTP status codes. Responses (excluding errors) not matching the listed status codes are validated using the default schema.
+     * status is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponsestatus)
+     */
+    status?: Util.Dictionary<RouteOptionsResponseSchema>;
+}
+
+/**
+ * Default value: false (security headers disabled).
+ * Sets common security headers. To enable, set security to true or to an object with the following options:
+ * * hsts - controls the 'Strict-Transport-Security' header, where:
+ * * * true - the header will be set to max-age=15768000. This is the default value.
+ * * * a number - the maxAge parameter will be set to the provided value.
+ * * * an object with the following fields:
+ * * * * maxAge - the max-age portion of the header, as a number. Default is 15768000.
+ * * * * includeSubDomains - a boolean specifying whether to add the includeSubDomains flag to the header.
+ * * * * preload - a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header.
+ * * xframe - controls the 'X-Frame-Options' header, where:
+ * * * true - the header will be set to 'DENY'. This is the default value.
+ * * * 'deny' - the headers will be set to 'DENY'.
+ * * * 'sameorigin' - the headers will be set to 'SAMEORIGIN'.
+ * * * an object for specifying the 'allow-from' rule, where:
+ * * * * rule - one of:
+ * * * * * 'deny'
+ * * * * * 'sameorigin'
+ * * * * * 'allow-from'
+ * * * * source - when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be automatically
+ * changed to 'sameorigin'.
+ * * xss - boolean that controls the 'X-XSS-PROTECTION' header for Internet Explorer. Defaults to true which sets the header to equal '1; mode=block'.
+ *       Note: this setting can create a security vulnerability in versions of Internet Exploere below 8, as well as unpatched versions of IE8. See here and here for more information. If you actively
+ * support old versions of IE, it may be wise to explicitly set this flag to false.
+ * * noOpen - boolean controlling the 'X-Download-Options' header for Internet Explorer, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'.
+ * * noSniff - boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff'.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionssecurity)
+ */
+export interface RouteOptionsSecureObject {
+    /**
+     * hsts - controls the 'Strict-Transport-Security' header
+     */
+    hsts?: boolean | number | {
+        /**
+         * the max-age portion of the header, as a number. Default is 15768000.
+         */
+        maxAge: number;
+        /**
+         * a boolean specifying whether to add the includeSubDomains flag to the header.
+         */
+        includeSubdomains: boolean;
+        /**
+         * a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header.
+         */
+        preload: boolean;
+    };
+    /**
+     * controls the 'X-Frame-Options' header
+     */
+    xframe?: true | 'deny' | 'sameorigin' | {
+        /**
+         * an object for specifying the 'allow-from' rule,
+         */
+        rule: 'deny' | 'sameorigin' | 'allow-from';
+        /**
+         * when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be automatically changed
+         * to 'sameorigin'.
+         */
+        source: string;
+    };
+    /**
+     * boolean that controls the 'X-XSS-PROTECTION' header for Internet Explorer. Defaults to true which sets the header to equal '1; mode=block'.
+     * Note: this setting can create a security vulnerability in versions of Internet Exploere below 8, as well as unpatched versions of IE8. See here and here for more information. If you actively
+     * support old versions of IE, it may be wise to explicitly set this flag to false.
+     */
+    xss: boolean;
+    /**
+     * boolean controlling the 'X-Download-Options' header for Internet Explorer, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'.
+     */
+    noOpen?: boolean;
+    /**
+     * boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff'.
+     */
+    noSniff?: boolean;
+}
+
+export type RouteOptionsSecure = boolean | RouteOptionsSecureObject;
+
+/**
+ * Default value: { headers: true, params: true, query: true, payload: true, failAction: 'error' }.
+ * Request input validation rules for various request components.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidate)
+ */
+export interface RouteOptionsValidate {
+    /**
+     * Default value: none.
+     * An optional object with error fields copied into every validation error response.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateerrorfields)
+     */
+    errorFields?: object;
+
+    /**
+     * Default value: 'error' (return a Bad Request (400) error response).
+     * A failAction value which determines how to handle failed validations. When set to a function, the err argument includes the type of validation error under err.output.payload.validation.source.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidatefailaction)
+     */
+    failAction?: Lifecycle.FailAction;
+
+    /**
+     * Default value: true (no validation).
+     * Validation rules for incoming request headers:
+     * * true - any headers allowed (no validation performed).
+     * * a joi validation object.
+     * * a validation function using the signature async function(value, options) where:
+     * * * value - the request.headers object containing the request headers.
+     * * * options - options.
+     * * * if a value is returned, the value is used as the new request.headers value and the original value is stored in request.orig.headers. Otherwise, the headers are left unchanged. If an error
+     * is thrown, the error is handled according to failAction. Note that all header field names must be in lowercase to match the headers normalized by node.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateheaders)
+     */
+    headers?: RouteOptionsResponseSchema;
+
+    /**
+     * Default value: none.
+     * An options object passed to the joi rules or the custom validation methods. Used for setting global options such as stripUnknown or abortEarly (the complete list is available here).
+     * If a custom validation function (see headers, params, query, or payload above) is defined then options can an arbitrary object that will be passed to this function as the second parameter.
+     * The values of the other inputs (i.e. headers, query, params, payload, app, and auth) are added to the options object under the validation context (accessible in rules as
+     * Joi.ref('$query.key')).
+     * Note that validation is performed in order (i.e. headers, params, query, and payload) and if type casting is used (e.g. converting a string to a number), the value of inputs not yet validated
+     * will reflect the raw, unvalidated and unmodified values. If the validation rules for headers, params, query, and payload are defined at both the server routes level and at the route level, the
+     * individual route settings override the routes defaults (the rules are not merged).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateparams)
+     */
+    options?: ValidationOptions | object;
+
+    /**
+     * Default value: true (no validation).
+     * Validation rules for incoming request path parameters, after matching the path against the route, extracting any parameters, and storing them in request.params, where:
+     * * true - any path parameter value allowed (no validation performed).
+     * * a joi validation object.
+     * * a validation function using the signature async function(value, options) where:
+     * * * value - the request.params object containing the request path parameters.
+     * * * options - options.
+     * if a value is returned, the value is used as the new request.params value and the original value is stored in request.orig.params. Otherwise, the path parameters are left unchanged. If an
+     * error is thrown, the error is handled according to failAction. Note that failing to match the validation rules to the route path parameters definition will cause all requests to fail.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidateparams)
+     */
+    params?: RouteOptionsResponseSchema;
+
+    /**
+     * Default value: true (no validation).
+     * Validation rules for incoming request payload (request body), where:
+     * * true - any payload allowed (no validation performed). false - no payload allowed.
+     * * a joi validation object. Note that empty payloads are represented by a null value. If a validation schema is provided and empty payload are allowed, the schema must be explicitly defined by
+     * setting the rule to a joi schema with null allowed (e.g. Joi.object({  keys here  }).allow(null)).
+     * * a validation function using the signature async function(value, options) where:
+     * * * value - the request.query object containing the request query parameters.
+     * * * options - options.
+     * if a value is returned, the value is used as the new request.payload value and the original value is stored in request.orig.payload. Otherwise, the payload is left unchanged. If an error is
+     * thrown, the error is handled according to failAction. Note that validating large payloads and modifying them will cause memory duplication of the payload (since the original is kept), as well
+     * as the significant performance cost of validating large amounts of data.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidatepayload)
+     */
+    payload?: RouteOptionsResponseSchema;
+
+    /**
+     * Default value: true (no validation).
+     * Validation rules for incoming request URI query component (the key-value part of the URI between '?' and '#'). The query is parsed into its individual key-value pairs, decoded, and stored in
+     * request.query prior to validation. Where:
+     * * true - any query parameter value allowed (no validation performed). false - no query parameter value allowed.
+     * * a joi validation object.
+     * * a validation function using the signature async function(value, options) where:
+     * * * value - the request.query object containing the request query parameters.
+     * * * options - options.
+     * if a value is returned, the value is used as the new request.query value and the original value is stored in request.orig.query. Otherwise, the query parameters are left unchanged. If an error
+     * is thrown, the error is handled according to failAction. Note that changes to the query parameters will not be reflected in request.url.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidatequery)
+     */
+    query?: RouteOptionsResponseSchema;
+}
+
+/**
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscompression)
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverencoderencoding-encoder)
+ */
+export type RouteCompressionEncoderSettings = object;
+
+/**
+ * Each route can be customized to change the default behavior of the request lifecycle.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#route-options)
+ */
+export interface RouteOptions {
+    /**
+     * Application-specific route configuration state. Should not be used by plugins which should use options.plugins[name] instead.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsapp)
+     */
+    app?: any;
+
+    /**
+     * Route authentication configuration. Value can be:
+     * false to disable authentication if a default strategy is set.
+     * a string with the name of an authentication strategy registered with server.auth.strategy(). The strategy will be set to 'required' mode.
+     * an authentication configuration object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsapp)
+     */
+    auth?: false | string | RouteOptionsAccess;
+
+    /**
+     * Default value: null.
+     * An object passed back to the provided handler (via this) when called. Ignored if the method is an arrow function.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsbind)
+     */
+    bind?: object | null;
+
+    /**
+     * Default value: { privacy: 'default', statuses: [200], otherwise: 'no-cache' }.
+     * If the route method is 'GET', the route can be configured to include HTTP caching directives in the response. Caching can be customized using an object with the following options:
+     * privacy - determines the privacy flag included in client-side caching using the 'Cache-Control' header. Values are:
+     * * * 'default' - no privacy flag.
+     * * * 'public' - mark the response as suitable for public caching.
+     * * * 'private' - mark the response as suitable only for private caching.
+     * * expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+     * * expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Cannot be used together with expiresIn.
+     * * statuses - an array of HTTP response status code numbers (e.g. 200) which are allowed to include a valid caching directive.
+     * * otherwise - a string with the value of the 'Cache-Control' header when caching is disabled.
+     * The default Cache-Control: no-cache header can be disabled by setting cache to false.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscache)
+     */
+    cache?: false | RouteOptionsCache;
+
+    /**
+     * An object where each key is a content-encoding name and each value is an object with the desired encoder settings. Note that decoder settings are set in compression.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscompression)
+     */
+    compression?: Util.Dictionary<RouteCompressionEncoderSettings>;
+
+    /**
+     * Default value: false (no CORS headers).
+     * The Cross-Origin Resource Sharing protocol allows browsers to make cross-origin API calls. CORS is required by web applications running inside a browser which are loaded from a different
+     * domain than the API server. To enable, set cors to true, or to an object with the following options:
+     * * origin - an array of allowed origin servers strings ('Access-Control-Allow-Origin'). The array can contain any combination of fully qualified origins along with origin strings containing a
+     * wildcard '*' character, or a single '*' origin string. If set to 'ignore', any incoming Origin header is ignored (present or not) and the 'Access-Control-Allow-Origin' header is set to '*'.
+     * Defaults to any origin ['*'].
+     * * maxAge - number of seconds the browser should cache the CORS response ('Access-Control-Max-Age'). The greater the value, the longer it will take before the browser checks for changes in
+     * policy. Defaults to 86400 (one day).
+     * * headers - a strings array of allowed headers ('Access-Control-Allow-Headers'). Defaults to ['Accept', 'Authorization', 'Content-Type', 'If-None-Match'].
+     * * additionalHeaders - a strings array of additional headers to headers. Use this to keep the default headers in place.
+     * * exposedHeaders - a strings array of exposed headers ('Access-Control-Expose-Headers'). Defaults to ['WWW-Authenticate', 'Server-Authorization'].
+     * * additionalExposedHeaders - a strings array of additional headers to exposedHeaders. Use this to keep the default headers in place.
+     * * 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;
+
+    /**
+     * Default value: none.
+     * Route description used for generating documentation (string).
+     * This setting is not available when setting server route defaults using server.options.routes.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsdescription)
+     */
+    description?: string;
+
+    /**
+     * Default value: none.
+     * Route-level request extension points by setting the option to an object with a key for each of the desired extension points ('onRequest' is not allowed), and the value is the same as the
+     * server.ext(events) event argument.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsext)
+     * [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;
+    };
+
+    /**
+     * Default value: { relativeTo: '.' }.
+     * Defines the behavior for accessing files:
+     * * relativeTo - determines the folder relative paths are resolved against.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsfiles)
+     */
+    files?: {
+        relativeTo: string;
+    };
+
+    /**
+     * Default value: none.
+     * The route handler function performs the main business logic of the route and sets the response. handler can be assigned:
+     * * a lifecycle method.
+     * * an object with a single property using the name of a handler type registred with the server.handler() method. The matching property value is passed as options to the registered handler
+     * generator. Note: handlers using a fat arrow style function cannot be bound to any bind property. Instead, the bound context is available under h.context.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionshandler)
+     */
+    handler?: Lifecycle.Method | object;
+
+    /**
+     * Default value: none.
+     * An optional unique identifier used to look up the route using server.lookup(). Cannot be assigned to routes added with an array of methods.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsid)
+     */
+    id?: string;
+
+    /**
+     * Default value: false.
+     * If true, the route cannot be accessed through the HTTP listener but only through the server.inject() interface with the allowInternals option set to true. Used for internal routes that should
+     * not be accessible to the outside world.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsisinternal)
+     */
+    isInternal?: boolean;
+
+    /**
+     * Default value: none.
+     * Optional arguments passed to JSON.stringify() when converting an object or error response to a string payload or escaping it after stringification. Supports the following:
+     * * replacer - the replacer function or array. Defaults to no action.
+     * * space - number of spaces to indent nested object keys. Defaults to no indentation.
+     * * suffix - string suffix added after conversion to JSON string. Defaults to no suffix.
+     * * escape - calls Hoek.jsonEscape() after conversion to JSON string. Defaults to false.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsjson)
+     */
+    json?: Json.StringifyArguments;
+
+    /**
+     * Default value: none.
+     * Enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.
+     * For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'. Cannot be used with stream
+     * responses. The 'Content-Type' response header is set to 'text/javascript' and the 'X-Content-Type-Options' response header is set to 'nosniff', and will override those headers even if
+     * explicitly set by response.type().
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsjsonp)
+     */
+    jsonp?: string;
+
+    /**
+     * Default value: { collect: false }.
+     * Request logging options:
+     * collect - if true, request-level logs (both internal and application) are collected and accessible via request.logs.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionslog)
+     */
+    log?: {
+        collect: boolean;
+    };
+
+    /**
+     * Default value: none.
+     * Route notes used for generating documentation (string or array of strings).
+     * This setting is not available when setting server route defaults using server.options.routes.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsnotes)
+     */
+    notes?: string | string[];
+
+    /**
+     * Determines how the request payload is processed.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspayload)
+     */
+    payload?: RouteOptionsPayload;
+
+    /**
+     * Default value: {}.
+     * Plugin-specific configuration. plugins is an object where each key is a plugin name and the value is the plugin configuration.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsplugins)
+     */
+    plugins?: PluginSpecificConfiguration;
+
+    /**
+     * Default value: none.
+     * The pre option allows defining methods for performing actions before the handler is called. These methods allow breaking the handler logic into smaller, reusable components that can be shared
+     * ascross routes, as well as provide a cleaner error handling of prerequisite operations (e.g. load required reference data from a database). pre is assigned an ordered array of methods which
+     * are called serially in order. If the pre array contains another array of methods as one of its elements, those methods are called in parallel. Note that during parallel execution, if any of
+     * the methods error, return a takeover response, or abort signal, the other parallel methods will continue to execute but will be ignored once completed. pre can be assigned a mixed array of:
+     * * an array containing the elements listed below, which are executed in parallel.
+     * * an object with:
+     * * * method - a lifecycle method.
+     * * * assign - key name used to assign the response of the method to in request.pre and request.preResponses.
+     * * * failAction - A failAction value which determine what to do when a pre-handler method throws an error. If assign is specified and the failAction setting is not 'error', the error will be
+     * assigned.
+     * * a method function - same as including an object with a single method key.
+     * Note that pre-handler methods do not behave the same way other lifecycle methods do when a value is returned. Instead of the return value becoming the new response payload, the value is used
+     * to assign the corresponding request.pre and request.preResponses properties. Otherwise, the handling of errors, takeover response response, or abort signal behave the same as any other
+     * lifecycle methods.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre)
+     */
+    pre?: RouteOptionsPreArray;
+
+    /**
+     * Processing rules for the outgoing response.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsresponse)
+     */
+    response?: RouteOptionsResponse;
+
+    /**
+     * Default value: false (security headers disabled).
+     * Sets common security headers. To enable, set security to true or to an object with the following options:
+     * * hsts - controls the 'Strict-Transport-Security' header, where:
+     * * * true - the header will be set to max-age=15768000. This is the default value.
+     * * * a number - the maxAge parameter will be set to the provided value.
+     * * * an object with the following fields:
+     * * * * maxAge - the max-age portion of the header, as a number. Default is 15768000.
+     * * * * includeSubDomains - a boolean specifying whether to add the includeSubDomains flag to the header.
+     * * * * preload - a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header.
+     * * xframe - controls the 'X-Frame-Options' header, where:
+     * * * true - the header will be set to 'DENY'. This is the default value.
+     * * * 'deny' - the headers will be set to 'DENY'.
+     * * * 'sameorigin' - the headers will be set to 'SAMEORIGIN'.
+     * * * an object for specifying the 'allow-from' rule, where:
+     * * * * rule - one of:
+     * * * * * 'deny'
+     * * * * * 'sameorigin'
+     * * * * * 'allow-from'
+     * * * * source - when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored. If rule is 'allow-from' but source is unset, the rule will be
+     * automatically changed to 'sameorigin'.
+     * * xss - boolean that controls the 'X-XSS-PROTECTION' header for Internet Explorer. Defaults to true which sets the header to equal '1; mode=block'.
+     *       Note: this setting can create a security vulnerability in versions of Internet Exploere below 8, as well as unpatched versions of IE8. See here and here for more information. If you
+     * actively support old versions of IE, it may be wise to explicitly set this flag to false.
+     * * noOpen - boolean controlling the 'X-Download-Options' header for Internet Explorer, preventing downloads from executing in your context. Defaults to true setting the header to 'noopen'.
+     * * noSniff - boolean controlling the 'X-Content-Type-Options' header. Defaults to true setting the header to its only and default option, 'nosniff'.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionssecurity)
+     */
+    security?: RouteOptionsSecure;
+
+    /**
+     * Default value: { parse: true, failAction: 'error' }.
+     * HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265). state supports the following
+     * options: parse - determines if incoming 'Cookie' headers are parsed and stored in the request.state object. failAction - A failAction value which determines how to handle cookie parsing
+     * errors. Defaults to 'error' (return a Bad Request (400) error response).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsstate)
+     */
+    state?: {
+        parse?: boolean;
+        failAction?: Lifecycle.FailAction;
+    };
+
+    /**
+     * Default value: none.
+     * Route tags used for generating documentation (array of strings).
+     * This setting is not available when setting server route defaults using server.options.routes.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionstags)
+     */
+    tags?: string[];
+
+    /**
+     * Default value: { server: false }.
+     * Timeouts for processing durations.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionstimeout)
+     */
+    timeout?: {
+        /**
+         * Response timeout in milliseconds. Sets the maximum time allowed for the server to respond to an incoming request before giving up and responding with a Service Unavailable (503) error
+         * response.
+         */
+        server?: boolean | number;
+
+        /**
+         * Default value: none (use node default of 2 minutes).
+         * By default, node sockets automatically timeout after 2 minutes. Use this option to override this behavior. Set to false to disable socket timeouts.
+         */
+        socket?: boolean | number;
+    };
+
+    /**
+     * Default value: { headers: true, params: true, query: true, payload: true, failAction: 'error' }.
+     * Request input validation rules for various request components.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsvalidate)
+     */
+    validate?: RouteOptionsValidate;
+}
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                      Server                                               +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+/**
+ * The scheme options argument passed to server.auth.strategy() when instantiation a strategy.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme)
+ */
+export type ServerAuthSchemeOptions = object;
+
+/**
+ * the method implementing the scheme with signature function(server, options) where:
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme)
+ * @param server - a reference to the server object the scheme is added to.
+ * @param options - (optional) the scheme options argument passed to server.auth.strategy() when instantiation a strategy.
+ */
+export type ServerAuthScheme = (server: Server, options?: ServerAuthSchemeOptions) => ServerAuthSchemeObject;
+
+/* tslint:disable-next-line:no-empty-interface */
+export interface ServerAuthSchemeObjectApi {
+}
+
+/**
+ * The scheme method must return an object with the following
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#authentication-scheme)
+ */
+export interface ServerAuthSchemeObject {
+    /**
+     * optional object which is exposed via the [server.auth.api](https://github.com/hapijs/hapi/blob/master/API.md#server.auth.api) object.
+     */
+    api?: ServerAuthSchemeObjectApi;
+
+    /**
+     * A lifecycle method function called for each incoming request configured with the authentication scheme. The
+     * method is provided with two special toolkit methods for returning an authenticated or an unauthenticate result:
+     * * h.authenticated() - indicate request authenticated successfully.
+     * * h.unauthenticated() - indicate request failed to authenticate.
+     * @param request the request object.
+     * @param h the ResponseToolkit
+     * @return the Lifecycle.ReturnValue
+     */
+    authenticate(request: Request, h: ResponseToolkit): Lifecycle.ReturnValue;
+
+    /**
+     * A lifecycle method to authenticate the request payload.
+     * When the scheme payload() method returns an error with a message, it means payload validation failed due to bad
+     * payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')),
+     * authentication may still be successful if the route auth.payload configuration is set to 'optional'.
+     * @param request the request object.
+     * @param h the ResponseToolkit
+     * @return the Lifecycle.ReturnValue
+     */
+    payload?(request: Request, h: ResponseToolkit): Lifecycle.ReturnValue;
+
+    /**
+     * A lifecycle method to decorate the response with authentication headers before the response headers or payload is written.
+     * @param request the request object.
+     * @param h the ResponseToolkit
+     * @return the Lifecycle.ReturnValue
+     */
+    response?(request: Request, h: ResponseToolkit): Lifecycle.ReturnValue;
+
+    /**
+     * An object with the following keys:
+     * * payload
+     */
+    options?: {
+        /**
+         * if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.
+         */
+        payload?: boolean;
+    };
+}
+
+/**
+ * An authentication configuration object using the same format as the route auth handler options.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthdefaultoptions)
+ */
+/* tslint:disable-next-line:no-empty-interface */
+export interface ServerAuthConfig extends RouteOptionsAccess {
+}
+
+export interface ServerAuth {
+    /**
+     * An object where each key is an authentication strategy name and the value is the exposed strategy API.
+     * Available only when the authentication scheme exposes an API by returning an api key in the object
+     * returned from its implementation function.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthapi)
+     */
+    api: Util.Dictionary<any>;
+
+    /**
+     * Contains the default authentication configuration is a default strategy was set via
+     * [server.auth.default()](https://github.com/hapijs/hapi/blob/master/API.md#server.auth.default()).
+     */
+    readonly settings: {
+        default: ServerAuthConfig;
+    };
+
+    /**
+     * Sets a default strategy which is applied to every route where:
+     * @param options - one of:
+     * * a string with the default strategy name
+     * * an authentication configuration object using the same format as the route auth handler options.
+     * @return void.
+     * The default does not apply when a route config specifies auth as false, or has an authentication strategy
+     * configured (contains the strategy or strategies authentication settings). Otherwise, the route authentication
+     * config is applied to the defaults.
+     * Note that if the route has authentication configured, the default only applies at the time of adding the route,
+     * not at runtime. This means that calling server.auth.default() after adding a route with some authentication
+     * config will have no impact on the routes added prior. However, the default will apply to routes added
+     * before server.auth.default() is called if those routes lack any authentication config.
+     * The default auth strategy configuration can be accessed via server.auth.settings.default. To obtain the active
+     * authentication configuration of a route, use server.auth.lookup(request.route).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthdefaultoptions)
+     */
+    default(options: string | ServerAuthConfig): void;
+
+    /**
+     * Registers an authentication scheme where:
+     * @param name the scheme name.
+     * @param scheme - the method implementing the scheme with signature function(server, options) where:
+     * * server - a reference to the server object the scheme is added to.
+     * * options - (optional) the scheme options argument passed to server.auth.strategy() when instantiation a strategy.
+     * @return void.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthschemename-scheme)
+     */
+    scheme(name: string, scheme: ServerAuthScheme): void;
+
+    /**
+     * Registers an authentication strategy where:
+     * @param name - the strategy name.
+     * @param scheme - the scheme name (must be previously registered using server.auth.scheme()).
+     * @param options - scheme options based on the scheme requirements.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthstrategyname-scheme-options)
+     */
+    strategy(name: string, scheme: string, options?: object): void;
+
+    /**
+     * Tests a request against an authentication strategy where:
+     * @param strategy - the strategy name registered with server.auth.strategy().
+     * @param request - the request object.
+     * @return Return value: the authentication credentials object if authentication was successful, otherwise throws an error.
+     * Note that the test() method does not take into account the route authentication configuration. It also does not
+     * perform payload authentication. It is limited to the basic strategy authentication execution. It does not
+     * include verifying scope, entity, or other route properties.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverauthteststrategy-request)
+     */
+    test(strategy: string, request: Request): Promise<any>;
+}
+
+/**
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
+ */
+export interface ServerCache {
+    /**
+     * Provisions a cache segment within the server cache facility where:
+     * @param options - [catbox policy](https://github.com/hapijs/catbox#policy) configuration where:
+     * * expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+     * * expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
+     * * generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is async function(id, flags) where:
+     * - `id` - the `id` string or object provided to the `get()` method.
+     * - `flags` - an object used to pass back additional flags to the cache where:
+     * - `ttl` - the cache ttl value in milliseconds. Set to `0` to skip storing in the cache. Defaults to the cache global policy.
+     * * staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
+     * * staleTimeout - number of milliseconds to wait before checking if an item is stale.
+     * * generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it
+     *     is stored in the cache for future requests. Required if generateFunc is present. Set to false to disable timeouts which may cause all get() requests to get stuck forever.
+     * * generateOnReadError - if false, an upstream cache read error will stop the cache.get() method from calling the generate function and will instead pass back the cache error. Defaults to true.
+     * * generateIgnoreWriteError - if false, an upstream cache write error when calling cache.get() will be passed back with the generated value when calling. Defaults to true.
+     * * dropOnError - if true, an error or timeout in the generateFunc causes the stale value to be evicted from the cache. Defaults to true.
+     * * pendingGenerateTimeout - number of milliseconds while generateFunc call is in progress for a given id, before a subsequent generateFunc call is allowed. Defaults to 0 (no blocking of
+     *     concurrent generateFunc calls beyond staleTimeout).
+     * * cache - the cache name configured in server.cache. Defaults to the default cache.
+     * * segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. When called within a
+     *     server method, defaults to '#name' where 'name' is the server method name. Required when called outside of a plugin.
+     * * shared - if true, allows multiple cache provisions to share the same segment. Default to false.
+     * @return Catbox Policy.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
+     */
+    (options: ServerOptionsCache): catbox.Policy;
+
+    /**
+     * Provisions a server cache as described in server.cache where:
+     * @param options - same as the server cache configuration options.
+     * @return Return value: none.
+     * Note that if the server has been initialized or started, the cache will be automatically started to match the state of any other provisioned server cache.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-servercacheprovisionoptions)
+     */
+    provision(options: ServerOptionsCache): Promise<void>;
+}
+
+/**
+ * an event name string.
+ * an event options object.
+ * a podium emitter object.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventevents)
+ */
+export type ServerEventsApplication = string | ServerEventsApplicationObject | Podium;
+
+/**
+ * Object that it will be used in Event
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventevents)
+ */
+export interface ServerEventsApplicationObject {
+    /** the event name string (required). */
+    name: string;
+    /** a string or array of strings specifying the event channels available. Defaults to no channel restrictions (event updates can specify a channel or not). */
+    channels?: string | string[];
+    /**
+     * if true, the data object passed to server.events.emit() is cloned before it is passed to the listeners (unless an override specified by each listener). Defaults to false (data is passed as-is).
+     */
+    clone?: boolean;
+    /**
+     * if true, the data object passed to server.event.emit() must be an array and the listener method is called with each array element passed as a separate argument (unless an override specified
+     * by each listener). This should only be used when the emitted data structure is known and predictable. Defaults to false (data is emitted as a single argument regardless of its type).
+     */
+    spread?: boolean;
+    /**
+     * if true and the criteria object passed to server.event.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended to
+     * the arguments list at the end. A configuration override can be set by each listener. Defaults to false.
+     */
+    tags?: boolean;
+    /**
+     * if true, the same event name can be registered multiple times where the second registration is ignored. Note that if the registration config is changed between registrations, only the first
+     * configuration is used. Defaults to false (a duplicate registration will throw an error).
+     */
+    shared?: boolean;
+}
+
+/**
+ * A criteria object with the following optional keys (unless noted otherwise):
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventsoncriteria-listener)
+ *
+ * The type parameter T is the type of the name of the event.
+ */
+export interface ServerEventCriteria<T> {
+    /** (required) the event name string. */
+    name: T;
+    /**
+     * a string or array of strings specifying the event channels to subscribe to. If the event registration specified a list of allowed channels, the channels array must match the allowed
+     * channels. If channels are specified, event updates without any channel designation will not be included in the subscription. Defaults to no channels filter.
+     */
+    channels?: string | string[];
+    /** if true, the data object passed to server.event.emit() is cloned before it is passed to the listener method. Defaults to the event registration option (which defaults to false). */
+    clone?: boolean;
+    /**
+     * a positive integer indicating the number of times the listener can be called after which the subscription is automatically removed. A count of 1 is the same as calling server.events.once().
+     * Defaults to no limit.
+     */
+    count?: number;
+    /**
+     * filter - the event tags (if present) to subscribe to which can be one of:
+     * * a tag string.
+     * * an array of tag strings.
+     * * an object with the following:
+     * * * tags - a tag string or array of tag strings.
+     * * * all - if true, all tags must be present for the event update to match the subscription. Defaults to false (at least one matching tag).
+     */
+    filter?: string | string[] | {tags: string | string[], all?: boolean};
+    /**
+     * if true, and the data object passed to server.event.emit() is an array, the listener method is called with each array element passed as a separate argument. This should only be used
+     * when the emitted data structure is known and predictable. Defaults to the event registration option (which defaults to false).
+     */
+    spread?: boolean;
+    /**
+     * if true and the criteria object passed to server.event.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is appended
+     * to the arguments list at the end. Defaults to the event registration option (which defaults to false).
+     */
+    tags?: boolean;
+}
+
+export interface LogEvent {
+    /** the event timestamp. */
+    timestamp: string;
+    /** an array of tags identifying the event (e.g. ['error', 'http']) */
+    tags: string[];
+    /** set to 'internal' for internally generated events, otherwise 'app' for events generated by server.log() */
+    channel: "internal" | "app";
+    /** the request identifier. */
+    request: string;
+    /** event-specific information. Available when event data was provided and is not an error. Errors are passed via error. */
+    data: object;
+    /** the error object related to the event if applicable. Cannot appear together with data */
+    error: object;
+}
+
+export interface RequestEvent {
+    /** the event timestamp. */
+    timestamp: string;
+    /** an array of tags identifying the event (e.g. ['error', 'http']) */
+    tags: string[];
+    /** set to 'internal' for internally generated events, otherwise 'app' for events generated by server.log() */
+    channel: "internal" | "app" | "error";
+    /** event-specific information. Available when event data was provided and is not an error. Errors are passed via error. */
+    data: object;
+    /** the error object related to the event if applicable. Cannot appear together with data */
+    error: object;
+}
+
+export type LogEventHandler = (event: LogEvent, tags: object) => void;
+export type RequestEventHandler = (request: Request, event: RequestEvent, tags: object) => void;
+export type ResponseEventHandler = (request: Request) => void;
+export type RouteEventHandler = (route: ServerRoute) => void;
+export type StartEventHandler = () => void;
+export type StopEventHandler = () => void;
+
+export interface PodiumEvent<K extends string, T> {
+    emit(criteria: K, listener: (value: T) => void): void;
+
+    on(criteria: K, listener: (value: T) => void): void;
+
+    once(criteria: K, listener: (value: T) => void): void;
+
+    once(criteria: K): Promise<T>;
+
+    removeListener(criteria: K, listener: Podium.Listener): this;
+
+    removeAllListeners(criteria: K): this;
+
+    hasListeners(criteria: K): this;
+}
+
+/**
+ * Access: podium public interface.
+ * The server events emitter. Utilizes the podium with support for event criteria validation, channels, and filters.
+ * Use the following methods to interact with server.events:
+ * [server.event(events)](https://github.com/hapijs/hapi/blob/master/API.md#server.event()) - register application events.
+ * [server.events.emit(criteria, data)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.emit()) - emit server events.
+ * [server.events.on(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.on()) - subscribe to all events.
+ * [server.events.once(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.once()) - subscribe to
+ * Other methods include: server.events.removeListener(name, listener), server.events.removeAllListeners(name), and server.events.hasListeners(name).
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+ */
+export interface ServerEvents extends Podium {
+    /**
+     * Subscribe to an event where:
+     * @param criteria - the subscription criteria which must be one of:
+     * * event name string which can be any of the built-in server events
+     * * a custom application event registered with server.event().
+     * * a criteria object
+     * @param listener - the handler method set to receive event updates. The function signature depends on the event argument, and the spread and tags options.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventsoncriteria-listener)
+     * See ['log' event](https://github.com/hapijs/hapi/blob/master/API.md#-log-event)
+     * See ['request' event](https://github.com/hapijs/hapi/blob/master/API.md#-request-event)
+     * See ['response' event](https://github.com/hapijs/hapi/blob/master/API.md#-response-event)
+     * See ['route' event](https://github.com/hapijs/hapi/blob/master/API.md#-route-event)
+     * See ['start' event](https://github.com/hapijs/hapi/blob/master/API.md#-start-event)
+     * See ['stop' event](https://github.com/hapijs/hapi/blob/master/API.md#-stop-event)
+     */
+    on(criteria: "log" | ServerEventCriteria<"log">, listener: LogEventHandler): void;
+
+    on(criteria: "request" | ServerEventCriteria<"request">, listener: RequestEventHandler): void;
+
+    on(criteria: "response" | ServerEventCriteria<"response">, listener: ResponseEventHandler): void;
+
+    on(criteria: "route" | ServerEventCriteria<"route">, listener: RouteEventHandler): void;
+
+    on(criteria: "start" | ServerEventCriteria<"start">, listener: StartEventHandler): void;
+
+    on(criteria: "stop" | ServerEventCriteria<"stop">, listener: StopEventHandler): void;
+
+    /**
+     * Same as calling [server.events.on()](https://github.com/hapijs/hapi/blob/master/API.md#server.events.on()) with the count option set to 1.
+     * @param criteria - the subscription criteria which must be one of:
+     * * event name string which can be any of the built-in server events
+     * * a custom application event registered with server.event().
+     * * a criteria object
+     * @param listener - the handler method set to receive event updates. The function signature depends on the event argument, and the spread and tags options.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servereventsoncecriteria-listener)
+     */
+    once(criteria: "log" | ServerEventCriteria<"log">, listener: LogEventHandler): void;
+
+    once(criteria: "request" | ServerEventCriteria<"request">, listener: RequestEventHandler): void;
+
+    once(criteria: "response" | ServerEventCriteria<"response">, listener: ResponseEventHandler): void;
+
+    once(criteria: "route" | ServerEventCriteria<"route">, listener: RouteEventHandler): void;
+
+    once(criteria: "start" | ServerEventCriteria<"start">, listener: StartEventHandler): void;
+
+    once(criteria: "stop" | ServerEventCriteria<"stop">, listener: StopEventHandler): void;
+
+    /**
+     * Same as calling server.events.on() with the count option set to 1.
+     * @param criteria - the subscription criteria which must be one of:
+     * * event name string which can be any of the built-in server events
+     * * a custom application event registered with server.event().
+     * * a criteria object
+     * @return Return value: a promise that resolves when the event is emitted.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-servereventsoncecriteria)
+     */
+    once(criteria: string | ServerEventCriteria<string>): Promise<any>;
+
+    /**
+     * The follow method is only mentioned in Hapi API. The doc about that method can be found [here](https://github.com/hapijs/podium/blob/master/API.md#podiumremovelistenername-listener)
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+     */
+    removeListener(name: string, listener: Podium.Listener): Podium;
+
+    /**
+     * The follow method is only mentioned in Hapi API. The doc about that method can be found [here](https://github.com/hapijs/podium/blob/master/API.md#podiumremovealllistenersname)
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+     */
+    removeAllListeners(name: string): Podium;
+
+    /**
+     * The follow method is only mentioned in Hapi API. The doc about that method can be found [here](https://github.com/hapijs/podium/blob/master/API.md#podiumhaslistenersname)
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+     */
+    hasListeners(name: string): boolean;
+}
+
+/**
+ * The extension point event name. The available extension points include the request extension points as well as the following server extension points:
+ * 'onPreStart' - called before the connection listeners are started.
+ * 'onPostStart' - called after the connection listeners are started.
+ * 'onPreStop' - called before the connection listeners are stopped.
+ * 'onPostStop' - called after the connection listeners are stopped.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
+ * 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'
+    | 'onCredentials'
+    | 'onPostAuth'
+    | 'onPreHandler'
+    | 'onPostHandler'
+    | 'onPreResponse';
+
+/**
+ * [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:
+ * @param events - an object or array of objects with the following:
+ * * type - (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
+ * * * 'onPreStart' - called before the connection listeners are started.
+ * * * 'onPostStart' - called after the connection listeners are started.
+ * * * 'onPreStop' - called before the connection listeners are stopped.
+ * * * 'onPostStop' - called after the connection listeners are stopped.
+ * * method - (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
+ * * * server extension points: async function(server) where:
+ * * * * server - the server object.
+ * * * * this - the object provided via options.bind or the current active context set with server.bind().
+ * * * request extension points: a lifecycle method.
+ * * 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.
+ * @return void
+ */
+export interface ServerExtEventsObject {
+    /**
+     * (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
+     * * 'onPreStart' - called before the connection listeners are started.
+     * * 'onPostStart' - called after the connection listeners are started.
+     * * 'onPreStop' - called before the connection listeners are stopped.
+     */
+    type: ServerExtType;
+    /**
+     * (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
+     * * server extension points: async function(server) where:
+     * * * server - the server object.
+     * * * this - the object provided via options.bind or the current active context set with server.bind().
+     * * 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;
+}
+
+/**
+ * [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:
+ * @param events - an object or array of objects with the following:
+ * * type - (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
+ * * * 'onPreStart' - called before the connection listeners are started.
+ * * * 'onPostStart' - called after the connection listeners are started.
+ * * * 'onPreStop' - called before the connection listeners are stopped.
+ * * * 'onPostStop' - called after the connection listeners are stopped.
+ * * method - (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
+ * * * server extension points: async function(server) where:
+ * * * * server - the server object.
+ * * * * this - the object provided via options.bind or the current active context set with server.bind().
+ * * * request extension points: a lifecycle method.
+ * * 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.
+ * @return void
+ */
+export interface ServerExtEventsRequestObject {
+    /**
+     * (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
+     * * 'onPreStart' - called before the connection listeners are started.
+     * * 'onPostStart' - called after the connection listeners are started.
+     * * 'onPreStop' - called before the connection listeners are stopped.
+     * * 'onPostStop' - called after the connection listeners are stopped.
+     */
+    type: ServerRequestExtType;
+    /**
+     * (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
+     * * server extension points: async function(server) where:
+     * * * server - the server object.
+     * * * this - the object provided via options.bind or the current active context set with server.bind().
+     * * request extension points: a lifecycle method.
+     */
+    method: Lifecycle.Method | Lifecycle.Method[];
+    /**
+     * (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 type ServerExtPointFunction = (server: Server) => void;
+
+/**
+ * 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. For context [See
+ * docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
+ */
+export interface ServerExtOptions {
+    /**
+     * 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.
+     */
+    before: string | string[];
+    /**
+     * 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.
+     */
+    after: string | string[];
+    /**
+     * a context object passed back to the provided method (via this) when called. Ignored if the method is an arrow function.
+     */
+    bind: object;
+    /**
+     * 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.
+     */
+    sandbox?: 'server' | 'plugin';
+}
+
+/**
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverinfo)
+ * An object containing information about the server where:
+ */
+export interface ServerInfo {
+    /**
+     * a unique server identifier (using the format '{hostname}:{pid}:{now base36}').
+     */
+    id: string;
+
+    /**
+     * server creation timestamp.
+     */
+    created: number;
+
+    /**
+     * server start timestamp (0 when stopped).
+     */
+    started: number;
+
+    /**
+     * the connection [port](https://github.com/hapijs/hapi/blob/master/API.md#server.options.port) based on the following rules:
+     *  * before the server has been started: the configured port value.
+     *  * after the server has been started: the actual port assigned when no port is configured or was set to 0.
+     */
+    port: number | string;
+
+    /**
+     * The [host](https://github.com/hapijs/hapi/blob/master/API.md#server.options.host) configuration value.
+     */
+    host: string;
+
+    /**
+     * the active IP address the connection was bound to after starting. Set to undefined until the server has been
+     * started or when using a non TCP port (e.g. UNIX domain socket).
+     */
+    address: undefined | string;
+
+    /**
+     *  the protocol used:
+     * * 'http' - HTTP.
+     * * 'https' - HTTPS.
+     * * 'socket' - UNIX domain socket or Windows named pipe.
+     */
+    protocol: 'http' | 'https' | 'socket';
+
+    /**
+     * a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains
+     * the uri value if set, otherwise constructed from the available settings. If no port is configured or is set
+     * to 0, the uri will not include a port component until the server is started.
+     */
+    uri: string;
+}
+
+/**
+ * An object with:
+ * * method - (optional) the request HTTP method (e.g. 'POST'). Defaults to 'GET'.
+ * * url - (required) the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.
+ * * headers - (optional) an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default shot headers.
+ * * payload - (optional) an string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload
+ * processing defaults to 'application/json' if no 'Content-Type' header provided.
+ * * credentials - (optional) an credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if
+ * they were received via an authentication scheme. Defaults to no credentials.
+ * * artifacts - (optional) an artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as
+ * if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.
+ * * app - (optional) sets the initial value of request.app, defaults to {}.
+ * * plugins - (optional) sets the initial value of request.plugins, defaults to {}.
+ * * allowInternals - (optional) allows access to routes with config.isInternal set to true. Defaults to false.
+ * * remoteAddress - (optional) sets the remote address for the incoming connection.
+ * * simulate - (optional) an object with options used to simulate client request stream conditions for testing:
+ * * error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
+ * * close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
+ * * end - if false, does not end the stream. Defaults to true.
+ * * split - indicates whether the request payload will be split into chunks. Defaults to undefined, meaning payload will not be chunked.
+ * * validate - (optional) if false, the options inputs are not validated. This is recommended for run-time usage of inject() to make it perform faster where input validation can be tested
+ * separately.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinjectoptions)
+ * For context [Shot module](https://github.com/hapijs/shot)
+ */
+export interface ServerInjectOptions extends Shot.RequestOptions {
+    /**
+     * an credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via
+     * an authentication scheme. Defaults to no credentials.
+     */
+    credentials?: AuthCredentials;
+    /**
+     * (an artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received
+     * via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.
+     */
+    artifacts?: object;
+    /**
+     * sets the initial value of request.app, defaults to {}.
+     */
+    app?: any;
+    /**
+     * sets the initial value of request.plugins, defaults to {}.
+     */
+    plugins?: PluginsStates;
+    /**
+     * allows access to routes with config.isInternal set to true. Defaults to false.
+     */
+    allowInternals?: boolean;
+}
+
+/**
+ * A response object with the following properties:
+ * * statusCode - the HTTP status code.
+ * * headers - an object containing the headers set.
+ * * payload - the response payload string.
+ * * rawPayload - the raw response payload buffer.
+ * * raw - an object with the injection request and response objects:
+ * * req - the simulated node request object.
+ * * res - the simulated node response object.
+ * * result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of
+ * the internal objects returned (instead of parsing the response string).
+ * * request - the request object.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinjectoptions)
+ * For context [Shot module](https://github.com/hapijs/shot)
+ */
+export interface ServerInjectResponse extends Shot.ResponseObject {
+    /**
+     * the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the
+     * internal objects returned (instead of parsing the response string).
+     */
+    result: object | undefined;
+    /**
+     * the request object.
+     */
+    request: Request;
+}
+
+/**
+ * The method function with a signature async function(...args, [flags]) where:
+ * * ...args - the method function arguments (can be any number of arguments or none).
+ * * flags - when caching is enabled, an object used to set optional method result flags:
+ * * * ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
+ */
+export type ServerMethod = (...args: any[]) => Promise<any>;
+
+/**
+ * The same cache configuration used in server.cache().
+ * The generateTimeout option is required.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
+ */
+export interface ServerMethodCache extends catbox.PolicyOptions {
+    generateTimeout: number | false;
+}
+
+/**
+ * Configuration object:
+ * * bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is an
+ * arrow function.
+ * * cache - the same cache configuration used in server.cache(). The generateTimeout option is required.
+ * * generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the flags argument is not passed as input). The server will automatically
+ * generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided
+ * which takes the same arguments as the function and returns a unique string (or null if no key can be generated). For reference [See
+ * docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
+ */
+export interface ServerMethodOptions {
+    /**
+     * a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is an arrow
+     * function.
+     */
+    bind?: object;
+    /**
+     * the same cache configuration used in server.cache(). The generateTimeout option is required.
+     */
+    cache?: ServerMethodCache;
+    /**
+     * a function used to generate a unique key (for caching) from the arguments passed to the method function (the flags argument is not passed as input). The server will automatically generate a
+     * unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which
+     * takes the same arguments as the function and returns a unique string (or null if no key can be generated).
+     */
+    generateKey?: (...args: any[]) => any;
+}
+
+/**
+ * An object or an array of objects where each one contains:
+ * * name - the method name.
+ * * method - the method function.
+ * * options - (optional) settings.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodmethods)
+ */
+export interface ServerMethodConfigurationObject {
+    /**
+     * the method name.
+     */
+    name: string;
+    /**
+     * the method function.
+     */
+    method: ServerMethod;
+    /**
+     * (optional) settings.
+     */
+    options?: ServerMethodOptions;
+}
+
+/**
+ * hapi uses catbox for its cache implementation which includes support for common storage solutions (e.g. Redis,
+ * MongoDB, Memcached, Riak, among others). Caching is only utilized if methods and plugins explicitly store their state in the cache.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-cache)
+ */
+export interface ServerOptionsCache extends catbox.PolicyOptions {
+    /** a class, a prototype function, or a catbox engine object. */
+    engine?: catbox.EnginePrototypeOrObject;
+
+    /**
+     * an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines
+     * the default cache. If every cache includes a name, a default memory cache is provisioned as well.
+     */
+    name?: string;
+
+    /** if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false. */
+    shared?: boolean;
+
+    /** (optional) string used to isolate cached data. Defaults to 'hapi-cache'. */
+    partition?: string;
+
+    /** other options passed to the catbox strategy used. Other options are only passed to catbox when engine above is a class or function and ignored if engine is a catbox engine object). */
+    [s: string]: any;
+}
+
+export interface ServerOptionsCompression {
+    minBytes: number;
+}
+
+/**
+ * The server options control the behavior of the server object. Note that the options object is deeply cloned
+ * (with the exception of listener which is shallowly copied) and should not contain any values that are unsafe to perform deep copy on.
+ * All options are optionals.
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-server-options)
+ */
+export interface ServerOptions {
+    /**
+     * Default value: '0.0.0.0' (all available network interfaces).
+     * Sets the hostname or IP address the server will listen on. If not configured, defaults to host if present, otherwise to all available network interfaces. Set to '127.0.0.1' or 'localhost' to
+     * restrict the server to only those coming from the same host.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsaddress)
+     */
+    address?: string;
+
+    /**
+     * Default value: {}.
+     * Provides application-specific configuration which can later be accessed via server.settings.app. The framework does not interact with this object. It is simply a reference made available
+     * anywhere a server reference is provided. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time
+     * state.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsapp)
+     */
+    app?: any;
+
+    /**
+     * Default value: true.
+     * Used to disable the automatic initialization of the listener. When false, indicates that the listener will be started manually outside the framework.
+     * Cannot be set to true along with a port value.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsautolisten)
+     */
+    autoListen?: boolean;
+
+    /**
+     * Default value: { engine: require('catbox-memory' }.
+     * Sets up server-side caching providers. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and
+     * capabilities. hapi uses catbox for its cache implementation which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, Riak, among others). Caching is only utilized
+     * if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. The configuration can be assigned one or more
+     * (array):
+     * * a class or prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')). A new catbox client will be created internally using this
+     * function.
+     * * a configuration object with the following:
+     * * * engine - a class, a prototype function, or a catbox engine object.
+     * * * name - an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines
+     * the default cache. If every cache includes a name, a default memory cache is provisioned as well.
+     * * * shared - if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
+     * * * partition - (optional) string used to isolate cached data. Defaults to 'hapi-cache'.
+     * * * other options passed to the catbox strategy used. Other options are only passed to catbox when engine above is a class or function and ignored if engine is a catbox engine object).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionscache)
+     */
+    cache?: catbox.EnginePrototype | ServerOptionsCache | ServerOptionsCache[];
+
+    /**
+     * Default value: { minBytes: 1024 }.
+     * Defines server handling of content encoding requests. If false, response content encoding is disabled and no compression is performed by the server.
+     */
+    compression?: boolean | ServerOptionsCompression;
+
+    /**
+     * Default value: { request: ['implementation'] }.
+     * Determines which logged events are sent to the console. This should only be used for development and does not affect which events are actually logged internally and recorded. Set to false to
+     * disable all console logging, or to an object with:
+     * * log - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. Defaults to no output.
+     * * request - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to
+     * display all errors, set the option to ['error']. To turn off all console debug messages set it to false. To display all request logs, set it to '*'. Defaults to uncaught errors thrown in
+     * external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. For example, to display all errors, set the log
+     * or request to ['error']. To turn off all output set the log or request to false. To display all server logs, set the log or request to '*'. To disable all debug information, set debug to
+     * false.
+     */
+    debug?: false | {
+        log?: string[] | false;
+        request?: string[] | false;
+    };
+
+    /**
+     * Default value: the operating system hostname and if not available, to 'localhost'.
+     * The public hostname or IP address. Used to set server.info.host and server.info.uri and as address is none provided.
+     */
+    host?: string;
+
+    /**
+     * Default value: none.
+     * An optional node HTTP (or HTTPS) http.Server object (or an object with a compatible interface).
+     * If the listener needs to be manually started, set autoListen to false.
+     * If the listener uses TLS, set tls to true.
+     */
+    listener?: http.Server;
+
+    /**
+     * Default value: { sampleInterval: 0 }.
+     * Server excessive load handling limits where:
+     * * sampleInterval - the frequency of sampling in milliseconds. When set to 0, the other load options are ignored. Defaults to 0 (no sampling).
+     * * maxHeapUsedBytes - maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).
+     * * maxRssBytes - maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).
+     * * maxEventLoopDelay - maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).
+     */
+    load?: {
+        /** the frequency of sampling in milliseconds. When set to 0, the other load options are ignored. Defaults to 0 (no sampling). */
+        sampleInterval?: number;
+        /** maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit). */
+        maxHeapUsedBytes?: number;
+        /**
+         * maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).
+         */
+        maxRssBytes?: number;
+        /**
+         * maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response.
+         * Defaults to 0 (no limit).
+         */
+        maxEventLoopDelay?: number;
+    };
+
+    /**
+     * Default value: none.
+     * Options passed to the mimos module when generating the mime database used by the server (and accessed via server.mime):
+     * * override - an object hash that is merged into the built in mime information specified here. Each key value pair represents a single mime object. Each override value must contain:
+     * * key - the lower-cased mime-type string (e.g. 'application/javascript').
+     * * value - an object following the specifications outlined here. Additional values include:
+     * * * type - specify the type value of result objects, defaults to key.
+     * * * predicate - method with signature function(mime) when this mime type is found in the database, this function will execute to allows customizations.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsmime)
+     */
+    mime?: MimosOptions;
+
+    /**
+     * Default value: {}.
+     * Plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the
+     * difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state.
+     */
+    plugins?: PluginSpecificConfiguration;
+
+    /**
+     * Default value: 0 (an ephemeral port).
+     * The TCP port the server will listen to. Defaults the next available port when the server is started (and assigned to server.info.port).
+     * If port is a string containing a '/' character, it is used as a UNIX domain socket path. If it starts with '\.\pipe', it is used as a Windows named pipe.
+     */
+    port?: number | string;
+
+    /**
+     * Default value: { isCaseSensitive: true, stripTrailingSlash: false }.
+     * Controls how incoming request URIs are matched against the routing table:
+     * * isCaseSensitive - determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.
+     * * stripTrailingSlash - removes trailing slashes on incoming paths. Defaults to false.
+     */
+    router?: {
+        isCaseSensitive?: boolean;
+        stripTrailingSlash?: boolean;
+    };
+
+    /**
+     * Default value: none.
+     * A route options object used as the default configuration for every route.
+     */
+    routes?: RouteOptions;
+
+    /**
+     * Default value:
+     * {
+     *     strictHeader: true,
+     *     ignoreErrors: false,
+     *     isSecure: true,
+     *     isHttpOnly: true,
+     *     isSameSite: 'Strict',
+     *     encoding: 'none'
+     * }
+     * Sets the default configuration for every state (cookie) set explicitly via server.state() or implicitly (without definition) using the state configuration object.
+     */
+    // TODO I am not sure if I need to use all the server.state() definition (like the default value) OR only the options below. The v16 use "any" here.
+    // state?: ServerStateCookieOptions;
+    state?: {
+        strictHeader?: boolean,
+        ignoreErrors?: boolean,
+        isSecure?: boolean,
+        isHttpOnly?: boolean,
+        isSameSite?: false | 'Strict' | 'Lax',
+        encoding?: 'none' | 'base64' | 'base64json' | 'form' | 'iron'
+    };
+
+    /**
+     * Default value: none.
+     * Used to create an HTTPS connection. The tls object is passed unchanged to the node HTTPS server as described in the node HTTPS documentation.
+     */
+    tls?: true | https.RequestOptions;
+
+    /**
+     * Default value: constructed from runtime server information.
+     * The full public URI without the path (e.g. 'http://example.com:8080'). If present, used as the server server.info.uri, otherwise constructed from the server settings.
+     */
+    uri?: string;
+}
+
+/**
+ * The realm object contains sandboxed server settings specific to each plugin or authentication strategy. When registering a plugin or an authentication scheme, a server object reference is provided
+ * with a new server.realm container specific to that registration. It allows each plugin to maintain its own settings without leaking and affecting other plugins. For example, a plugin can set a
+ * default file path for local resources without breaking other plugins' configured paths. When calling server.bind(), the active realm's settings.bind property is set which is then used by routes
+ * and extensions added at the same level (server root or plugin).
+ *
+ * https://github.com/hapijs/hapi/blob/master/API.md#server.realm
+ */
+export interface ServerRealm {
+    /** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes: */
+    modifiers: {
+        /** routes preferences: */
+        route: {
+            /**
+             * the route path prefix used by any calls to server.route() from the server. Note that if a prefix is used and the route path is set to '/', the resulting path will not include
+             * the trailing slash.
+             */
+            prefix: string;
+            /** the route virtual host settings used by any calls to server.route() from the server. */
+            vhost: string;
+        }
+    };
+    /** the realm of the parent server object, or null for the root server. */
+    parent: ServerRealm | null;
+    /** the active plugin name (empty string if at the server root). */
+    plugin: string;
+    /** the plugin options object passed at registration. */
+    pluginOptions: object;
+    /** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
+    plugins: PluginsStates;
+    /** settings overrides */
+    settings: {
+        files: {
+            relativeTo: string;
+        };
+        bind: object;
+    };
+}
+
+/**
+ * Registration options (different from the options passed to the registration function):
+ * * once - if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the
+ * second time a plugin is registered on the server.
+ * * routes - modifiers applied to each route added by the plugin:
+ * * * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific
+ * prefix.
+ * * * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverregisterplugins-options)
+ */
+export interface ServerRegisterOptions {
+    /**
+     * if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the second
+     * time a plugin is registered on the server.
+     */
+    once?: boolean;
+    /**
+     * modifiers applied to each route added by the plugin:
+     */
+    routes?: {
+        /**
+         * string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+         */
+        prefix: string;
+        /**
+         * virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+         */
+        vhost?: string | string[];
+    };
+}
+
+/**
+ * An object with the following:
+ * * plugin - a plugin object.
+ * * options - (optional) options passed to the plugin during registration.
+ * * once - if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the
+ * second time a plugin is registered on the server.
+ * * routes - modifiers applied to each route added by the plugin:
+ * * * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific
+ * prefix.
+ * * * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+ * For reference [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverregisterplugins-options)
+ *
+ * The type parameter T is the type of the plugin configuration options.
+ */
+export interface ServerRegisterPluginObject<T> extends ServerRegisterOptions {
+    /**
+     * a plugin object.
+     */
+    plugin: Plugin<T>;
+    /**
+     * options passed to the plugin during registration.
+     */
+    options?: T;
+}
+
+export interface ServerRegisterPluginObjectArray<T, U, V, W, X, Y, Z> extends Array<ServerRegisterPluginObject<T>
+                                                                                    | ServerRegisterPluginObject<U>
+                                                                                    | ServerRegisterPluginObject<V>
+                                                                                    | ServerRegisterPluginObject<W>
+                                                                                    | ServerRegisterPluginObject<X>
+                                                                                    | ServerRegisterPluginObject<Y>
+                                                                                    | ServerRegisterPluginObject<Z>
+                                                                                    | undefined> {
+    0: ServerRegisterPluginObject<T>;
+    1?: ServerRegisterPluginObject<U>;
+    2?: ServerRegisterPluginObject<V>;
+    3?: ServerRegisterPluginObject<W>;
+    4?: ServerRegisterPluginObject<X>;
+    5?: ServerRegisterPluginObject<Y>;
+    6?: ServerRegisterPluginObject<Z>;
+}
+
+/* tslint:disable-next-line:no-empty-interface */
+export interface HandlerDecorations {
+}
+
+/**
+ * A route configuration object or an array of configuration objects where each object contains:
+ * * path - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the server's router configuration. The
+ * path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.
+ * * method - (required) the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP
+ * method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has the same
+ * result as adding the same route with different methods manually.
+ * * vhost - (optional) a domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the
+ * header only (excluding the port). Defaults to all hosts.
+ * * handler - (required when handler is not set) the route handler function called to generate the response after successful authentication and validation.
+ * * options - additional route options. The options value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being
+ * added to and this is bound to the current realm's bind option.
+ * * rules - route custom rules object. The object is passed to each rules processor registered with server.rules(). Cannot be used if route.options.rules is defined.
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrouteroute)
+ */
+export interface ServerRoute {
+    /**
+     * (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the server's router configuration. The path
+     * can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters. For context [See
+     * docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrouteroute) For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#path-parameters)
+     */
+    path: string;
+
+    /**
+     * (required) the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP method
+     * (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has the same
+     * result as adding the same route with different methods manually.
+     */
+    method: Util.HTTP_METHODS_PARTIAL | Util.HTTP_METHODS_PARTIAL[] | string | string[];
+
+    /**
+     * (optional) a domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the header
+     * only (excluding the port). Defaults to all hosts.
+     */
+    vhost?: string | string[];
+
+    /**
+     * (required when handler is not set) the route handler function called to generate the response after successful authentication and validation.
+     */
+    handler?: Lifecycle.Method | HandlerDecorations;
+
+    /**
+     * additional route options. The options value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being added to
+     * and this is bound to the current realm's bind option.
+     */
+    options?: RouteOptions | ((server: Server) => RouteOptions);
+
+    /**
+     * route custom rules object. The object is passed to each rules processor registered with server.rules(). Cannot be used if route.options.rules is defined.
+     */
+    rules?: object;
+}
+
+/**
+ * Optional cookie settings
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstatename-options)
+ */
+export interface ServerStateCookieOptions {
+    /** time-to-live in milliseconds. Defaults to null (session time-life - cookies are deleted when the browser is closed). */
+    ttl?: number | null;
+    /** sets the 'Secure' flag. Defaults to true. */
+    isSecure?: boolean;
+    /** sets the 'HttpOnly' flag. Defaults to true. */
+    isHttpOnly?: boolean;
+    /**
+     * sets the 'SameSite' flag. The value must be one of:
+     *  * false - no flag.
+     *  * 'Strict' - sets the value to 'Strict' (this is the default value).
+     *  * 'Lax' - sets the value to 'Lax'.
+     */
+    isSameSite?: false | 'Strict' | 'Lax';
+    /** the path scope. Defaults to null (no path). */
+    path?: string | null;
+    /** the domain scope. Defaults to null (no domain). */
+    domain?: string | null;
+
+    /**
+     * if present and the cookie was not received from the client or explicitly set by the route handler, the
+     * cookie is automatically added to the response with the provided value. The value can be
+     * a function with signature async function(request) where:
+     */
+    autoValue?(request: Request): void;
+
+    /**
+     * encoding performs on the provided value before serialization. Options are:
+     *  * 'none' - no encoding. When used, the cookie value must be a string. This is the default value.
+     *  * 'base64' - string value is encoded using Base64.
+     *  * 'base64json' - object value is JSON-stringified then encoded using Base64.
+     *  * 'form' - object value is encoded using the x-www-form-urlencoded method.
+     *  * 'iron' - Encrypts and sign the value using iron.
+     */
+    encoding?: 'none' | 'base64' | 'base64json' | 'form' | 'iron';
+    /**
+     * an object used to calculate an HMAC for cookie integrity validation. This does not provide privacy, only a mean
+     * to verify that the cookie value was generated by the server. Redundant when 'iron' encoding is used. Options are:
+     *  * integrity - algorithm options. Defaults to require('iron').defaults.integrity.
+     *  * password - password used for HMAC key generation (must be at least 32 characters long).
+     */
+    sign?: {
+        integrity?: SealOptionsSub;
+        password: string;
+    };
+    /** password used for 'iron' encoding (must be at least 32 characters long). */
+    password?: string;
+    /** options for 'iron' encoding. Defaults to require('iron').defaults. */
+    iron?: SealOptions;
+    /** if true, errors are ignored and treated as missing cookies. */
+    ignoreErrors?: boolean;
+    /** if true, automatically instruct the client to remove invalid cookies. Defaults to false. */
+    clearInvalid?: boolean;
+    /** if false, allows any cookie value including values in violation of RFC 6265. Defaults to true. */
+    strictHeader?: boolean;
+    /** used by proxy plugins (e.g. h2o2). */
+    passThrough?: any;
+}
+
+/**
+ * A single object or an array of object where each contains:
+ * * name - the cookie name.
+ * * value - the cookie value.
+ * * options - cookie configuration to override the server settings.
+ */
+export interface ServerStateFormat {
+    name: string;
+    value: string;
+    options: ServerStateCookieOptions;
+}
+
+/**
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstatename-options)
+ * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsstate)
+ */
+export interface ServerState {
+    /**
+     * The server cookies manager.
+     * Access: read only and statehood public interface.
+     */
+    readonly states: object;
+
+    /**
+     * The server cookies manager settings. The settings are based on the values configured in [server.options.state](https://github.com/hapijs/hapi/blob/master/API.md#server.options.state).
+     */
+    readonly settings: ServerStateCookieOptions;
+
+    /**
+     * An object containing the configuration of each cookie added via [server.state()](https://github.com/hapijs/hapi/blob/master/API.md#server.state()) where each key is the
+     * cookie name and value is the configuration object.
+     */
+    readonly cookies: object;
+
+    /**
+     * An array containing the names of all configued cookies.
+     */
+    readonly names: string[];
+
+    /**
+     * Same as calling [server.state()](https://github.com/hapijs/hapi/blob/master/API.md#server.state()).
+     */
+    add(name: string, options?: ServerStateCookieOptions): void;
+
+    /**
+     * Formats an HTTP 'Set-Cookie' header based on the server.options.state where:
+     * @param cookies - a single object or an array of object where each contains:
+     * * name - the cookie name.
+     * * value - the cookie value.
+     * * options - cookie configuration to override the server settings.
+     * @return Return value: a header string.
+     * Note that this utility uses the server configuration but does not change the server state. It is provided for manual cookie formating (e.g. when headers are set manually).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-async-serverstatesformatcookies)
+     */
+    format(cookies: ServerStateFormat | ServerStateFormat[]): string;
+
+    /**
+     * Parses an HTTP 'Cookies' header based on the server.options.state where:
+     * @param header - the HTTP header.
+     * @return Return value: an object where each key is a cookie name and value is the parsed cookie.
+     * Note that this utility uses the server configuration but does not change the server state. It is provided for manual cookie parsing (e.g. when server parsing is disabled).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-async-serverstatesparseheader)
+     */
+    parse(header: string): Util.Dictionary<string>;
+}
+
+/**
+ * The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler.
+ * If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
+ */
+export interface HandlerDecorationMethod {
+    (route: RouteOptions, options: any): Lifecycle.Method;
+    defaults?: RouteOptions | ((method: any) => RouteOptions);
+}
+
+/**
+ * The general case for decorators added via server.decorate.
+ */
+export type DecorationMethod<T> = (this: T, ...args: any[]) => any;
+
+/**
+ * The server object is the main application container. The server manages all incoming requests along with all
+ * the facilities provided by the framework. Each server supports a single connection (e.g. listen to port 80).
+ * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#server)
+ */
+export class Server extends Podium {
+    /**
+     * Creates a new server object
+     * @param options server configuration object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptions)
+     */
+    constructor(options?: ServerOptions);
+
+    /**
+     * Provides a safe place to store server-specific run-time application data without potential conflicts with
+     * the framework internals. The data can be accessed whenever the server is accessible.
+     * Initialized with an empty object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverapp)
+     */
+    app?: ApplicationState;
+
+    /**
+     * Server Auth: properties and methods
+     */
+    auth: ServerAuth;
+
+    /**
+     * Provides access to the decorations already applied to various framework interfaces. The object must not be
+     * modified directly, but only through server.decorate.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdecorations)
+     */
+    readonly decorations: {
+        /**
+         * decorations on the request object.
+         */
+        request: string[],
+        /**
+         * decorations on the response toolkit.
+         */
+        toolkit: string[],
+        /**
+         * decorations on the server object.
+         */
+        server: string[]
+    };
+
+    /**
+     * Register custom application events where:
+     * @param events must be one of:
+     * * an event name string.
+     * * an event options object with the following optional keys (unless noted otherwise):
+     * * * name - the event name string (required).
+     * * * channels - a string or array of strings specifying the event channels available. Defaults to no channel restrictions (event updates can specify a channel or not).
+     * * * clone - if true, the data object passed to server.events.emit() is cloned before it is passed to the listeners (unless an override specified by each listener). Defaults to false (data is
+     *     passed as-is).
+     * * * spread - if true, the data object passed to server.event.emit() must be an array and the listener method is called with each array element passed as a separate argument (unless an override
+     *     specified by each listener). This should only be used when the emitted data structure is known and predictable. Defaults to false (data is emitted as a single argument regardless of its
+     *     type).
+     * * * tags - if true and the criteria object passed to server.event.emit() includes tags, the tags are mapped to an object (where each tag string is the key and the value is true) which is
+     *     appended to the arguments list at the end. A configuration override can be set by each listener. Defaults to false.
+     * * * shared - if true, the same event name can be registered multiple times where the second registration is ignored. Note that if the registration config is changed between registrations, only
+     *     the first configuration is used. Defaults to false (a duplicate registration will throw an error).
+     * * a podium emitter object.
+     * * an array containing any of the above.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+     */
+    event(events: ServerEventsApplication | ServerEventsApplication[]): void;
+
+    /**
+     * Access: podium public interface.
+     * The server events emitter. Utilizes the podium with support for event criteria validation, channels, and filters.
+     * Use the following methods to interact with server.events:
+     * [server.events.emit(criteria, data)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.emit()) - emit server events.
+     * [server.events.on(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.on()) - subscribe to all events.
+     * [server.events.once(criteria, listener)](https://github.com/hapijs/hapi/blob/master/API.md#server.events.once()) - subscribe to
+     * Other methods include: server.events.removeListener(name, listener), server.events.removeAllListeners(name), and server.events.hasListeners(name).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverevents)
+     */
+    events: ServerEvents;
+
+    /**
+     * An object containing information about the server where:
+     * * id - a unique server identifier (using the format '{hostname}:{pid}:{now base36}').
+     * * created - server creation timestamp.
+     * * started - server start timestamp (0 when stopped).
+     * * port - the connection port based on the following rules:
+     * * host - The host configuration value.
+     * * address - the active IP address the connection was bound to after starting. Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).
+     * * protocol - the protocol used:
+     * * 'http' - HTTP.
+     * * 'https' - HTTPS.
+     * * 'socket' - UNIX domain socket or Windows named pipe.
+     * * uri - a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri value if set, otherwise constructed from the available
+     * settings. If no port is configured or is set to 0, the uri will not include a port component until the server is started.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverinfo)
+     */
+    readonly info: ServerInfo;
+
+    /**
+     * Access: read only and listener public interface.
+     * The node HTTP server object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverlistener)
+     */
+    listener: http.Server;
+
+    /**
+     * An object containing the process load metrics (when load.sampleInterval is enabled):
+     * * eventLoopDelay - event loop delay milliseconds.
+     * * heapUsed - V8 heap usage.
+     * * rss - RSS memory usage.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverload)
+     */
+    readonly load: {
+        /**
+         * event loop delay milliseconds.
+         */
+        eventLoopDelay: number;
+        /**
+         * V8 heap usage.
+         */
+        heapUsed: number;
+        /**
+         * RSS memory usage.
+         */
+        rss: number;
+    };
+
+    /**
+     * Server methods are functions registered with the server and used throughout the application as a common utility.
+     * Their advantage is in the ability to configure them to use the built-in cache and share across multiple request
+     * handlers without having to create a common module.
+     * sever.methods is an object which provides access to the methods registered via server.method() where each
+     * server method name is an object property.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethods
+     */
+    readonly methods: Util.Dictionary<ServerMethod>;
+
+    /**
+     * Provides access to the server MIME database used for setting content-type information. The object must not be
+     * modified directly but only through the [mime](https://github.com/hapijs/hapi/blob/master/API.md#server.options.mime) server setting.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermime)
+     */
+    mime: any;
+
+    /**
+     * An object containing the values exposed by each registered plugin where each key is a plugin name and the values
+     * are the exposed properties by each plugin using server.expose(). Plugins may set the value of
+     * the server.plugins[name] object directly or via the server.expose() method.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverplugins)
+     */
+    plugins: any;
+
+    /**
+     * The realm object contains sandboxed server settings specific to each plugin or authentication strategy. When
+     * registering a plugin or an authentication scheme, a server object reference is provided with a new server.realm
+     * container specific to that registration. It allows each plugin to maintain its own settings without leaking
+     * and affecting other plugins.
+     * For example, a plugin can set a default file path for local resources without breaking other plugins' configured
+     * paths. When calling server.bind(), the active realm's settings.bind property is set which is then used by
+     * routes and extensions added at the same level (server root or plugin).
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrealm)
+     */
+    readonly realm: ServerRealm;
+
+    /**
+     * An object of the currently registered plugins where each key is a registered plugin name and the value is
+     * an object containing:
+     * * version - the plugin version.
+     * * name - the plugin name.
+     * * options - (optional) options passed to the plugin during registration.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverregistrations)
+     */
+    readonly registrations: PluginsListRegistered;
+
+    /**
+     * The server configuration object after defaults applied.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serversettings)
+     */
+    readonly settings: ServerOptions;
+
+    /**
+     * The server cookies manager.
+     * Access: read only and statehood public interface.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstates)
+     */
+    readonly states: ServerState;
+
+    /**
+     * A string indicating the listener type where:
+     * * 'socket' - UNIX domain socket or Windows named pipe.
+     * * 'tcp' - an HTTP listener.
+     */
+    readonly type: 'socket' | 'tcp';
+
+    /**
+     * The hapi module version number.
+     */
+    readonly version: string;
+
+    /**
+     * Sets a global context used as the default bind object when adding a route or an extension where:
+     * @param context - the object used to bind this in lifecycle methods such as the route handler and extension methods. The context is also made available as h.context.
+     * @return Return value: none.
+     * When setting a context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
+     *     Ignored if the method being bound is an arrow function.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverbindcontext)
+     */
+    bind(context: object): void;
+
+    /**
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servercacheoptions)
+     */
+    cache: ServerCache;
+
+    /**
+     * Registers a custom content decoding compressor to extend the built-in support for 'gzip' and 'deflate' where:
+     * @param encoding - the decoder name string.
+     * @param decoder - a function using the signature function(options) where options are the encoding specific options configured in the route payload.compression configuration option, and the
+     *     return value is an object compatible with the output of node's zlib.createGunzip().
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdecoderencoding-decoder)
+     */
+    decoder(encoding: string, decoder: ((options: PayloadCompressionDecoderSettings) => zlib.Gunzip)): void;
+
+    /**
+     * Extends various framework interfaces with custom methods where:
+     * @param type - the interface being decorated. Supported types:
+     * 'handler' - adds a new handler type to be used in routes handlers.
+     * 'request' - adds methods to the Request object.
+     * 'server' - adds methods to the Server object.
+     * 'toolkit' - adds methods to the response toolkit.
+     * @param property - the object decoration key name.
+     * @param method - the extension function or other value.
+     * @param options - (optional) supports the following optional settings:
+     * apply - when the type is 'request', if true, the method function is invoked using the signature function(request) where request is the current request object and the returned value is assigned
+     *     as the decoration. extend - if true, overrides an existing decoration. The method must be a function with the signature function(existing) where: existing - is the previously set
+     *     decoration method value. must return the new decoration function or value. cannot be used to extend handler decorations.
+     * @return void;
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdecoratetype-property-method-options)
+     */
+    decorate(type: 'handler', property: string, method: HandlerDecorationMethod, options?: {apply?: boolean, extend?: boolean}): void;
+    decorate(type: 'request', property: string, method: (existing: ((...args: any[]) => any)) => (request: Request) => DecorationMethod<Request>, options: {apply: true, extend: true}): void;
+    decorate(type: 'request', property: string, method: (request: Request) => DecorationMethod<Request>, options: {apply: true, extend?: boolean}): void;
+    decorate(type: 'request', property: string, method: DecorationMethod<Request>, options?: {apply?: boolean, extend?: boolean}): void;
+    decorate(type: 'toolkit', property: string, method: (existing: ((...args: any[]) => any)) => DecorationMethod<ResponseToolkit>, options: {apply?: boolean, extend: true}): void;
+    decorate(type: 'toolkit', property: string, method: DecorationMethod<ResponseToolkit>, options?: {apply?: boolean, extend?: boolean}): void;
+    decorate(type: 'server', property: string, method: (existing: ((...args: any[]) => any)) => DecorationMethod<Server>, options: {apply?: boolean, extend: true}): void;
+    decorate(type: 'server', property: string, method: DecorationMethod<Server>, options?: {apply?: boolean, extend?: boolean}): void;
+
+    /**
+     * Used within a plugin to declare a required dependency on other plugins where:
+     * @param dependencies - a single string or an array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is
+     *     initialized or started.
+     * @param after - (optional) a function that is called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is
+     *     initialized or started. The function signature is async function(server) where: server - the server the dependency() method was called on.
+     * @return Return value: none.
+     * The after method is identical to setting a server extension point on 'onPreStart'.
+     * If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other).
+     * The method does not provide version dependency which should be implemented using npm peer dependencies.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdependencydependencies-after)
+     */
+    dependency(dependencies: string | string[], after?: ((server: Server) => Promise<void>)): void;
+
+    /**
+     * Registers a custom content encoding compressor to extend the built-in support for 'gzip' and 'deflate' where:
+     * @param encoding - the encoder name string.
+     * @param encoder - a function using the signature function(options) where options are the encoding specific options configured in the route compression option, and the return value is an object
+     *     compatible with the output of node's zlib.createGzip().
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverencoderencoding-encoder)
+     */
+    encoder(encoding: string, encoder: ((options: RouteCompressionEncoderSettings) => zlib.Gzip)): void;
+
+    /**
+     * Used within a plugin to expose a property via server.plugins[name] where:
+     * @param key - the key assigned (server.plugins[name][key]).
+     * @param value - the value assigned.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverexposekey-value)
+     */
+    expose(key: string, value: any): void;
+
+    /**
+     * Merges an object into to the existing content of server.plugins[name] where:
+     * @param obj - the object merged into the exposed properties container.
+     * @return Return value: none.
+     * Note that all the properties of obj are deeply cloned into server.plugins[name], so avoid using this method
+     * for exposing large objects that may be expensive to clone or singleton objects such as database client
+     * objects. Instead favor server.expose(key, value), which only copies a reference to value.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverexposeobj)
+     */
+    expose(obj: object): void;
+
+    /**
+     * Registers an extension function in one of the request lifecycle extension points where:
+     * @param events - an object or array of objects with the following:
+     * * type - (required) the extension point event name. The available extension points include the request extension points as well as the following server extension points:
+     * * * 'onPreStart' - called before the connection listeners are started.
+     * * * 'onPostStart' - called after the connection listeners are started.
+     * * * 'onPreStop' - called before the connection listeners are stopped.
+     * * * 'onPostStop' - called after the connection listeners are stopped.
+     * * method - (required) a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is:
+     * * * server extension points: async function(server) where:
+     * * * * server - the server object.
+     * * * * this - the object provided via options.bind or the current active context set with server.bind().
+     * * * request extension points: a lifecycle method.
+     * * 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.
+     * @return void
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
+     */
+    ext(events: ServerExtEventsObject | ServerExtEventsObject[] | ServerExtEventsRequestObject | ServerExtEventsRequestObject[]): void;
+
+    /**
+     * Registers a single extension event using the same properties as used in server.ext(events), but passed as arguments.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevent-method-options)
+     */
+    ext(event: ServerExtType, method: ServerExtPointFunction, options?: ServerExtOptions): void;
+    ext(event: ServerRequestExtType, method: Lifecycle.Method, options?: ServerExtOptions): void;
+
+    /**
+     * Initializes the server (starts the caches, finalizes plugin registration) but does not start listening on the connection port.
+     * @return Return value: none.
+     * Note that if the method fails and throws an error, the server is considered to be in an undefined state and
+     * should be shut down. In most cases it would be impossible to fully recover as the various plugins, caches, and
+     * other event listeners will get confused by repeated attempts to start the server or make assumptions about the
+     * healthy state of the environment. It is recommended to abort the process when the server fails to start properly.
+     * If you must try to resume after an error, call server.stop() first to reset the server state.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinitialize)
+     */
+    initialize(): Promise<void>;
+
+    /**
+     * Injects a request into the server simulating an incoming HTTP request without making an actual socket connection. Injection is useful for testing purposes as well as for invoking routing logic
+     * internally without the overhead and limitations of the network stack. The method utilizes the shot module for performing injections, with some additional options and response properties:
+     * @param options - can be assigned a string with the requested URI, or an object with:
+     * * method - (optional) the request HTTP method (e.g. 'POST'). Defaults to 'GET'.
+     * * url - (required) the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.
+     * * headers - (optional) an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default shot headers.
+     * * payload - (optional) an string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload
+     *     processing defaults to 'application/json' if no 'Content-Type' header provided.
+     * * credentials - (optional) an credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as
+     *     if they were received via an authentication scheme. Defaults to no credentials.
+     * * artifacts - (optional) an artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly
+     *     as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.
+     * * app - (optional) sets the initial value of request.app, defaults to {}.
+     * * plugins - (optional) sets the initial value of request.plugins, defaults to {}.
+     * * allowInternals - (optional) allows access to routes with config.isInternal set to true. Defaults to false.
+     * * remoteAddress - (optional) sets the remote address for the incoming connection.
+     * * simulate - (optional) an object with options used to simulate client request stream conditions for testing:
+     * * error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
+     * * close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
+     * * end - if false, does not end the stream. Defaults to true.
+     * * split - indicates whether the request payload will be split into chunks. Defaults to undefined, meaning payload will not be chunked.
+     * * validate - (optional) if false, the options inputs are not validated. This is recommended for run-time usage of inject() to make it perform faster where input validation can be tested
+     *     separately.
+     * @return Return value: a response object with the following properties:
+     * * statusCode - the HTTP status code.
+     * * headers - an object containing the headers set.
+     * * payload - the response payload string.
+     * * rawPayload - the raw response payload buffer.
+     * * raw - an object with the injection request and response objects:
+     * * req - the simulated node request object.
+     * * res - the simulated node response object.
+     * * result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse
+     *     of the internal objects returned (instead of parsing the response string).
+     * * request - the request object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverinjectoptions)
+     */
+    inject(options: string | ServerInjectOptions): Promise<ServerInjectResponse>;
+
+    /**
+     * Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or
+     * output to the console. The arguments are:
+     * @param tags - (required) a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive
+     *     mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
+     * @param data - (optional) an message string or object with the application data being logged. If data is a function, the function signature is function() and it called once to generate (return
+     *     value) the actual data emitted to the listeners. If no listeners match the event, the data function is not invoked.
+     * @param timestamp - (optional) an timestamp expressed in milliseconds. Defaults to Date.now() (now).
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverlogtags-data-timestamp)
+     */
+    log(tags: string | string[], data?: string | object | (() => any), timestamp?: number): void;
+
+    /**
+     * Looks up a route configuration where:
+     * @param id - the route identifier.
+     * @return Return value: the route information if found, otherwise null.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverlookupid)
+     */
+    lookup(id: string): RequestRoute | null;
+
+    /**
+     * Looks up a route configuration where:
+     * @param method - the HTTP method (e.g. 'GET', 'POST').
+     * @param path - the requested path (must begin with '/').
+     * @param host - (optional) hostname (to match against routes with vhost).
+     * @return Return value: the route information if found, otherwise null.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermatchmethod-path-host)
+     */
+    match(method: Util.HTTP_METHODS, path: string, host?: string): RequestRoute | null;
+
+    /**
+     * Registers a server method where:
+     * @param name - a unique method name used to invoke the method via server.methods[name].
+     * @param method - the method function with a signature async function(...args, [flags]) where:
+     * * ...args - the method function arguments (can be any number of arguments or none).
+     * * flags - when caching is enabled, an object used to set optional method result flags:
+     * * * ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
+     * @param options - (optional) configuration object:
+     * * bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered. Ignored if the method is
+     *     an arrow function.
+     * * cache - the same cache configuration used in server.cache(). The generateTimeout option is required.
+     * * generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the flags argument is not passed as input). The server will
+     *     automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation
+     *     function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).
+     * @return Return value: none.
+     * Method names can be nested (e.g. utils.users.get) which will automatically create the full path under server.methods (e.g. accessed via server.methods.utils.users.get).
+     * When configured with caching enabled, server.methods[name].cache is assigned an object with the following properties and methods: - await drop(...args) - a function that can be used to clear
+     *     the cache for a given key. - stats - an object with cache statistics, see catbox for stats documentation.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodname-method-options)
+     */
+    method(name: string, method: ServerMethod, options?: ServerMethodOptions): void;
+
+    /**
+     * Registers a server method function as described in server.method() using a configuration object where:
+     * @param methods - an object or an array of objects where each one contains:
+     * * name - the method name.
+     * * method - the method function.
+     * * options - (optional) settings.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servermethodmethods)
+     */
+    method(methods: ServerMethodConfigurationObject | ServerMethodConfigurationObject[]): void;
+
+    /**
+     * Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
+     * @param relativeTo - the path prefix added to any relative file path starting with '.'.
+     * @return Return value: none.
+     * Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the server default route configuration files.relativeTo settings is used. The
+     *     path only applies to routes added after it has been set.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverpathrelativeto)
+     */
+    path(relativeTo: string): void;
+
+    /**
+     * Registers a plugin where:
+     * @param plugins - one or an array of:
+     * * a plugin object.
+     * * an object with the following:
+     * * * plugin - a plugin object.
+     * * * options - (optional) options passed to the plugin during registration.
+     * * * once, routes - (optional) plugin-specific registration options as defined below.
+     * @param options - (optional) registration options (different from the options passed to the registration function):
+     * * once - if true, subsequent registrations of the same plugin are skipped without error. Cannot be used with plugin options. Defaults to false. If not set to true, an error will be thrown the
+     *     second time a plugin is registered on the server.
+     * * routes - modifiers applied to each route added by the plugin:
+     * * * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the
+     *     child-specific prefix.
+     * * * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverregisterplugins-options)
+     */
+     /* tslint:disable-next-line:no-unnecessary-generics */
+    register<T>(plugin: ServerRegisterPluginObject<T>, options?: ServerRegisterOptions): Promise<void>;
+    /* tslint:disable-next-line:no-unnecessary-generics */
+    register<T, U, V, W, X, Y, Z>(plugins: ServerRegisterPluginObjectArray<T, U, V, W, X, Y, Z>, options?: ServerRegisterOptions): Promise<void>;
+    register(plugins: Array<ServerRegisterPluginObject<any>>, options?: ServerRegisterOptions): Promise<void>;
+    /* tslint:disable-next-line:unified-signatures */
+    register(plugins: Plugin<any> | Array<Plugin<any>>, options?: ServerRegisterOptions): Promise<void>;
+
+    /**
+     * Adds a route where:
+     * @param route - a route configuration object or an array of configuration objects where each object contains:
+     * * path - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the server's router configuration.
+     *     The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.
+     * * method - (required) the HTTP method. Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'. Any HTTP method is allowed, except for 'HEAD'. Use '*' to match against any HTTP
+     *     method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). Can be assigned an array of methods which has
+     *     the same result as adding the same route with different methods manually.
+     * * vhost - (optional) a domain string or an array of domain strings for limiting the route to only requests with a matching host header field. Matching is done against the hostname part of the
+     *     header only (excluding the port). Defaults to all hosts.
+     * * handler - (required when handler is not set) the route handler function called to generate the response after successful authentication and validation.
+     * * options - additional route options. The options value can be an object or a function that returns an object using the signature function(server) where server is the server the route is being
+     *     added to and this is bound to the current realm's bind option.
+     * * rules - route custom rules object. The object is passed to each rules processor registered with server.rules(). Cannot be used if route.options.rules is defined.
+     * @return Return value: none.
+     * Note that the options object is deeply cloned (with the exception of bind which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrouteroute)
+     */
+    route(route: ServerRoute | ServerRoute[]): void;
+
+    /**
+     * Defines a route rules processor for converting route rules object into route configuration where:
+     * @param processor - a function using the signature function(rules, info) where:
+     * * rules -
+     * * info - an object with the following properties:
+     * * * method - the route method.
+     * * * path - the route path.
+     * * * vhost - the route virtual host (if any defined).
+     * * returns a route config object.
+     * @param options - optional settings:
+     * * validate - rules object validation:
+     * * * schema - joi schema.
+     * * * options - optional joi validation options. Defaults to { allowUnknown: true }.
+     * Note that the root server and each plugin server instance can only register one rules processor. If a route is added after the rules are configured, it will not include the rules config.
+     *     Routes added by plugins apply the rules to each of the parent realms' rules from the root to the route's realm. This means the processor defined by the plugin override the config generated
+     *     by the root processor if they overlap. The route config overrides the rules config if the overlap.
+     * @return void
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverrulesprocessor-options)
+     */
+    rules(processor: (rules: object, info: {method: string, path: string, vhost?: string}) => object, options?: {validate: object}): void; // TODO needs implementation
+
+    /**
+     * Starts the server by listening for incoming requests on the configured port (unless the connection was configured with autoListen set to false).
+     * @return Return value: none.
+     * Note that if the method fails and throws an error, the server is considered to be in an undefined state and should be shut down. In most cases it would be impossible to fully recover as the
+     *     various plugins, caches, and other event listeners will get confused by repeated attempts to start the server or make assumptions about the healthy state of the environment. It is
+     *     recommended to abort the process when the server fails to start properly. If you must try to resume after an error, call server.stop() first to reset the server state. If a started server
+     *     is started again, the second call to server.start() is ignored. No events will be emitted and no extension points invoked.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverstart)
+     */
+    start(): Promise<void>;
+
+    /**
+     * HTTP state management uses client cookies to persist a state across multiple requests.
+     * @param name - the cookie name string.
+     * @param options - are the optional cookie settings
+     * @return Return value: none.
+     * State defaults can be modified via the server default state configuration option.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverstatename-options)
+     */
+    state(name: string, options?: ServerStateCookieOptions): void;
+
+    /**
+     * Stops the server's listener by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
+     * @param options - (optional) object with:
+     * * timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
+     * @return Return value: none.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverstopoptions)
+     */
+    stop(options?: {timeout: number}): Promise<void>;
+
+    /**
+     * Returns a copy of the routing table where:
+     * @param host - (optional) host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+     * @return Return value: an array of routes where each route contains:
+     * * settings - the route config with defaults applied.
+     * * method - the HTTP method in lower case.
+     * * path - the route path.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servertablehost)
+     */
+    table(host?: string): Array<{settings: ServerRoute; method: Util.HTTP_METHODS_PARTIAL_LOWERCASE, path: string}>; // TODO I am not sure if the ServerRoute is the object expected here
+}
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ +                      Utils                                                +
+ +                                                                           +
+ +                                                                           +
+ +                                                                           +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+/**
+ *  User-extensible type for application specific state.
+ */
+ /* tslint:disable-next-line:no-empty-interface */
+export interface ApplicationState {
+}
+
+export type PeekListener = (chunk: string, encoding: string) => void;
+
+export namespace Json {
+    /**
+     * @see {@link https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#The_replacer_parameter}
+     */
+    type StringifyReplacer = ((key: string, value: any) => any) | Array<(string | number)> | undefined;
+
+    /**
+     * Any value greater than 10 is truncated.
+     */
+    type StringifySpace = number | string;
+
+    /**
+     * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsjson)
+     */
+    interface StringifyArguments {
+        /** the replacer function or array. Defaults to no action. */
+        replacer?: StringifyReplacer;
+        /** number of spaces to indent nested object keys. Defaults to no indentation. */
+        space?: StringifySpace;
+        /* string suffix added after conversion to JSON string. Defaults to no suffix. */
+        suffix?: string;
+        /* calls Hoek.jsonEscape() after conversion to JSON string. Defaults to false. */
+        escape?: boolean;
+    }
+}
+
+export namespace Lifecycle {
+    /**
+     * Lifecycle methods are the interface between the framework and the application. Many of the request lifecycle steps:
+     * extensions, authentication, handlers, pre-handler methods, and failAction function values are lifecyle methods
+     * provided by the developer and executed by the framework.
+     * Each lifecycle method is a function with the signature await function(request, h, [err]) where:
+     * * request - the request object.
+     * * h - the response toolkit the handler must call to set a response and return control back to the framework.
+     * * err - an error object availble only when the method is used as a failAction value.
+     */
+    type Method = (request: Request, h: ResponseToolkit, err?: Error) => ReturnValue;
+
+    /**
+     * Each lifecycle method must return a value or a promise that resolves into a value. If a lifecycle method returns
+     * without a value or resolves to an undefined value, an Internal Server Error (500) error response is sent.
+     * The return value must be one of:
+     * - Plain value: null, string, number, boolean
+     * - Buffer object
+     * - Error object: plain Error OR a Boom object.
+     * - Stream object
+     * - any object or array
+     * - a toolkit signal:
+     * - a toolkit method response:
+     * - a promise object that resolve to any of the above values
+     * For more info please [See docs](https://github.com/hapijs/hapi/blob/master/API.md#lifecycle-methods)
+     */
+    type ReturnValue = ReturnValueTypes | (Promise<ReturnValueTypes>);
+    type ReturnValueTypes =
+        (null | string | number | boolean) |
+        (Buffer) |
+        (Error | Boom.BoomError) |
+        (stream.Stream) |
+        (object | object[]) |
+        symbol |
+        ResponseToolkit;
+
+    /**
+     * Various configuration options allows defining how errors are handled. For example, when invalid payload is received or malformed cookie, instead of returning an error, the framework can be
+     * configured to perform another action. When supported the failAction option supports the following values:
+     * * 'error' - return the error object as the response.
+     * * 'log' - report the error but continue processing the request.
+     * * 'ignore' - take no action and continue processing the request.
+     * * a lifecycle method with the signature async function(request, h, err) where:
+     * * * request - the request object.
+     * * * h - the response toolkit.
+     * * * err - the error object.
+     * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-failaction-configuration)
+     */
+    type FailAction = 'error' | 'log' | 'ignore' | Method;
+}
+
+export namespace Util {
+    interface Dictionary<T> {
+        [key: string]: T;
+    }
+
+    type HTTP_METHODS_PARTIAL_LOWERCASE = 'get' | 'post' | 'put' | 'patch' | 'delete' | 'options';
+    type HTTP_METHODS_PARTIAL =
+        'GET'
+        | 'POST'
+        | 'PUT'
+        | 'PATCH'
+        | 'DELETE'
+        | 'OPTIONS'
+        | HTTP_METHODS_PARTIAL_LOWERCASE;
+    type HTTP_METHODS = 'HEAD' | 'head' | HTTP_METHODS_PARTIAL;
+}
diff --git a/types/hapi/test/request/catch-all.ts b/types/hapi/test/request/catch-all.ts
index 55db8a548b..3ee4e74c42 100644
--- a/types/hapi/test/request/catch-all.ts
+++ b/types/hapi/test/request/catch-all.ts
@@ -6,10 +6,9 @@ const options: ServerOptions = {
 };
 const server = new Server(options);
 
-const handler = (request: Request, h: ResponseToolkit) => {
+server.route({ method: '*', path: '/{p*}', handler(request, h) {
     return h.response('The page was not found').code(404);
-};
-server.route({ method: '*', path: '/{p*}', handler });
+}});
 
 server.start();
 console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/test/request/event-types.ts b/types/hapi/test/request/event-types.ts
index b963340bb5..386b93e19d 100644
--- a/types/hapi/test/request/event-types.ts
+++ b/types/hapi/test/request/event-types.ts
@@ -10,12 +10,12 @@ const options: ServerOptions = {
 const serverRoute: ServerRoute = {
     path: '/',
     method: 'GET',
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return 'ok: ' + request.path;
     }
 };
 
-const onRequest: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+const onRequest: Lifecycle.Method = (request, h) => {
     /*
      * Server events
      */
@@ -29,11 +29,11 @@ const onRequest: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
         console.log('Response sent for request: ' + request.path);
     });
 
-    request.server.events.on('start', (route: RouteOptions) => {
+    request.server.events.on('start', () => {
         console.log('Server started');
     });
 
-    request.server.events.once('stop', (route: RouteOptions) => {
+    request.server.events.once('stop', () => {
         console.log('Server stoped');
     });
 
@@ -42,7 +42,7 @@ const onRequest: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
      */
     const hash = Crypto.createHash('sha1');
 
-    request.events.on("peek", (chunk: any) => {
+    request.events.on("peek", (chunk, encoding) => {
         hash.update(chunk);
     });
 
diff --git a/types/hapi/test/request/get-log.ts b/types/hapi/test/request/get-log.ts
index 731e8ea35c..3ba2658136 100644
--- a/types/hapi/test/request/get-log.ts
+++ b/types/hapi/test/request/get-log.ts
@@ -5,7 +5,7 @@ const options: ServerOptions = {
     port: 8000,
 };
 
-const handlerFn: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+const handlerFn: Lifecycle.Method = (request, h) => {
     request.log(['test', 'error'], 'Test event');
     return 'path: ' + request.path;
 };
diff --git a/types/hapi/test/request/parameters.ts b/types/hapi/test/request/parameters.ts
index 1dadbcc1eb..3f19a02d45 100644
--- a/types/hapi/test/request/parameters.ts
+++ b/types/hapi/test/request/parameters.ts
@@ -7,7 +7,7 @@ const options: ServerOptions = {
 
 // Example 1
 // http://localhost:8000/album-name/song-optional
-const getAlbum: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+const getAlbum: Lifecycle.Method = (request, h) => {
     console.log(request.params);
     return 'ok: ' + request.path;
 };
@@ -19,7 +19,7 @@ const serverRoute1: ServerRoute = {
 
 // Example 2
 // http://localhost:8000/person/rafael/fijalkowski
-const getPerson: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+const getPerson: Lifecycle.Method = (request, h) => {
     const nameParts = request.params.name.split('/');
     return { first: nameParts[0], last: nameParts[1] };
 };
diff --git a/types/hapi/test/request/query.ts b/types/hapi/test/request/query.ts
index 1f8ea89c1b..c67381f1b9 100644
--- a/types/hapi/test/request/query.ts
+++ b/types/hapi/test/request/query.ts
@@ -5,7 +5,7 @@ const options: ServerOptions = {
     port: 8000,
 };
 
-const handlerFn: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+const handlerFn: Lifecycle.Method = (request, h) => {
     const query = request.query as GetThingQuery;
     // http://localhost:8000/?name=test
     return `You asked for ${query.name}`;
diff --git a/types/hapi/test/response/continue.ts b/types/hapi/test/response/continue.ts
index 00bdbc9ff2..15a0f5e35b 100644
--- a/types/hapi/test/response/continue.ts
+++ b/types/hapi/test/response/continue.ts
@@ -8,7 +8,7 @@ const options: ServerOptions = {
 const serverRoute: ServerRoute = {
     path: '/test',
     method: 'GET',
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return 'ok: ' + request.path;
     }
 };
@@ -16,7 +16,7 @@ const serverRoute: ServerRoute = {
 const server = new Server(options);
 server.route(serverRoute);
 
-server.ext("onRequest", (request: Request, h: ResponseToolkit) => {
+server.ext("onRequest", (request, h) => {
     request.setUrl('/test');
     return h.continue;
 });
diff --git a/types/hapi/test/response/error.ts b/types/hapi/test/response/error.ts
index 52937eaa4a..513f5fbbe5 100644
--- a/types/hapi/test/response/error.ts
+++ b/types/hapi/test/response/error.ts
@@ -10,14 +10,14 @@ const serverRoutes: ServerRoute[] = [
     {
         path: '/badRequest',
         method: 'GET',
-        handler: (request: Request, h: ResponseToolkit) => {
+        handler(request, h) {
             throw Boom.badRequest('Unsupported parameter');
         }
     },
     {
         path: '/internal',
         method: 'GET',
-        handler: (request: Request, h: ResponseToolkit) => {
+        handler(request, h) {
             throw new Error('unexpect error');
         }
     },
diff --git a/types/hapi/test/response/redirect.ts b/types/hapi/test/response/redirect.ts
index d7503fd5f9..dc1b904ce3 100644
--- a/types/hapi/test/response/redirect.ts
+++ b/types/hapi/test/response/redirect.ts
@@ -8,7 +8,7 @@ const options: ServerOptions = {
 const serverRoute: ServerRoute = {
     path: '/',
     method: 'GET',
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return h.redirect('http://example.com');
     }
 };
diff --git a/types/hapi/test/response/response-events.ts b/types/hapi/test/response/response-events.ts
index 0680f7f7f8..ec1b070b18 100644
--- a/types/hapi/test/response/response-events.ts
+++ b/types/hapi/test/response/response-events.ts
@@ -1,13 +1,13 @@
 // https://github.com/hapijs/hapi/blob/master/API.md#-responseevents
-import { Request, ResponseObject, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+import { Lifecycle, Request, ResponseObject, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
 import * as Crypto from "crypto";
 
-const preResponse = (request: Request, h: ResponseToolkit) => {
+const preResponse: Lifecycle.Method = (request, h) => {
     // In onPreResponse, the response object will be defined.
-    const response: ResponseObject = request.response!;
+    const response = <ResponseObject> request.response!;
 
     const hash = Crypto.createHash('sha1');
-    response.events.on('peek', (chunk: any) => {
+    response.events.on('peek', (chunk, encoding) => {
         hash.update(chunk);
     });
 
diff --git a/types/hapi/test/response/response.ts b/types/hapi/test/response/response.ts
index 593eddb0fb..368b6fa80b 100644
--- a/types/hapi/test/response/response.ts
+++ b/types/hapi/test/response/response.ts
@@ -10,7 +10,7 @@ const serverRoutes: ServerRoute[] = [
     {
         path: '/test1',
         method: 'GET',
-        handler: (request: Request, h: ResponseToolkit) => {
+        handler(request, h) {
             const response = h.response('success');
             response.type('text/plain');
             response.header('X-Custom', 'some-value');
@@ -21,7 +21,7 @@ const serverRoutes: ServerRoute[] = [
     {
         path: '/test2',
         method: 'GET',
-        handler: (request: Request, h: ResponseToolkit) => {
+        handler(request, h) {
             return h.response('success')
             .type('text/plain')
             .header('X-Custom', 'some-value');
diff --git a/types/hapi/test/route/adding-routes.ts b/types/hapi/test/route/adding-routes.ts
index 55c58d1437..ac4c895842 100644
--- a/types/hapi/test/route/adding-routes.ts
+++ b/types/hapi/test/route/adding-routes.ts
@@ -8,7 +8,7 @@ const options: ServerOptions = {
 const serverRoute: ServerRoute = {
     path: '/',
     method: 'GET',
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return 'ok: ' + request.path;
     }
 };
@@ -17,14 +17,14 @@ const serverRoutes: ServerRoute[] = [
     {
         path: '/test1',
         method: 'GET',
-        handler: (request: Request, h: ResponseToolkit) => {
+        handler(request, h) {
             return 'ok: ' + request.path;
         }
     },
     {
         path: '/test2',
         method: 'GET',
-        handler: (request: Request, h: ResponseToolkit) => {
+        handler(request, h) {
             return 'ok: ' + request.path;
         }
     },
diff --git a/types/hapi/test/route/config.ts b/types/hapi/test/route/config.ts
index 8272e767f1..8cebaec269 100644
--- a/types/hapi/test/route/config.ts
+++ b/types/hapi/test/route/config.ts
@@ -23,14 +23,14 @@ const routeConfigTest2: ServerRoute = {
 const routeConfigTest3: ServerRoute = {
   path: '/signin',
   method: 'PUT',
-  handler: (request: Request, h: ResponseToolkit) => {
+  handler(request, h) {
     return 'ok';
   }
 };
 const routeConfigTest4: ServerRoute = {
   path: '/signin',
   method: 'PUT',
-  handler: (request: Request, h: ResponseToolkit) => {
+  handler(request, h) {
     return 'ok';
   }
 };
@@ -41,7 +41,7 @@ server.route(routeConfig);
 // Handler in config
 const user: RouteOptions = {
     cache: { expiresIn: 5000 },
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return { name: 'John' };
     }
 };
diff --git a/types/hapi/test/route/ext.ts b/types/hapi/test/route/ext.ts
new file mode 100644
index 0000000000..0a2ac25a4b
--- /dev/null
+++ b/types/hapi/test/route/ext.ts
@@ -0,0 +1,15 @@
+import { Server } from "hapi";
+
+const server = new Server();
+
+server.route({
+    method: 'get',
+    path: "/test",
+    options: {
+        ext: {
+            onPreResponse(request, h) {
+                return h.continue;
+            },
+        }
+    }
+});
diff --git a/types/hapi/test/route/handler.ts b/types/hapi/test/route/handler.ts
index b9354f00d8..6fced10078 100644
--- a/types/hapi/test/route/handler.ts
+++ b/types/hapi/test/route/handler.ts
@@ -1,9 +1,9 @@
 import { Lifecycle, Request, ResponseToolkit } from "hapi";
 
-const handler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+const handler: Lifecycle.Method = (request, h) => {
     return 'success';
 };
 
-const strictHandler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => {
+const strictHandler: Lifecycle.Method = (request, h) => {
     return 123;
 };
diff --git a/types/hapi/test/route/route-options-pre.ts b/types/hapi/test/route/route-options-pre.ts
index 139e93a0f8..897f4a8ef5 100644
--- a/types/hapi/test/route/route-options-pre.ts
+++ b/types/hapi/test/route/route-options-pre.ts
@@ -1,26 +1,26 @@
 // https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionspre
-import { Request, ResponseToolkit, Server } from "hapi";
+import { Lifecycle, Request, ResponseToolkit, Server } from "hapi";
 
 const server = new Server({
     port: 8000,
 });
 
-const pre1 = (request: Request, h: ResponseToolkit) => {
+const pre1: Lifecycle.Method = (request, h) => {
     return 'Hello';
 };
 
-const pre2 = (request: Request, h: ResponseToolkit) => {
+const pre2: Lifecycle.Method = (request, h) => {
     return 'World';
 };
 
-const pre3 = (request: Request, h: ResponseToolkit) => {
+const pre3: Lifecycle.Method = (request, h) => {
     return `request.pre.m1 request.pre.m2`;
 };
 
 server.route({
     method: 'GET',
     path: '/',
-    config: {
+    options: {
         pre: [
             [
                 // m1 and m2 executed in parallel
@@ -29,7 +29,7 @@ server.route({
             ],
             { method: pre3, assign: 'm3' },
         ],
-        handler: (request: Request, h: ResponseToolkit) => {
+        handler(request, h) {
             return request.pre.m3 + '!\n';
         }
     }
diff --git a/types/hapi/test/route/route-options.ts b/types/hapi/test/route/route-options.ts
index b5a9f87ce1..96237debd8 100644
--- a/types/hapi/test/route/route-options.ts
+++ b/types/hapi/test/route/route-options.ts
@@ -1,5 +1,6 @@
 // https://github.com/hapijs/hapi/blob/master/API.md#route-options
 import {
+    Lifecycle,
     Request,
     ResponseToolkit,
     RouteOptions,
@@ -46,7 +47,7 @@ const payloadOptions: RouteOptionsPayload = {
         }
     },
     defaultContentType: 'application/json',
-    failAction: (request: Request, h: ResponseToolkit) => {
+    failAction(request, h) {
         return 'ok: ' + request.path;
     },
     maxBytes: 1048576,
@@ -60,21 +61,21 @@ const payloadOptions: RouteOptionsPayload = {
     uploads: 'dir/'
 };
 
-const pre1 = (request: Request, h: ResponseToolkit) => {
+const pre1: Lifecycle.Method = (request, h) => {
     return 'Hello';
 };
 
-const pre2 = (request: Request, h: ResponseToolkit) => {
+const pre2: Lifecycle.Method = (request, h) => {
     return 'World';
 };
 
-const pre3 = (request: Request, h: ResponseToolkit) => {
+const pre3: Lifecycle.Method = (request, h) => {
     return `request.pre.m1 request.pre.m2`;
 };
 
 const routeOptionsResponse: RouteOptionsResponse = {
     emptyStatusCode: 200,
-    failAction: (request: Request, h: ResponseToolkit) => {
+    failAction(request, h) {
         return 'ok: ' + request.path;
     },
     modify: false,
@@ -91,7 +92,7 @@ const routeOptionsResponse: RouteOptionsResponse = {
 
 const routeOptionsValidate: RouteOptionsValidate = {
     errorFields: {},
-    failAction: (request: Request, h: ResponseToolkit) => {
+    failAction(request, h) {
         return 'ok: ' + request.path;
     },
     headers: false,
@@ -119,7 +120,7 @@ const routeOptions: RouteOptions = {
     description: 'description here',
     ext: undefined,
     files: { relativeTo: '.' },
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return 'ok: ' + request.path;
     },
     id: 'test',
@@ -145,7 +146,7 @@ const routeOptions: RouteOptions = {
     security: false,
     state: {
         parse: true,
-        failAction: (request: Request, h: ResponseToolkit) => {
+        failAction(request, h) {
             return 'ok: ' + request.path;
         },
     },
diff --git a/types/hapi/test/route/validation.ts b/types/hapi/test/route/validation.ts
index 5296183e87..58190a2584 100644
--- a/types/hapi/test/route/validation.ts
+++ b/types/hapi/test/route/validation.ts
@@ -1,12 +1,12 @@
 // from https://hapijs.com/tutorials/validation?lang=en_US
-import { ServerRouteConfig, Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+import { Request, ResponseToolkit, RouteOptions, Server, ServerOptions, ServerRoute } from "hapi";
 import * as Joi from "joi";
 
 const options: ServerOptions = {
     port: 8000,
 };
 
-const configObject: ServerRouteConfig = {
+const routeOptions: RouteOptions = {
     validate: {
         params: {
             name: Joi.string().min(3).max(10)
@@ -17,10 +17,10 @@ const configObject: ServerRouteConfig = {
 const serverRoute: ServerRoute = {
     path: '/',
     method: 'GET',
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return 'ok: ' + request.path;
     },
-    config: configObject
+    options: routeOptions
 };
 
 const server = new Server(options);
diff --git a/types/hapi/test/server/server-app.ts b/types/hapi/test/server/server-app.ts
index 57298a4672..f51ad7ca12 100644
--- a/types/hapi/test/server/server-app.ts
+++ b/types/hapi/test/server/server-app.ts
@@ -18,7 +18,7 @@ server.app!.key = 'value2';
 const serverRoute: ServerRoute = {
     path: '/',
     method: 'GET',
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return 'key: ' + request.server.app!.key;
     }
 };
diff --git a/types/hapi/test/server/server-auth-api.ts b/types/hapi/test/server/server-auth-api.ts
index 3b80dc7e47..3656b25f28 100644
--- a/types/hapi/test/server/server-auth-api.ts
+++ b/types/hapi/test/server/server-auth-api.ts
@@ -9,14 +9,14 @@ import {
 } from "hapi";
 import * as Boom from "boom";
 
-const scheme: ServerAuthScheme = (server: Server, options: ServerAuthSchemeOptions): ServerAuthSchemeObject => {
+const scheme: ServerAuthScheme = (server, options) => {
     return {
         api: {
             settings: {
                 x: 5
             }
         },
-        authenticate: (request: Request, h: ResponseToolkit) => {
+        authenticate(request, h) {
             const authorization = request.headers.authorization;
             if (!authorization) {
                 throw Boom.unauthorized(null, 'Custom');
diff --git a/types/hapi/test/server/server-auth-default.ts b/types/hapi/test/server/server-auth-default.ts
index 3ec9919150..0ecec802d8 100644
--- a/types/hapi/test/server/server-auth-default.ts
+++ b/types/hapi/test/server/server-auth-default.ts
@@ -3,13 +3,19 @@
 import { Request, ResponseToolkit, Server, ServerAuthScheme, ServerAuthSchemeOptions } from "hapi";
 import * as Boom from "boom";
 
+declare module 'hapi' {
+    interface AuthCredentials {
+        user?: string;
+    }
+}
+
 const server = new Server({
     port: 8000,
 });
 
-const scheme: ServerAuthScheme = (server: Server, options: ServerAuthSchemeOptions) => {
+const scheme: ServerAuthScheme = (server, options) => {
     return {
-        authenticate: (request: Request, h: ResponseToolkit) => {
+        authenticate(request, h) {
             const req = request.raw.req;
             const authorization = req.headers.authorization;
             if (!authorization) {
@@ -27,8 +33,8 @@ server.auth.default('default');
 server.route({
     method: 'GET',
     path: '/',
-    handler: (request: Request, h: ResponseToolkit) => {
-        return request.auth.credentials.user;
+    handler(request, h) {
+        return request.auth.credentials.user || 'not authed';
     }
 });
 
diff --git a/types/hapi/test/server/server-auth-test.ts b/types/hapi/test/server/server-auth-test.ts
index ae77089ddf..bf84be2543 100644
--- a/types/hapi/test/server/server-auth-test.ts
+++ b/types/hapi/test/server/server-auth-test.ts
@@ -7,9 +7,9 @@ const server = new Server({
     port: 8000,
 });
 
-const scheme: ServerAuthScheme = (server: Server, options: ServerAuthSchemeOptions) => {
+const scheme: ServerAuthScheme = (server, options) => {
     return {
-        authenticate: (request: Request, h: ResponseToolkit) => {
+        authenticate(request, h) {
             const req = request.raw.req;
             const authorization = req.headers.authorization;
             if (!authorization) {
diff --git a/types/hapi/test/server/server-bind.ts b/types/hapi/test/server/server-bind.ts
index 9bec0ec5f9..1fbd37c4c2 100644
--- a/types/hapi/test/server/server-bind.ts
+++ b/types/hapi/test/server/server-bind.ts
@@ -1,16 +1,16 @@
 // https://github.com/hapijs/hapi/blob/master/API.md#-serverbindcontext
-import { Plugin, Request, ResponseToolkit, Server, ServerRegisterOptions } from "hapi";
+import { Lifecycle, Plugin, Request, ResponseToolkit, Server, ServerRegisterOptions } from "hapi";
 
 const server = new Server({
     port: 8000,
 });
-const handler = (request: Request, h: ResponseToolkit) => {
+const handler: Lifecycle.Method = (request, h) => {
     return h.context.message;    // Or h.context.message
 };
 
 const plugin: Plugin<any> = {
     name: 'example',
-    register: async (server: Server, options: ServerRegisterOptions) => {
+    register: async (server, options) => {
         const bind = {
             message: 'hello'
         };
diff --git a/types/hapi/test/server/server-decorations.ts b/types/hapi/test/server/server-decorations.ts
index 8ee7dfaaa3..c0ab94cc0e 100644
--- a/types/hapi/test/server/server-decorations.ts
+++ b/types/hapi/test/server/server-decorations.ts
@@ -1,15 +1,109 @@
 // https://github.com/hapijs/hapi/blob/master/API.md#-serverdecoratetype-property-method-options
-import { ResponseToolkit, Server } from "hapi";
+import { Request, ResponseToolkit, Server } from "hapi";
+
+declare module 'hapi' {
+    interface HandlerDecorations {
+        test?: {
+            test: number;
+        };
+    }
+}
+
+// Test basic types.
 
 const server = new Server({
     port: 8000,
 });
 
-const success = (h: ResponseToolkit) => {
-    return h.response({ status: 'ok' });
-};
-
 server.start();
-server.decorate('toolkit', 'success', success);
+server.decorate('toolkit', 'success', function() {
+    return this.response({ status: 'ok' });
+});
+server.decorate('handler', 'test', (route, options) => (req, h) => 123);
+server.route({
+    method: 'GET',
+    path: '/',
+    handler: {
+        test: {
+            test: 123,
+        },
+        asd: 1,
+    }
+});
 
 console.log(server.decorations.toolkit);
+
+// Test decorators with additional arguments
+
+declare module 'hapi' {
+    interface Server {
+        withParams(x: number, y: string): string;
+    }
+
+    interface ResponseToolkit {
+        withParams(x: number, y: string): string;
+    }
+}
+
+function decorateServerWithParams(this: Server, x: number, y: string) {
+    return `${x} ${y}`;
+}
+
+server.decorate('server', 'withParams', decorateServerWithParams);
+server.withParams(1, "one");
+
+function decorateToolkitWithParams(this: ResponseToolkit, x: number, y: string) {
+    return `${x} ${y}`;
+}
+
+server.decorate('toolkit', 'withParams', decorateToolkitWithParams);
+
+server.route({
+    method: 'GET',
+    path: '/toolkitWithParams',
+    handler: (r, h) => {
+        return h.withParams(1, "one");
+    }
+});
+
+// Test request + apply option types
+
+declare module 'hapi' {
+    interface Request {
+        withApply(x: string, y: number): string;
+    }
+}
+
+function decorateRequestWithApply(request: Request) {
+    return (x: string, y: number) => {
+        return `${x} ${y}`;
+    };
+}
+
+server.decorate('request', 'withApply', decorateRequestWithApply, {apply: true});
+
+server.route({
+    method: 'GET',
+    path: '/requestWithApply',
+    handler: (r, h) => {
+        return r.withApply("one", 1);
+    }
+});
+
+// Test extend option type
+
+declare module 'hapi' {
+    interface Server {
+        withExtend(x: string, y: number): string;
+    }
+}
+
+const decorateServerWithExtend = (existing: () => void) => {
+    return (x: string, y: number) => {
+        existing();
+        return `${x} ${y}`;
+    };
+};
+
+server.decorate('server', 'withExtend', decorateServerWithExtend, {extend: true});
+server.withExtend("one", 1);
diff --git a/types/hapi/test/server/server-events-once.ts b/types/hapi/test/server/server-events-once.ts
index 06261e8aae..a4903ee6dc 100644
--- a/types/hapi/test/server/server-events-once.ts
+++ b/types/hapi/test/server/server-events-once.ts
@@ -4,19 +4,26 @@ import { Request, ResponseToolkit, Server, ServerRoute } from "hapi";
 const serverRoute: ServerRoute = {
     path: '/',
     method: 'GET',
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return 'oks: ' + request.path;
     }
 };
 
+declare module 'hapi' {
+    interface ServerEvents {
+        once(event: 'test1', listener: (update: string) => void): this;
+        once(event: 'test2', listener: (...updates: string[]) => void): this;
+    }
+}
+
 const server = new Server({
     port: 8000,
 });
 server.route(serverRoute);
 server.event('test1');
 server.event('test2');
-server.events.once('test1', (update: any) => { console.log(update); });
-server.events.once('test2', (...args: any[]) => { console.log(args); });
+server.events.once('test1', update => { console.log(update); });
+server.events.once('test2', (...args) => { console.log(args); });
 server.events.emit('test1', 'hello-1');
 server.events.emit('test2', 'hello-2');       // Ignored
 
diff --git a/types/hapi/test/server/server-events.ts b/types/hapi/test/server/server-events.ts
index d17af569ae..2334915f05 100644
--- a/types/hapi/test/server/server-events.ts
+++ b/types/hapi/test/server/server-events.ts
@@ -1,9 +1,22 @@
 // https://github.com/hapijs/hapi/blob/master/API.md#-servereventevents
-import { Server } from "hapi";
+import { Server, ServerEvents } from "hapi";
+import Podium = require('podium');
+import 'hapi/definitions/server/server';
+
+declare module 'hapi' {
+    interface ServerEvents {
+        on(event: 'test', listener: (update: string) => void): this;
+    }
+}
 
 const server = new Server({
     port: 8000,
 });
+
+server.events.on('route', route => {
+    console.log(route.path, route.method);
+});
+
 server.event('test');
 server.events.on('test', (update: any) => console.log(update));
 server.events.emit('test', 'hello');
diff --git a/types/hapi/test/server/server-expose.ts b/types/hapi/test/server/server-expose.ts
index 2f1424b2ba..c1a698b6c7 100644
--- a/types/hapi/test/server/server-expose.ts
+++ b/types/hapi/test/server/server-expose.ts
@@ -3,14 +3,14 @@ import { Plugin, Server, ServerRegisterOptions } from "hapi";
 
 const plugin1: Plugin<any> = {
     name: 'example1',
-    register: async (server: Server, options: ServerRegisterOptions) => {
+    async register(server: Server, options: ServerRegisterOptions) {
         server.expose('util', () => console.log('something'));
     }
 };
 
 const plugin2: Plugin<any> = {
     name: 'example2',
-    register: async (server: Server, options: ServerRegisterOptions) => {
+    async register(server: Server, options: ServerRegisterOptions) {
         server.expose('util', () => console.log('something'));
     }
 };
diff --git a/types/hapi/test/server/server-inject.ts b/types/hapi/test/server/server-inject.ts
index 477a3b2ec4..5c7942c16a 100644
--- a/types/hapi/test/server/server-inject.ts
+++ b/types/hapi/test/server/server-inject.ts
@@ -8,7 +8,7 @@ const server = new Server({
 const serverRoute: ServerRoute = {
     path: '/',
     method: 'GET',
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return 'Success!';
     }
 };
diff --git a/types/hapi/test/server/server-lookup.ts b/types/hapi/test/server/server-lookup.ts
index 651ba0cd8b..2bbaf5713b 100644
--- a/types/hapi/test/server/server-lookup.ts
+++ b/types/hapi/test/server/server-lookup.ts
@@ -8,7 +8,7 @@ const server = new Server({
 server.route({
     path: '/',
     method: 'GET',
-    config: {
+    options: {
         id: 'root',
         handler: () => 'ok'
     }
diff --git a/types/hapi/test/server/server-match.ts b/types/hapi/test/server/server-match.ts
index 27f59991b5..5fc8605ad4 100644
--- a/types/hapi/test/server/server-match.ts
+++ b/types/hapi/test/server/server-match.ts
@@ -8,7 +8,7 @@ const server = new Server({
 server.route({
     path: '/',
     method: 'GET',
-    config: {
+    options: {
         id: 'root',
         handler: () => 'ok'
     }
diff --git a/types/hapi/test/server/server-path.ts b/types/hapi/test/server/server-path.ts
index 36f346cb10..8a2ebf85dc 100644
--- a/types/hapi/test/server/server-path.ts
+++ b/types/hapi/test/server/server-path.ts
@@ -5,6 +5,13 @@ const server = new Server({
     port: 8000,
 });
 
+// Definition for INERT
+declare module 'hapi' {
+    interface HandlerDecorations {
+        file?: string;
+    }
+}
+
 const serverRouteOption: ServerRoute = {
     path: '/file',
     method: 'GET',
diff --git a/types/hapi/test/server/server-state.ts b/types/hapi/test/server/server-state.ts
index 9c51ee4748..97cf5997f0 100644
--- a/types/hapi/test/server/server-state.ts
+++ b/types/hapi/test/server/server-state.ts
@@ -8,7 +8,7 @@ const options: ServerOptions = {
 const serverRoute: ServerRoute = {
     path: '/say-hello',
     method: 'GET',
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return h.response('Hello').state('data', { firstVisit: false });
     }
 };
diff --git a/types/hapi/test/server/server-table.ts b/types/hapi/test/server/server-table.ts
index 02f83e90fd..9237a2be28 100644
--- a/types/hapi/test/server/server-table.ts
+++ b/types/hapi/test/server/server-table.ts
@@ -11,7 +11,7 @@ server.app!.key = 'value2';
 server.route({
     path: '/',
     method: 'GET',
-    handler: (request: Request, h: ResponseToolkit) => {
+    handler(request, h) {
         return h.response("Hello World");
     }
 });
diff --git a/types/hapi/tsconfig.json b/types/hapi/tsconfig.json
index 54ac999c95..f8db3fc828 100644
--- a/types/hapi/tsconfig.json
+++ b/types/hapi/tsconfig.json
@@ -36,6 +36,7 @@
         "test/route/adding-routes.ts",
         "test/route/config.ts",
         "test/route/handler.ts",
+        "test/route/ext.ts",
         "test/route/route-options.ts",
         "test/route/route-options-pre.ts",
         "test/route/validation.ts",
@@ -71,4 +72,4 @@
         "test/server/server-table.ts",
         "test/server/server-version.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/hapi/v16/test/response/error-representation.ts b/types/hapi/v16/test/response/error-representation.ts
index 7eacfdfaf3..88c170eae1 100644
--- a/types/hapi/v16/test/response/error-representation.ts
+++ b/types/hapi/v16/test/response/error-representation.ts
@@ -2,15 +2,7 @@
 // From https://hapijs.com/api/16.1.1#error-transformation
 
 import * as Hapi from '../../';
-import Vision from '../../../../vision';
 const server = new Hapi.Server();
-server.register(Vision, {}, (err) => {
-    server.views({
-        engines: {
-            html: require('../../../../handlebars')
-        }
-  });
-});
 server.connection({ port: 80 });
 
 const preResponse: Hapi.ServerExtRequestHandler = function (request, reply) {
@@ -26,8 +18,6 @@ const preResponse: Hapi.ServerExtRequestHandler = function (request, reply) {
       const ctx = {
           message: (error.output!.statusCode === 404 ? 'page not found' : 'something went wrong')
       };
-
-      return reply.view('error', ctx);
 };
 
 server.ext('onPreResponse', preResponse);
diff --git a/types/hapi/v16/tsconfig.json b/types/hapi/v16/tsconfig.json
index 12b95c134d..d3d30f97dc 100644
--- a/types/hapi/v16/tsconfig.json
+++ b/types/hapi/v16/tsconfig.json
@@ -102,4 +102,4 @@
         "test/server/table.ts",
         "test/server/version.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/nes/index.d.ts b/types/nes/index.d.ts
index 27b9d84dd1..7c48cb84b0 100644
--- a/types/nes/index.d.ts
+++ b/types/nes/index.d.ts
@@ -26,7 +26,7 @@
 import { Plugin } from 'hapi';
 import NesClient = require('nes/client');
 
-declare module 'hapi/definitions/server/server' {
+declare module 'hapi' {
     interface Server {
         broadcast(message: any, options?: nes.ServerBroadcastOptions): void;
         subscription(path: string, options?: nes.ServerSubscriptionOptions): void;
@@ -35,7 +35,7 @@ declare module 'hapi/definitions/server/server' {
     }
 }
 
-declare module 'hapi/definitions/request/request' {
+declare module 'hapi' {
     interface Request {
         socket: nes.Socket;
     }
diff --git a/types/nes/test/nes-tests.ts b/types/nes/test/nes-tests.ts
index b5557adfb9..0226a08070 100644
--- a/types/nes/test/nes-tests.ts
+++ b/types/nes/test/nes-tests.ts
@@ -11,10 +11,8 @@ server.register(Nes).then(() => {
     wsServer.route({
         method: 'GET',
         path: '/test',
-        config: {
-            handler: (request: Request, h: ResponseToolkit) => {
-                return {test: 'passes ' + request.socket.id};
-            }
+        handler: (request: Request, h: ResponseToolkit) => {
+            return {test: 'passes ' + request.socket.id};
         }
     });
     wsServer.start().then(() => {
diff --git a/types/nes/test/route-authentication-server.ts b/types/nes/test/route-authentication-server.ts
index 6aab8cf53e..becba06557 100644
--- a/types/nes/test/route-authentication-server.ts
+++ b/types/nes/test/route-authentication-server.ts
@@ -7,7 +7,7 @@ import Nes = require('nes');
 
 const server = new Server();
 
-declare module 'hapi/definitions/request/request-auth' {
+declare module 'hapi' {
     interface AuthCredentials {
         id: string;
         name: string;
@@ -54,7 +54,7 @@ server.register([Basic, Nes]).then(() => {
     server.route({
         method: 'GET',
         path: '/h',
-        config: {
+        options: {
             id: 'hello',
             handler: function (request: Request, h: ResponseToolkit) {
 
diff --git a/types/nes/test/route-invocation-server.ts b/types/nes/test/route-invocation-server.ts
index eb0ec4bf87..d422a897f7 100644
--- a/types/nes/test/route-invocation-server.ts
+++ b/types/nes/test/route-invocation-server.ts
@@ -10,7 +10,7 @@ server.register(Nes).then(() => {
     server.route({
         method: 'GET',
         path: '/h',
-        config: {
+        options: {
             id: 'hello',
             handler: (request: Request, h: ResponseToolkit) => {
 
diff --git a/types/vision/index.d.ts b/types/vision/index.d.ts
index 012bc36d48..757d2a5383 100644
--- a/types/vision/index.d.ts
+++ b/types/vision/index.d.ts
@@ -13,11 +13,7 @@ import {
 } from 'hapi';
 
 declare namespace vision {
-    /**
-     * Options for initialising server views manager
-     * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions}
-     */
-    interface ServerViewsConfiguration extends ServerViewsAdditionalOptions {
+    interface EnginesConfiguration {
         /**
          * Required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.
          * Alternatively, the extension can be mapped to an object
@@ -30,14 +26,14 @@ declare namespace vision {
     /**
      * Includes `module` and any of the views options listed below (@see ServerViewsAdditionalOptions) (except defaultExtension) to override the defaults for a specific engine.
      */
-    interface ServerViewsEnginesOptions extends ServerViewsAdditionalOptions {
+    interface ServerViewsEnginesOptions extends ServerViewsConfiguration {
         /**
          * The npm module used for rendering the templates. The module object must contain the compile() function
          * @see {@link https://github.com/hapijs/vision/blob/master/API.md#serverviewsoptions} > options > engines > module
          */
         module: NpmModule;
     }
-    interface ServerViewsAdditionalOptions extends ViewHandlerOrReplyOptions {
+    interface ServerViewsConfiguration extends ViewHandlerOrReplyOptions, EnginesConfiguration {
         /**
          * The root file path, or array of file paths, where partials are located.
          * Partials are small segments of template code that can be nested and reused throughout other templates.
@@ -171,7 +167,7 @@ declare namespace vision {
      * @param context - optional object used by the template to render context-specific result. Defaults to no context ({}).
      * @param options - optional object used to override the views manager configuration.
      */
-    type RenderMethod = (template: string, context?: any, options?: ServerViewsAdditionalOptions) => Promise<string>;
+    type RenderMethod = (template: string, context?: any, options?: ServerViewsConfiguration) => Promise<string>;
 
     /**
      * View Manager
@@ -195,11 +191,11 @@ declare namespace vision {
     }
 }
 
-declare const vision: Plugin<vision.ServerViewsAdditionalOptions>;
+declare const vision: Plugin<vision.ServerViewsConfiguration>;
 
 export = vision;
 
-declare module 'hapi/definitions/server/server' {
+declare module 'hapi' {
     interface Server {
         /**
          * Initializes the server views manager
@@ -214,7 +210,7 @@ declare module 'hapi/definitions/server/server' {
     }
 }
 
-declare module 'hapi/definitions/request/request' {
+declare module 'hapi' {
     interface Request {
         /**
          * request.render() works the same way as server.render() but is for use inside of request handlers.
@@ -229,7 +225,7 @@ declare module 'hapi/definitions/request/request' {
     }
 }
 
-declare module 'hapi/definitions/response/response-toolkit' {
+declare module 'hapi' {
     interface ResponseToolkit {
         /**
          * Concludes the handler activity by returning control over to the router with a templatized view response
@@ -245,7 +241,7 @@ declare module 'hapi/definitions/response/response-toolkit' {
     }
 }
 
-declare module 'hapi/definitions/route/route-options' {
+declare module 'hapi' {
     interface RouteOptions {
         /**
          * The view handler can be used with routes registered in the same realm as the view manager.
diff --git a/types/yar/index.d.ts b/types/yar/index.d.ts
index 678d3e49a9..8f78544c9d 100644
--- a/types/yar/index.d.ts
+++ b/types/yar/index.d.ts
@@ -161,7 +161,7 @@ declare namespace yar {
 declare const yar: Plugin<yar.YarOptions>;
 export = yar;
 
-declare module 'hapi/definitions/request/request' {
+declare module 'hapi' {
     interface Request {
         yar: yar.Yar;
     }

From d24ad362efdf16050fafbb039d1b35a0993b617a Mon Sep 17 00:00:00 2001
From: SuperRunt <superrunt@gmail.com>
Date: Thu, 22 Feb 2018 08:35:38 -0700
Subject: [PATCH 208/388] Added definition for original to RowInfo interface

A RowInfo object has the original data passed tothe row for rendering stored in 'original'. This commit adds that to the RowInnfo ingerface.
---
 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 2ab2d2a821..3b2282f745 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -624,6 +624,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 b0839e0bf066f8b91138bfc3b382b8b247cddfd0 Mon Sep 17 00:00:00 2001
From: cafesanu <cafesanu@gmail.com>
Date: Mon, 19 Feb 2018 13:49:24 -0500
Subject: [PATCH 209/388] Feat - Update chance.js library definitions

---
 types/chance/chance-tests.ts | 59 +++++++++++++++++++++++++++---------
 types/chance/index.d.ts      | 37 +++++++++++++++-------
 2 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/types/chance/chance-tests.ts b/types/chance/chance-tests.ts
index 8e89d8227e..00d8752118 100644
--- a/types/chance/chance-tests.ts
+++ b/types/chance/chance-tests.ts
@@ -1,24 +1,25 @@
+import { Chance } from 'chance';
 // Instantiation
-let globalInstance: Chance.Chance = chance;
-let createYourOwn = new Chance(Math.random);
+const chance = new Chance();
+const createYourOwn = new Chance(Math.random);
 
 // Basic usage
-let randBool: boolean = chance.bool();
+const randBool: boolean = chance.bool();
 
-let birthday: Date = chance.birthday();
-let birthdayStr: Date | string = chance.birthday({ string: true });
+const birthday: Date = chance.birthday();
+const birthdayStr: Date | string = chance.birthday({ string: true });
 
 let guid = chance.guid();
 guid = chance.guid({ version: 4 });
 guid = chance.guid({ version: 5 });
 
-let strArr: string[] = chance.n(chance.string, 42);
+const strArr: string[] = chance.n(chance.string, 42);
 
-let uniqInts: number[] = chance.unique(chance.integer, 99);
+const uniqInts: number[] = chance.unique(chance.integer, 99);
 
-let currencyPair = chance.currency_pair();
-let firstCurrency = currencyPair[0];
-let secondCurrency = currencyPair[1];
+const currencyPair = chance.currency_pair();
+const firstCurrency = currencyPair[0];
+const secondCurrency = currencyPair[1];
 
 // Mixins can be used with on-the-fly type declaration
 declare namespace Chance {
@@ -35,8 +36,38 @@ chance.mixin({
     },
 });
 
-let timeString: string = chance.time();
+const chanceConstructedWithSeed100 = new Chance(100);
+const chanceCalledWithSeed100 = Chance();
+const chanceConstructedWithStringSeed = new Chance("test");
 
-let chanceConstructedWithSeed100 = new Chance(100);
-let chanceCalledWithSeed100 = Chance();
-let chanceConstructedWithStringSeed = new Chance("test");
+// Test new added typed functions
+
+let letter = chance.letter();
+letter = chance.letter({opt: 'abc'});
+
+let cf = chance.cf();
+cf = chance.cf({opt: 'abc'});
+
+let animal = chance.animal();
+animal = chance.animal({opt: 'abc'});
+
+let avatar = chance.avatar();
+avatar = chance.avatar({opt: 'abc'});
+
+let company = chance.company();
+company = chance.company();
+
+let profession = chance.profession();
+profession = chance.profession({opt: 'abc'});
+
+let timezone = chance.timezone();
+timezone = chance.timezone();
+
+let weekday = chance.weekday({opt: 'abc'});
+weekday = chance.weekday({opt: 'abc'});
+
+let euro = chance.euro();
+euro = chance.euro({opt: 'abc'});
+
+let coin = chance.coin();
+coin = chance.coin();
diff --git a/types/chance/index.d.ts b/types/chance/index.d.ts
index 212e90dfe2..07418e45be 100644
--- a/types/chance/index.d.ts
+++ b/types/chance/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for Chance 0.7.4
+// Type definitions for Chance 1.0.13
 // Project: http://chancejs.com
 // Definitions by: Chris Bowdon <https://github.com/cbowdon>
 //                 Brice BERNARD <https://github.com/brikou>
+//                 Carlos Sanchez <https://github.com/cafesanu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Chance {
@@ -11,24 +12,23 @@ declare namespace Chance {
         seed: Seed;
     }
 
-    type SeededChance = Chance & Seeded;
-
     interface ChanceStatic {
         (): Chance;
-        (seed: Seed): SeededChance;
+        (seed: Seed): Chance;
         (generator: () => any): Chance;
 
         new (): Chance;
-        new (seed: Seed): SeededChance;
+        new (seed: Seed): Chance;
         new (generator: () => any): Chance;
     }
 
-    interface Chance {
+    interface Chance extends Seeded {
         // Basics
         bool(opts?: Options): boolean;
         character(opts?: Options): string;
         floating(opts?: Options): number;
         integer(opts?: Options): number;
+        letter(opts?: Options): string;
         natural(opts?: Options): number;
         string(opts?: Options): string;
 
@@ -43,6 +43,7 @@ declare namespace Chance {
         gender(): string;
         birthday(): Date;
         birthday(opts?: Options): Date | string;
+        cf(opts?: Options): string;
         cpf(): string;
         first(opts?: Options): string;
         last(opts?: Options): string;
@@ -53,6 +54,9 @@ declare namespace Chance {
         ssn(opts?: Options): string;
         suffix(opts?: Options): string;
 
+        // Mobile
+        animal(opts?: Options): string;
+
         // Mobile
         android_id(): string;
         apple_token(): string;
@@ -61,7 +65,9 @@ declare namespace Chance {
         wp8_anid2(): string;
 
         // Web
+        avatar(opts?: Options): string;
         color(opts?: Options): string;
+        company(): string;
         domain(opts?: Options): string;
         email(opts?: Options): string;
         fbid(): string;
@@ -70,6 +76,7 @@ declare namespace Chance {
         ip(): string;
         ipv6(): string;
         klout(): string;
+        profession(opts?: Options): string;
         tld(): string;
         twitter(): string;
         url(opts?: Options): string;
@@ -104,6 +111,8 @@ declare namespace Chance {
         month(opts: Options): Month;
         second(): number;
         timestamp(): number;
+        timezone(): Timezone;
+        weekday(opts: Options): 'Monday' | 'Tuesday' | 'Wednesday' | 'Thursday' | 'Friday' | 'Saturday' | 'Sunday';
         year(opts?: Options): string;
 
         // Finance
@@ -113,6 +122,7 @@ declare namespace Chance {
         currency(): Currency;
         currency_pair(): [Currency, Currency];
         dollar(opts?: Options): string;
+        euro(opts?: Options): string;
         exp(): string;
         exp(opts: Options): string | CreditCardExpiration;
         exp_month(opts?: Options): string;
@@ -136,6 +146,7 @@ declare namespace Chance {
         shuffle<T>(arr: T[]): T[];
 
         // Miscellaneous
+        coin(): string;
         d4(): number;
         d6(): number;
         d8(): number;
@@ -225,13 +236,17 @@ declare namespace Chance {
         name: string;
         abbreviation: string;
     }
+
+    interface Timezone {
+        name: string;
+        abbr: string;
+        offset: number;
+        isdst: boolean;
+        text: string;
+        utc: string[];
+    }
 }
 
-// window.chance
-declare var chance: Chance.Chance;
-declare var Chance: Chance.ChanceStatic;
-
-// import Chance = require('chance');
 declare module "chance" {
     interface ExportedChance extends Chance.ChanceStatic {
         Chance: ExportedChance;

From b11c5e098a5004225df32cf57c9300206c911b71 Mon Sep 17 00:00:00 2001
From: Lucas Riondel <lucas.riondel@wiztivi.com>
Date: Thu, 22 Feb 2018 17:26:50 +0100
Subject: [PATCH 210/388] added base64topdf definition file

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

diff --git a/types/base64topdf/base64topdf-tests.ts b/types/base64topdf/base64topdf-tests.ts
new file mode 100644
index 0000000000..109ec5fbff
--- /dev/null
+++ b/types/base64topdf/base64topdf-tests.ts
@@ -0,0 +1,8 @@
+import * as base64topdf from 'base64topdf';
+
+base64topdf.base64Encode('index.ts'); // $ExpectType void
+base64topdf.base64Decode('decodethis', 'test.b64'); // $ExpectType void
+base64topdf.rtfToText('rtf'); // $ExpectType string
+base64topdf.textToRtf('text'); // $ExpectType string
+base64topdf.strToBase64('str'); // $ExpectType string
+base64topdf.base64ToStr('base64'); // $ExpectType string
diff --git a/types/base64topdf/index.d.ts b/types/base64topdf/index.d.ts
new file mode 100644
index 0000000000..97f9af7077
--- /dev/null
+++ b/types/base64topdf/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for base64topdf 1.1
+// Project: https://github.com/rpsankar001
+// Definitions by: Lucas Riondel <https://github.com/lucasriondel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace base64topdf;
+
+export function base64Encode(file: string): void;
+export function base64Decode(base64str: string, file: string): void;
+export function rtfToText(rtfStr: string): string;
+export function textToRtf(textStr: string): string;
+export function strToBase64(str: string): string;
+export function base64ToStr(base64Str: string): string;
diff --git a/types/base64topdf/tsconfig.json b/types/base64topdf/tsconfig.json
new file mode 100644
index 0000000000..29fb459eb9
--- /dev/null
+++ b/types/base64topdf/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",
+        "base64topdf-tests.ts"
+    ]
+}
diff --git a/types/base64topdf/tslint.json b/types/base64topdf/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/base64topdf/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 26695e8544fae2873c3931e83658187a793f124b Mon Sep 17 00:00:00 2001
From: guilhermehubner <guilherme_hubner@msn.com>
Date: Thu, 22 Feb 2018 14:06:09 -0300
Subject: [PATCH 211/388] [React] Add target to FocusEvent

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 93b143b7bf..c3e2d72052 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>
+//                 Guilherme Hübner <https://github.com/guilhermehubner>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -479,6 +480,7 @@ declare namespace React {
     interface FocusEvent<T> extends SyntheticEvent<T> {
         nativeEvent: NativeFocusEvent;
         relatedTarget: EventTarget;
+        target: EventTarget & T;
     }
 
     // tslint:disable-next-line:no-empty-interface

From aec14ac7739e31d4ea329c52b28695646afedb7f Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Thu, 22 Feb 2018 09:26:54 -0800
Subject: [PATCH 212/388] three: Remove unnecessary dat.gui dependency (#23857)

---
 types/three/test/references.ts                     |  1 -
 .../test/webgl/webgl_animation_skinning_morph.ts   | 14 ++------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/types/three/test/references.ts b/types/three/test/references.ts
index c5d3c66909..e2068d68a5 100644
--- a/types/three/test/references.ts
+++ b/types/three/test/references.ts
@@ -1,5 +1,4 @@
 // References used by tests
 
-/// <reference types="dat-gui" />
 /// <reference types="stats.js" />
 /// <reference types="tween.js" />
diff --git a/types/three/test/webgl/webgl_animation_skinning_morph.ts b/types/three/test/webgl/webgl_animation_skinning_morph.ts
index fcea4bba08..835d7a6ea5 100644
--- a/types/three/test/webgl/webgl_animation_skinning_morph.ts
+++ b/types/three/test/webgl/webgl_animation_skinning_morph.ts
@@ -186,18 +186,8 @@
     }
 
     function initGUI() {
-
-        var API = {
-            'show model'    : true,
-            'show skeleton' : false
-        };
-
-        var gui = new dat.GUI();
-
-        gui.add( API, 'show model' ).onChange( function() { mesh.visible = API[ 'show model' ]; } );
-
-        gui.add( API, 'show skeleton' ).onChange( function() { helper.visible = API[ 'show skeleton' ]; } );
-
+        mesh.visible = true;
+        helper.visible = true;
     }
 
     function onDocumentMouseMove( event: MouseEvent ) {

From f2667f08626faa62fa1a8b936a9531183e819768 Mon Sep 17 00:00:00 2001
From: Maurus Cuelenaere <mcuelenaere@gmail.com>
Date: Thu, 22 Feb 2018 18:35:20 +0100
Subject: [PATCH 213/388] Add a default export to big.js (#23769)

* Add a default export to big.js

As can be seen on https://github.com/MikeMcl/big.js/blob/master/big.js#L925, big.js exposes a default export.
Expose this in the Typescript bindings as well.

* Add default import test for big.js

* Fix lint errors
---
 types/big.js/index.d.ts                          |  1 +
 types/big.js/test/big.js-import-default-tests.ts | 12 ++++++++++++
 types/big.js/tsconfig.json                       |  3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 types/big.js/test/big.js-import-default-tests.ts

diff --git a/types/big.js/index.d.ts b/types/big.js/index.d.ts
index 37f51a54bd..405622f7ee 100644
--- a/types/big.js/index.d.ts
+++ b/types/big.js/index.d.ts
@@ -295,6 +295,7 @@ export const Big: BigConstructor;
 export type Big_ = Big;
 export type BigConstructor_ = BigConstructor;
 export type BigSource_ = BigSource;
+export default Big;
 
 declare global {
     namespace BigJs {
diff --git a/types/big.js/test/big.js-import-default-tests.ts b/types/big.js/test/big.js-import-default-tests.ts
new file mode 100644
index 0000000000..52841986be
--- /dev/null
+++ b/types/big.js/test/big.js-import-default-tests.ts
@@ -0,0 +1,12 @@
+/*
+
+  This file contains tests for the named export definitions of big.js.
+  Import the default Big constructor from 'big.js'
+
+*/
+
+import Big from 'big.js';
+
+function constructorTests() {
+    const x = new Big(9); // '9'
+}
diff --git a/types/big.js/tsconfig.json b/types/big.js/tsconfig.json
index 950e8b410f..20fae3a55f 100644
--- a/types/big.js/tsconfig.json
+++ b/types/big.js/tsconfig.json
@@ -19,6 +19,7 @@
     "files": [
         "index.d.ts",
         "test/big.js-module-tests.ts",
-        "test/big.js-global-tests.ts"
+        "test/big.js-global-tests.ts",
+        "test/big.js-import-default-tests.ts"
     ]
 }
\ No newline at end of file

From 3c1bb15cb037499fe461f4111d2733177e6de803 Mon Sep 17 00:00:00 2001
From: donaldFord <donald.ford@domo.com>
Date: Thu, 22 Feb 2018 11:29:52 -0700
Subject: [PATCH 214/388] added deleteIconStyle prop to ChipProps

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

diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index c35eb31cba..9d863eeb07 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -935,6 +935,7 @@ declare namespace __MaterialUI {
         onClick?: React.MouseEventHandler<Chip>;
         onRequestDelete?: React.TouchEventHandler<Chip>;
         style?: React.CSSProperties;
+        deleteIconStyle?: React.CSSProperties;
     }
 
     export class Chip extends React.Component<ChipProps> {

From 9cf5c9bd633faf5e7f5d851e74f1a8e5659eca70 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylermurphyj@gmail.com>
Date: Thu, 22 Feb 2018 14:37:30 -0500
Subject: [PATCH 215/388] Adds types for google.analytics 'require' and
 'provide' calls.

---
 types/google.analytics/google.analytics-tests.ts | 6 ++++++
 types/google.analytics/index.d.ts                | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/types/google.analytics/google.analytics-tests.ts b/types/google.analytics/google.analytics-tests.ts
index 5256f636c7..a130e2c600 100644
--- a/types/google.analytics/google.analytics-tests.ts
+++ b/types/google.analytics/google.analytics-tests.ts
@@ -33,6 +33,12 @@ describe('UniversalAnalytics', () => {
         ga('send', 'timing', {timingCategory: 'category', timingVar: 'lookup', timingValue: 123, timingLabel: 'label'});
         ga('trackerName.send', 'event', 'load');
 
+        ga('require', 'somePlugin');
+        ga('require', 'somePlugin', { some: 'options' });
+        ga('provide', 'somePlugin', () => {});
+        ga('provide', 'somePlugin', tracker => {});
+        ga('provide', 'somePlugin', (tracker, options) => {});
+
         ga.create('UA-65432-1', 'auto');
         ga.create('UA-65432-1', {some: 'config'});
         ga.create('UA-65432-1', 'auto', {some: 'config'});
diff --git a/types/google.analytics/index.d.ts b/types/google.analytics/index.d.ts
index b7d4a8a6f4..6d61962520 100644
--- a/types/google.analytics/index.d.ts
+++ b/types/google.analytics/index.d.ts
@@ -601,6 +601,8 @@ declare namespace UniversalAnalytics {
             }): void;
         (command: 'send', fieldsObject: FieldsObject): void;
         (command: string, hitType: HitType, ...fields: any[]): void;
+        (command: 'require', pluginName: string, pluginOptions?: Object): void;
+        (command: 'provide', pluginName: string, pluginConstructor: (tracker: Tracker, pluginOptions?: Object) => void): void;
 
         (command: 'create', trackingId: string, cookieDomain?: string, name?: string, fieldsObject?: FieldsObject): void;
         (command: 'remove'): void;

From 3b84322b61a0133a422e16fa369c67f72396be8d Mon Sep 17 00:00:00 2001
From: segler-alex <segler-alex@users.noreply.github.com>
Date: Thu, 22 Feb 2018 20:42:48 +0100
Subject: [PATCH 216/388] amqp: added heartbeat to ConnectionOptions

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

diff --git a/types/amqp/index.d.ts b/types/amqp/index.d.ts
index ca39ce4404..4e2cd4e288 100644
--- a/types/amqp/index.d.ts
+++ b/types/amqp/index.d.ts
@@ -96,6 +96,7 @@ export interface ConnectionOptions {
   authMechanism?: string;
   vhost?: string;
   noDelay?: boolean;
+  heartbeat?: number;
   ssl?: {
     enabled: boolean;
     keyFile?: string;

From 05143e9d80add9d9058b3d1bae7b69480e5d24df Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylermurphyj@gmail.com>
Date: Thu, 22 Feb 2018 14:43:33 -0500
Subject: [PATCH 217/388] Corrects the ga('require'e', ...) plugin options
 type, since plugin options can actually have any type.

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

diff --git a/types/google.analytics/google.analytics-tests.ts b/types/google.analytics/google.analytics-tests.ts
index a130e2c600..63ca4e5ca4 100644
--- a/types/google.analytics/google.analytics-tests.ts
+++ b/types/google.analytics/google.analytics-tests.ts
@@ -34,6 +34,7 @@ describe('UniversalAnalytics', () => {
         ga('trackerName.send', 'event', 'load');
 
         ga('require', 'somePlugin');
+        ga('require', 'somePlugin', 'option');
         ga('require', 'somePlugin', { some: 'options' });
         ga('provide', 'somePlugin', () => {});
         ga('provide', 'somePlugin', tracker => {});
diff --git a/types/google.analytics/index.d.ts b/types/google.analytics/index.d.ts
index 6d61962520..b71fdef286 100644
--- a/types/google.analytics/index.d.ts
+++ b/types/google.analytics/index.d.ts
@@ -601,7 +601,7 @@ declare namespace UniversalAnalytics {
             }): void;
         (command: 'send', fieldsObject: FieldsObject): void;
         (command: string, hitType: HitType, ...fields: any[]): void;
-        (command: 'require', pluginName: string, pluginOptions?: Object): void;
+        (command: 'require', pluginName: string, pluginOptions?: any): void;
         (command: 'provide', pluginName: string, pluginConstructor: (tracker: Tracker, pluginOptions?: Object) => void): void;
 
         (command: 'create', trackingId: string, cookieDomain?: string, name?: string, fieldsObject?: FieldsObject): void;

From ead8479b1c83efed59aa4ba636e28350b496c7e4 Mon Sep 17 00:00:00 2001
From: Flarna <deb2001-github@yahoo.de>
Date: Thu, 22 Feb 2018 22:41:22 +0100
Subject: [PATCH 218/388] Added calledWithNew()

---
 types/sinon/index.d.ts     | 15 ++++++++-------
 types/sinon/sinon-tests.ts |  3 +++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index 9348f3a690..5d3288068d 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -353,19 +353,20 @@ declare namespace Sinon {
         calledThrice(spy: SinonSpy): void;
         callCount(spy: SinonSpy, count: number): void;
         callOrder(...spies: SinonSpy[]): void;
-        calledOn(spy: SinonSpy | SinonSpyCall, obj: any): void;
+        calledOn(spyOrSpyCall: SinonSpy | SinonSpyCall, obj: any): void;
         alwaysCalledOn(spy: SinonSpy, obj: any): void;
-        calledWith(spy: SinonSpy | SinonSpyCall, ...args: any[]): void;
+        calledWith(spyOrSpyCall: SinonSpy | SinonSpyCall, ...args: any[]): void;
         alwaysCalledWith(spy: SinonSpy, ...args: any[]): void;
         neverCalledWith(spy: SinonSpy, ...args: any[]): void;
-        calledWithExactly(spy: SinonSpy | SinonSpyCall, ...args: any[]): void;
+        calledWithExactly(spyOrSpyCall: SinonSpy | SinonSpyCall, ...args: any[]): void;
         alwaysCalledWithExactly(spy: SinonSpy, ...args: any[]): void;
-        calledWithMatch(spy: SinonSpy | SinonSpyCall, ...args: any[]): void;
+        calledWithMatch(spyOrSpyCall: SinonSpy | SinonSpyCall, ...args: any[]): void;
         alwaysCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
         neverCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
-        threw(spy: SinonSpy | SinonSpyCall): void;
-        threw(spy: SinonSpy | SinonSpyCall, exception: string): void;
-        threw(spy: SinonSpy | SinonSpyCall, exception: any): void;
+        calledWithNew(spyOrSpyCall: SinonSpy | SinonSpyCall): void;
+        threw(spyOrSpyCall: SinonSpy | SinonSpyCall): void;
+        threw(spyOrSpyCall: SinonSpy | SinonSpyCall, exception: string): void;
+        threw(spyOrSpyCall: SinonSpy | SinonSpyCall, exception: any): void;
         alwaysThrew(spy: SinonSpy): void;
         alwaysThrew(spy: SinonSpy, exception: string): void;
         alwaysThrew(spy: SinonSpy, exception: any): void;
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index 16ec014b21..6ce2254596 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -100,6 +100,9 @@ function testNine() {
     sinon.assert.calledOn(callback.secondCall, "this");
     sinon.assert.threw(callback.thirdCall);
     sinon.assert.threw(callback.thirdCall, "Error");
+    new (callback as any)();
+    sinon.assert.calledWithNew(callback);
+    sinon.assert.calledWithNew(callback.getCall(4));
 }
 
 function testAssert() {

From 0cee7bed17472ecd82ecdcce30bc3cb41cd9911a Mon Sep 17 00:00:00 2001
From: Kun Yan <kyan@redhat.com>
Date: Fri, 23 Feb 2018 10:34:20 +0800
Subject: [PATCH 219/388] [react-table] Fix SortedChangeFunction issue

Add more types(Filter|Resize)
---
 types/react-table/index.d.ts            | 44 +++++++++++++++++--------
 types/react-table/react-table-tests.tsx |  5 +++
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 2ab2d2a821..aa759990b8 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -18,17 +18,26 @@ export type ComponentPropsGetterR = (finalState: any, rowInfo?: RowInfo, column?
 export type ComponentPropsGetterC = (finalState: any, rowInfo?: undefined, column?: Column, instance?: any) => object | undefined;
 export type ComponentPropsGetterRC = (finalState: any, rowInfo?: RowInfo, column?: Column, instance?: any) => object | undefined;
 
-export type DefaultFilterFunction = (filter: any, row: any, column: any) => boolean;
-export type FilterFunction = (filter: any, rows: any[], column: any) => boolean;
+export type DefaultFilterFunction = (filter: Filter, row: any, column: any) => boolean;
+export type FilterFunction = (filter: Filter, rows: any[], column: any) => boolean;
 export type SubComponentFunction = (rowInfo: RowInfo) => React.ReactNode;
 export type PageChangeFunction = (page: number) => void;
 export type PageSizeChangeFunction = (newPageSize: number, newPage: number) => void;
-export type SortedChangeFunction = (column: any, additive: boolean) => void;
-export type FilteredChangeFunction = (column: any, value: any, pivotColumn: any) => void;
+export type SortedChangeFunction = (newSorted: SortingRule[], column: any, additive: boolean) => void;
+export type FilteredChangeFunction = (newFiltering: Filter, column: any, value: any) => void;
 export type ExpandedChangeFunction = (column: any, event: any, isTouch: boolean) => void;
-export type ResizedChangeFunction = (newResized: any, event: any) => void;
+export type ResizedChangeFunction = (newResized: Resize[], event: any) => void;
 export type SortFunction = (a: any, b: any, desc: any) => -1 | 0 | 1;
 
+export interface Resize {
+    id: string;
+    value: any;
+}
+export interface Filter {
+    id: string;
+    value: any;
+    pivotId?: string;
+}
 /** NOTE: to many configuration ways (only true values are confusing) */
 export interface SortingRule {
     id: string;
@@ -106,7 +115,7 @@ export interface TableProps extends
     showFilters: boolean;
 
     /** Default: [] */
-    defaultFiltering: any[];
+    defaultFiltering: Filter[];
 
     /** Default: ... */
     defaultFilterMethod: DefaultFilterFunction;
@@ -121,19 +130,19 @@ export interface TableProps extends
     filterable: boolean;
 
     /** Default: [] */
-    defaultResizing: any[];
+    defaultResizing: Resize[];
 
     /** Default: false */
     defaultSortDesc: boolean;
 
     /** Default: [] */
-    defaultSorted: any[];
+    defaultSorted: SortingRule[];
 
     /** Default: [] */
-    defaultFiltered: any[];
+    defaultFiltered: Filter[];
 
     /** Default: [] */
-    defaultResized: any[];
+    defaultResized: Resize[];
 
     /** Default: {} */
     defaultExpanded: {};
@@ -184,13 +193,13 @@ export interface ControlledStateOverrideProps {
     sorting: number;
 
     /** Default: [] */
-    sorted: any[];
+    sorted: SortingRule[];
 
     /** Default: [] */
-    filtered: any[];
+    filtered: Filter[];
 
     /** Default: [] */
-    resized: any[];
+    resized: Resize[];
 
     /** Default: {} */
     expanded: {};
@@ -613,6 +622,12 @@ export interface RowInfo {
     /** The index of the row relative to the current page */
     viewIndex: number;
 
+    /** The size of the page */
+    pageSize: number;
+
+    /** The index of page */
+    page: number;
+
     /** The nesting depth (zero-indexed) */
     level: number;
 
@@ -622,6 +637,9 @@ export interface RowInfo {
     /** A boolean stating if the row is an aggregation row */
     aggregated: boolean;
 
+    /** A boolean stating if the row is grouped by Pivot */
+    groupedByPivot: boolean;
+
     /** An array of any expandable sub-rows contained in this row */
     subRows: any[];
 }
diff --git a/types/react-table/react-table-tests.tsx b/types/react-table/react-table-tests.tsx
index 3230e4c5da..f03bb5e167 100644
--- a/types/react-table/react-table-tests.tsx
+++ b/types/react-table/react-table-tests.tsx
@@ -149,6 +149,11 @@ const Component = (props: {}) => {
         pageText='Page'
         ofText='of'
         rowsText='rows'
+        onSortedChange={(newSorted, column, additive) => {
+          if (newSorted) {
+            console.log(newSorted);
+          }
+        }}
       />
       <br />
     </div>

From 9f86bfe7d120e80a959f645cad38ba3316691d2f Mon Sep 17 00:00:00 2001
From: AlexStacker <lexusuxn@gmail.com>
Date: Fri, 23 Feb 2018 12:56:11 +0800
Subject: [PATCH 220/388] Update weixin api to 1.9.0

---
 types/weixin-app/index.d.ts          | 5474 ++++++++++++++++----------
 types/weixin-app/tsconfig.json       |   45 +-
 types/weixin-app/tslint.json         |   15 +-
 types/weixin-app/weixin-app-tests.ts |  292 ++
 4 files changed, 3672 insertions(+), 2154 deletions(-)

diff --git a/types/weixin-app/index.d.ts b/types/weixin-app/index.d.ts
index 851216466e..88d8c4bfc5 100644
--- a/types/weixin-app/index.d.ts
+++ b/types/weixin-app/index.d.ts
@@ -1,2133 +1,3361 @@
-// Type definitions for wx-app 1.0
+// Type definitions for wx-app 1.9
 // Project: https://mp.weixin.qq.com/debug/wxadoc/dev/api/
 // Definitions by: taoqf <https://github.com/taoqf>
+//                 AlexStacker <https://github.com/AlexStacker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare namespace wx {
-	interface DataResponse {
-		/** 回调函数返回的内容 */
-		data: any;
-	}
-	interface ErrMsgResponse {
-		/** 成功：ok，错误：详细信息 */
-		errMsg: 'ok' | string;
-	}
-	interface TempFileResponse {
-		/** 文件的临时路径 */
-		tempFilePath: string;
-	}
-
-	interface PageOptions {
-		/** 页面的初始数据 */
-		data?: any;
-		/** 生命周期函数--监听页面加载 */
-		onLoad?(this: Page, options: any): void;
-		/** 生命周期函数--监听页面渲染完成 */
-		onReady?(this: Page): void;
-		/** 生命周期函数--监听页面显示 */
-		onShow?(this: Page): void;
-		/** 生命周期函数--监听页面隐藏 */
-		onHide?(this: Page): void;
-		/** 生命周期函数--监听页面卸载 */
-		onUnload?(this: Page): void;
-		[key: string]: any;
-	}
-
-	interface AppOptions {
-		/**
-		 * 生命周期函数--监听小程序初始化
-		 * 当小程序初始化完成时，会触发 onLaunch（全局只触发一次）
-		 */
-		onLaunch?(this: App): void;
-		/**
-		 * 生命周期函数--监听小程序显示
-		 * 当小程序启动，或从后台进入前台显示，会触发 onShow
-		 */
-		onShow?(this: App): void;
-		/**
-		 * 生命周期函数--监听小程序隐藏
-		 * 当小程序从前台进入后台，会触发 onHide
-		 */
-		onHide?(this: App): void;
-		[key: string]: any;
-	}
-
-	interface BaseOptions {
-		/** 接口调用成功的回调函数 */
-		success?(res: any): void;
-		/** 接口调用失败的回调函数 */
-		fail?(res: any): void;
-		/** 接口调用结束的回调函数（调用成功、失败都会执行） */
-		complete?(res: any): void;
-	}
+  // #region 基本参数
+  interface DataResponse {
+    /** 回调函数返回的内容 */
+    data: any;
+  }
+  interface ErrMsgResponse {
+    /** 成功：ok，错误：详细信息 */
+    errMsg: 'ok' | string;
+  }
+  interface TempFileResponse {
+    /** 文件的临时路径 */
+    tempFilePath: string;
+  }
+  interface BaseOptions {
+    /** 接口调用成功的回调函数 */
+    success?(res: any): void;
+    /** 接口调用失败的回调函数 */
+    fail?(res: any): void;
+    /** 接口调用结束的回调函数（调用成功、失败都会执行） */
+    complete?(res: any): void;
+  }
+  // #endregion
+  // #region 网络API列表
+  // 发起请求
+  interface RequestHeader {
+    [key: string]: string;
+  }
+  interface RequestOptions extends BaseOptions {
+    /** 开发者服务器接口地址 */
+    url: string;
+    /** 请求的参数 */
+    data?: string | any;
+    /** 设置请求的 header , header 中不能设置 Referer */
+    header?: RequestHeader;
+    /** 默认为 GET，有效值：OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT */
+    method?: string;
+    /** 如果设为json，会尝试对返回的数据做一次 JSON.parse */
+    dataType?: string;
+    /**
+     * 设置响应的数据类型。合法值：text、arraybuffer
+     * @version 1.7.0
+     */
+    responseType?: string;
+    /** 收到开发者服务成功返回的回调函数，res = {data: '开发者服务器返回的内容'} */
+    success?(res: DataResponse): void;
+  }
+  /**
+   * wx.request发起的是https请求。一个微信小程序，同时只能有5个网络请求连接。
+   */
+  function request(options: RequestOptions): void;
+  interface UploadTask {
+    /**
+     * 监听上传进度变化
+     * @version 1.4.0
+     */
+    onProgressUpdate(callback?: (res: {
+      /** 上传进度百分比 */
+      progress: number;
+      /** 已经上传的数据长度，单位 Bytes */
+      totalBytesSent: number;
+      /** 预期需要上传的数据总长度，单位 Bytes */
+      totalBytesExpectedToSend: number;
+    }) => void): void;
+    /**
+     * 中断下载任务
+     * @version 1.4.0
+     */
+    abort(): void;
+  }
+  // 上传下载
+  interface UploadFileOptions extends BaseOptions {
+    /** 开发者服务器 url */
+    url: string;
+    /** 要上传文件资源的路径 */
+    filePath: string;
+    /** 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容 */
+    name: string;
+    /** HTTP 请求 Header , header 中不能设置 Referer */
+    header?: RequestHeader;
+    /** HTTP 请求中其他额外的 form data */
+    formData?: any;
+  }
+  /**
+   * 将本地资源上传到开发者服务器。
+   * 如页面通过 wx.chooseImage 等接口获取到一个本地资源的临时文件路径后，
+   * 可通过此接口将本地资源上传到指定服务器。
+   * 客户端发起一个 HTTPS POST 请求，
+   * 其中 Content-Type 为 multipart/form-data 。
+   */
+  function uploadFile(options: UploadFileOptions): UploadTask;
+  interface DownloadTask {
+    /**
+     * 监听下载进度变化
+     * @version 1.4.0
+     */
+    onProgressUpdate(callback?: (res: {
+      /** 下载进度百分比 */
+      progress: number;
+      /** 已经下载的数据长度，单位 Bytes */
+      totalBytesWritten: number;
+      /** 预期需要下载的数据总长度，单位 Bytes */
+      totalBytesExpectedToWrite: number;
+    }) => void): void;
+    /**
+     * 中断下载任务
+     * @version 1.4.0
+     */
+    abort(): void;
+  }
+  interface DownloadFileOptions extends BaseOptions {
+    /** 下载资源的 url */
+    url: string;
+    /** 下载资源的类型，用于客户端识别处理，有效值：image/audio/video */
+    type?: string;
+    /** HTTP 请求 Header */
+    header?: RequestHeader;
+    /** 下载成功后以 tempFilePath 的形式传给页面，res = {tempFilePath: '文件的临时路径'} */
+    success?(res: TempFileResponse): void;
+  }
+  /**
+   * 下载文件资源到本地。客户端直接发起一个 HTTP GET 请求，
+   * 把下载到的资源根据 type 进行处理，并返回文件的本地临时路径。
+   */
+  function downloadFile(options: DownloadFileOptions): DownloadTask;
+  // WebSocket
+  interface ConnectSocketOptions extends BaseOptions {
+    /** 开发者服务器接口地址，必须是 HTTPS 协议，且域名必须是后台配置的合法域名 */
+    url: string;
+    /** 请求的数据 */
+    data?: any;
+    /** HTTP Header , header 中不能设置 Referer */
+    header?: RequestHeader;
+    /** 默认是GET，有效值为： OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT */
+    method?: string;
+    /**
+     * 子协议数组
+     * @version 1.4.0
+     */
+    protocols?: string[];
+  }
+  /**
+   * 创建一个 WebSocket 连接；
+   * 一个微信小程序同时只能有一个 WebSocket 连接，
+   * 如果当前已存在一个 WebSocket 连接，
+   * 会自动关闭该连接，并重新创建一个 WebSocket 连接。
+   */
+  function connectSocket(options: ConnectSocketOptions): void;
+  /** 监听WebSocket连接打开事件。 */
+  function onSocketOpen(callback: () => void): void;
+  /** 监听WebSocket错误。 */
+  function onSocketError(callback: (error: any) => void): void;
+  interface SendSocketMessageOptions extends BaseOptions {
+    /** 需要发送的内容 */
+    data: string;
+  }
+  /**
+   * 通过 WebSocket 连接发送数据，需要先 wx.connectSocket，
+   * 并在 wx.onSocketOpen 回调之后才能发送。
+   */
+  function sendSocketMessage(options: SendSocketMessageOptions): void;
+  /**
+   * 监听WebSocket接受到服务器的消息事件。
+   */
+  function onSocketMessage(callback: (res: DataResponse) => void): void;
+  /**
+   * 关闭WebSocket连接。
+   */
+  function closeSocket(): void;
+  /** 监听WebSocket关闭。 */
+  function onSocketClose(callback: () => void): void;
+  // #endregion
+  // #region 媒体API列表
+  // 媒体-----图片
+  type ImageSizeType = 'original' | 'compressed';
+  type ImageSourceType = 'album' | 'camera';
+  type VideoSourceType = 'album' | 'camera';
+  type CameraDevice = 'front' | 'back';
+  interface TempFile {
+    /** 本地文件路径 */
+    path: string;
+    /** 本地文件大小，单位：B */
+    size: number;
+  }
+  interface TempFilesData {
+    /** 文件的临时路径 */
+    tempFilePaths: string;
+    /**
+     * 图片的本地文件列表，每一项是一个 File 对象
+     * @version 1.2.0
+     */
+    tempFiles: TempFile[];
+  }
+  interface ChooseImageOptions extends BaseOptions {
+    /** 最多可以选择的图片张数，默认9 */
+    count?: number;
+    /** original 原图，compressed 压缩图，默认二者都有 */
+    sizeType?: ImageSizeType[];
+    /** album 从相册选图，camera 使用相机，默认二者都有 */
+    sourceType?: ImageSourceType[];
+    /** 成功则返回图片的本地文件路径列表 tempFilePaths */
+    success(res: TempFilesData): void;
+  }
+  /**
+   * 从本地相册选择图片或使用相机拍照。
+   */
+  function chooseImage(options: ChooseImageOptions): void;
+  interface PreviewImageOptions extends BaseOptions {
+    /** 当前显示图片的链接，不填则默认为 urls 的第一张 */
+    current?: string;
+    /** 需要预览的图片链接列表 */
+    urls: string[];
+  }
+  /**
+   * 预览图片。
+   */
+  function previewImage(options: PreviewImageOptions): void;
+  interface GetImageInfoOptions extends BaseOptions {
+    /**
+     * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
+     */
+    src: string;
+  }
+  /**
+   * 获取图片信息
+   */
+  function getImageInfo(options: GetImageInfoOptions): void;
+  interface SaveImageToPhotosAlbumOptions extends BaseOptions {
+    /**
+     * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
+     */
+    filePath: string;
+    success(res: {
+      errMsg: string
+    }): void;
+  }
+  /**
+   * 保存图片到系统相册。
+   * 需要用户授权 scope.writePhotosAlbum
+   * @version 1.2.0
+   */
+  function saveImageToPhotosAlbum(options: SaveImageToPhotosAlbumOptions): void;
+  // 媒体-----录音
+  interface StartRecordOptions extends BaseOptions {
+    /** 录音成功后调用，返回录音文件的临时文件路径，res = {tempFilePath: '录音文件的临时路径'} */
+    success?(res: TempFileResponse): void;
+  }
+  /**
+   * 开始录音。当主动调用wx.stopRecord，
+   * 或者录音超过1分钟时自动结束录音，返回录音文件的临时文件路径。
+   * 注：文件的临时路径，在小程序本次启动期间可以正常使用，
+   * 如需持久保存，需在主动调用wx.saveFile，在小程序下次启动时才能访问得到。
+   * @deprecated 1.6.0
+   */
+  function startRecord(options: StartRecordOptions): void;
+  interface StopRecordOptions extends BaseOptions {
+    success?(): void;
+  }
+  /**
+   * 主动调用停止录音。
+   */
+  function stopRecord(options?: StopRecordOptions): void;
+  type EncodeBitRate = 8000 | 11025 | 12000 | 16000 | 22050 | 24000 | 32000 | 44100 | 48000;
+  interface RecorderManagerStartOptions {
+    /**
+     * 指定录音的时长，单位 ms
+     * 如果传入了合法的 duration
+     * 在到达指定的 duration 后会自动停止录音，最大值 600000（10 分钟）,默认值 60000（1 分钟）
+     */
+    duration?: number;
+    /**
+     * 采样率，有效值 8000/16000/44100
+     */
+    sampleRate?: number;
+    /**
+     * 否 录音通道数，有效值 1/2
+     */
+    numberOfChannels?: number;
+    /**
+     * 编码码率
+     * 采样率和码率有一定要求，具体有效值如下：
+     * 采样率 编码码率
+     * + 8000 16000 ~ 48000
+     * + 11025 16000 ~ 48000
+     * + 12000 24000 ~ 64000
+     * + 16000 24000 ~ 96000
+     * + 22050 32000 ~ 128000
+     * + 24000 32000 ~ 128000
+     * + 32000 48000 ~ 192000
+     * + 44100 64000 ~ 320000
+     * + 48000 64000 ~ 320000
+     */
+    encodeBitRate: number;
+    /** 音频格式，有效值 aac/mp3 */
+    format: string;
+    /**
+     * 指定帧大小，单位 KB
+     * 传入 frameSize 后，每录制指定帧大小的内容后
+     * 会回调录制的文件内容，不指定则不会回调。暂仅支持 mp3 格式。
+     */
+    frameSize: number;
+  }
+  interface OnRecorderManagerStopOptions {
+    tempFilePath: string;
+  }
+  interface OnFrameRecordedOptions {
+    /**  录音分片结果数据 */
+    frameBuffer: ArrayBuffer;
+    /** 当前帧是否正常录音结束前的最后一帧 */
+    isLastFrame: boolean;
+  }
+  interface RecorderManager {
+    /** 开始录音 */
+    start(options?: RecorderManagerStartOptions): void;
+    /** 暂停录音 */
+    pause(): void;
+    /** 继续录音 */
+    resume(): void;
+    /** 停止录音 */
+    stop(): void;
+    /** 录音开始事件 */
+    onStart(callback?: () => void): void;
+    /** 录音暂停事件 */
+    onPause(callback?: () => void): void;
+    /** 录音恢复事件 */
+    onResume(callback?: () => void): void;
+    /** 录音停止事件，会回调文件地址 */
+    onStop(callback?: (options: OnRecorderManagerStopOptions) => void): void;
+    /** 已录制完指定帧大小的文件，会回调录音分片结果数据。如果设置了 frameSize ，则会回调此事件 */
+    onFrameRecorded(callback?: (options: OnFrameRecordedOptions) => void): void;
+    /** 录音错误事件, 会回调错误信息 */
+    onError(callback?: (err: ErrMsgResponse) => void): void;
+  }
+  /**
+   * 获取全局唯一的录音管理器 recorderManager
+   * @version 1.6.0
+   */
+  function getRecorderManager(): RecorderManager;
+  // 媒体-----音频播放控制
+  interface PlayVoiceOptions extends BaseOptions {
+    /** 需要播放的语音文件的文件路径 */
+    filePath: string;
+  }
+  /**
+   * 开始播放语音，同时只允许一个语音文件正在播放，
+   * 如果前一个语音文件还没播放完，将中断前一个语音播放。
+   * @deprecated 1.6.0
+   */
+  function playVoice(options: PlayVoiceOptions): void;
+  /**
+   * 暂停正在播放的语音。
+   * 再次调用wx.playVoice播放同一个文件时，会从暂停处开始播放。
+   * 如果想从头开始播放，需要先调用 wx.stopVoice。
+   * @deprecated 1.6.0
+   */
+  function pauseVoice(): void;
+  /**
+   * 结束播放语音。
+   * @deprecated 1.6.0
+   */
+  function stopVoice(): void;
+  // 媒体-----音乐播放控制
+  interface BackgroundAudioPlayerState {
+    /** 选定音频的长度（单位：s），只有在当前有音乐播放时返回 */
+    duration: number;
+    /** 选定音频的播放位置（单位：s），只有在当前有音乐播放时返回 */
+    currentPosition: number;
+    /** 播放状态（2：没有音乐在播放，1：播放中，0：暂停中） */
+    status: number;
+    /** 音频的下载进度（整数，80 代表 80%），只有在当前有音乐播放时返回 */
+    downloadPercent: number;
+    /** 歌曲数据链接，只有在当前有音乐播放时返回 */
+    dataUrl: string;
+  }
+  interface GetBackgroundAudioPlayerStateOptions extends BaseOptions {
+    /** 接口调用成功的回调函数 */
+    success?(state: BackgroundAudioPlayerState): void;
+    /** 接口调用失败的回调函数 */
+    fail?(): void;
+    /** 接口调用结束的回调函数（调用成功、失败都会执行） */
+    complete?(): void;
+  }
+  /**
+   * 获取音乐播放状态。
+   * @deprecated 1.2.0
+   */
+  function getBackgroundAudioPlayerState(options: GetBackgroundAudioPlayerStateOptions): void;
+  interface PlayBackgroundAudioOptions extends BaseOptions {
+    /** 音乐链接 */
+    dataUrl: string;
+    /** 音乐标题 */
+    title?: string;
+    /** 封面URL */
+    coverImgUrl?: string;
+  }
+  /**
+   * 播放音乐，同时只能有一首音乐正在播放。
+   * @deprecated 1.2.0
+   */
+  function playBackgroundAudio(options: PlayBackgroundAudioOptions): void;
+  /**
+   * 暂停播放音乐。
+   * @deprecated 1.2.0
+   */
+  function pauseBackgroundAudio(options?: PlayBackgroundAudioOptions): void;
+  interface SeekBackgroundAudioOptions extends BaseOptions {
+    /** 音乐位置，单位：秒 */
+    position: number;
+  }
+  /**
+   * 控制音乐播放进度。
+   * @deprecated 1.2.0
+   */
+  function seekBackgroundAudio(options: SeekBackgroundAudioOptions): void;
+  /**
+   * 停止播放音乐。
+   * @deprecated 1.2.0
+   */
+  function stopBackgroundAudio(options?: PlayBackgroundAudioOptions): void;
+  /**
+   * 监听音乐播放。
+   * @deprecated 1.2.0
+   */
+  function onBackgroundAudioPlay(callback: () => void): void;
+  /**
+   * 监听音乐暂停。
+   * @deprecated 1.2.0
+   */
+  function onBackgroundAudioPause(callback: () => void): void;
+  /**
+   * 监听音乐停止。
+   * @deprecated 1.2.0
+   */
+  function onBackgroundAudioStop(callback: () => void): void;
+  interface BackgroundAudioManager {
+    /** 当前音频的长度（单位：s），只有在当前有合法的 src 时返回 */
+    readonly duration: number;
+    /** 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回 */
+    readonly currentTime: number;
+    /** 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放 */
+    readonly paused: boolean;
+    /** 音频的数据源，默认为空字符串，当设置了新的 src 时，会自动开始播放 ，目前支持的格式有 m4a, aac, mp3, wav */
+    src: string;
+    /** 音频开始播放的位置（单位：s） */
+    startTime: number;
+    /** 音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲。 是 */
+    buffered: number;
+    /** 音频标题，用于做原生音频播放器音频标题。原生音频播放器中的分享功能，分享出去的卡片标题，也将使用该值。 */
+    title: string;
+    /** 专辑名，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
+    epname: string;
+    /** 歌手名，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
+    singer: string;
+    /** 封面图url，用于做原生音频播放器背景图。原生音频播放器中的分享功能，分享出去的卡片配图及背景也将使用该图。 */
+    coverImgUrl: string;
+    /** 页面链接，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
+    webUrl: string;
+    /** 播放 */
+    play(): void;
+    /** 暂停 */
+    pause(): void;
+    /** 停止 */
+    stop(): void;
+    /** 跳转到指定位置，单位 s */
+    seek(position: number): void;
+    /** 背景音频进入可以播放状态，但不保证后面可以流畅播放 */
+    onCanplay(callback?: () => void): void;
+    /** 背景音频播放事件 */
+    onPlay(callback?: () => void): void;
+    /** 背景音频暂停事件 */
+    onPause(callback?: () => void): void;
+    /** 背景音频停止事件 */
+    onStop(callback?: () => void): void;
+    /** 背景音频自然播放结束事件 */
+    onEnded(callback?: () => void): void;
+    /** 背景音频播放进度更新事件 */
+    onTimeUpdate(callback?: () => void): void;
+    /** 用户在系统音乐播放面板点击上一曲事件（iOS only） */
+    onPrev(callback?: () => void): void;
+    /** 用户在系统音乐播放面板点击下一曲事件（iOS only） */
+    onNext(callback?: () => void): void;
+    /** 背景音频播放错误事件 */
+    onError(callback?: () => void): void;
+    /** 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发 */
+    onWaiting(callback?: () => void): void;
+  }
+  /**
+   * 获取全局唯一的背景音频管理器 backgroundAudioManager。
+   * @version 1.2.0
+   */
+  function getBackgroundAudioManager(): BackgroundAudioManager;
+  // 媒体-----音频组件控制
+  /**
+   * audioContext 通过 audioId 跟一个 <audio/> 组件绑定，通过它可以操作对应的 <audio/> 组件。
+   */
+  interface AudioContext {
+    /**
+     * 音频的地址
+     */
+    setSrc(src: string): void;
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 暂停
+     */
+    pause(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     */
+    seek(position: number): void;
+  }
+  /**
+   * 创建并返回 audio 上下文 audioContext 对象
+   * @param audioId audio标签id <audio  src="{{src}}" id="myAudio" ></audio>
+   * @example
+   * <!-- audio.wxml -->
+   * <audio  src="{{src}}" id="myAudio" ></audio>
+   * <button type="primary" bindtap="audioPlay">播放</button>
+   * <button type="primary" bindtap="audioPause">暂停</button>
+   * <button type="primary" bindtap="audio14">设置当前播放时间为14秒</button>
+   * <button type="primary" bindtap="audioStart">回到开头</button>
+   * // audio.js
+   * Page({
+   * onReady: function (e) {
+   *   // 使用 wx.createAudioContext 获取 audio 上下文 context
+   *   this.audioCtx = wx.createAudioContext('myAudio')
+   *   this.audioCtx.setSrc('http://ws.stream.qqmusic.qq.com/
+   * M500001VfvsJ21xFqb.mp3?guid=ffffffff82def4af4b12b3cd9337d5e7&
+   * uin=346897220&vkey=6292F51E1E384E06DCBDC9AB7C49FD713D632D313AC4858BACB8DDD29067D3C601481D36E62053BF8DFEAF74C0A5CCFADD6471160CAF3E6A&
+   * fromtag=46')
+   *   this.audioCtx.play()
+   * },
+   * data: {
+   *   src: ''
+   * },
+   * audioPlay: function () {
+   *   this.audioCtx.play()
+   * },
+   * audioPause: function () {
+   *   this.audioCtx.pause()
+   * },
+   * audio14: function () {
+   *   this.audioCtx.seek(14)
+   * },
+   * audioStart: function () {
+   *   this.audioCtx.seek(0)
+   * }
+   * })
+   * @deprecated 1.6.0
+   */
+  function createAudioContext(audioId: string, instance: any): AudioContext;
+  interface InnerAudioContext {
+    /** 当前音频的长度（单位：s），只有在当前有合法的 src 时返 */
+    readonly duration: number;
+    /** 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回，时间不取整，保留小数点后 6  */
+    readonly currentTime: number;
+    /** 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播 */
+    readonly paused: boolean;
+    /**  音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲 */
+    readonly buffered: number;
+    /** 音频的数据链接，用于直接播放。 */
+    src: string;
+    /** 开始播放的位置（单位：s），默认 0 */
+    startTime: number;
+    /** 是否自动开始播放，默认 false */
+    autoplay: boolean;
+    /** 是否循环播放，默认 false */
+    loop: boolean;
+    /** 是否遵循系统静音开关，当此参数为 false 时，即使用户打开了静音开关，也能继续发出声音，默认值 true */
+    obeyMuteSwitch: boolean;
+    /** 播放 */
+    play(): void;
+    /** 暂停 */
+    pause(): void;
+    /** 停止 */
+    stop(): void;
+    /** 跳转到指定位置，单位 s */
+    seek(position: number): void;
+    /** 销毁当前实例 */
+    destroy(): void;
+    /** 音频进入可以播放状态，但不保证后面可以流畅播放 */
+    onCanplay(callback?: () => void): void;
+    /** 音频播放事件 */
+    onPlay(callback?: () => void): void;
+    /** 音频暂停事件 */
+    onPause(callback?: () => void): void;
+    /** 音频停止事件 */
+    onStop(callback?: () => void): void;
+    /** 音频自然播放结束事件 */
+    onEnded(callback?: () => void): void;
+    /** 音频播放进度更新事件 */
+    onTimeUpdate(callback?: () => void): void;
+    /** 音频播放错误事件 */
+    onError(callback?: () => void): void;
+    /** 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发 */
+    onWaiting(callback?: () => void): void;
+    /** 音频进行 seek 操作事件 */
+    onSeeking(callback?: () => void): void;
+    /** 音频完成 seek 操作事件 */
+    onSeeked(callback?: () => void): void;
+  }
+  /**
+   * 创建并返回内部 audio 上下文 innerAudioContext 对象。
+   * 本接口是 wx.createAudioContext 升级版。
+   * @version 1.6.0
+   */
+  function createInnerAudioContext(): InnerAudioContext;
+  // 媒体-----视频
+  interface ChooseVideoOptions extends BaseOptions {
+    /** album 从相册选视频，camera 使用相机拍摄，默认为：['album', 'camera'] */
+    sourceType?: VideoSourceType[];
+    /** 拍摄视频最长拍摄时间，单位秒。最长支持60秒 */
+    maxDuration?: number;
+    /** 前置或者后置摄像头，默认为前后都有，即：['front', 'back'] */
+    camera?: CameraDevice[];
+    /** 接口调用成功，返回视频文件的临时文件路径，详见返回参数说明 */
+    success?(res: VideoData): void;
+  }
+  /**
+   * 拍摄视频或从手机相册中选视频，返回视频的临时文件路径。
+   */
+  function chooseVideo(options: ChooseVideoOptions): void;
+  // 媒体-----视频组件控制
+  interface VideoContext {
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 暂停
+     */
+    pause(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     */
+    seek(position: number): void;
+    /**
+     * 发送弹幕，danmu 包含两个属性 text, color。
+     */
+    sendDanmu(danmu: {
+      text: string;
+      color: number | string;
+    }): void;
+  }
+  interface VideoData {
+    /** 选定视频的临时文件路径 */
+    tempFilePath: string;
+    /** 选定视频的时间长度 */
+    duration: number;
+    /** 选定视频的数据量大小 */
+    size: number;
+    /** 返回选定视频的长 */
+    height: number;
+    /** 返回选定视频的宽 */
+    width: number;
+  }
+  /**
+   * 创建并返回 video 上下文 videoContext 对象
+   * @param videoId video标签id <video  src="{{src}}" id="myVideo" ></video>
+   */
+  function createVideoContext(videoId: string): VideoContext;
+  interface TakePhotoOptions extends BaseOptions {
+    /** 成像质量，值为high, normal, low，默认normal */
+    quality?: string;
+    success?(res: { tempImagePath: string }): void;
+  }
+  interface StartRecordOptions extends BaseOptions {
+    /** 超过30s或页面onHide时会结束录像 */
+    timeoutCallback?(res: { tempThumbPath: string, tempVideoPath: string }): void;
+  }
+  interface StopRecordOptions extends BaseOptions {
+    success?(res: { tempThumbPath: string, tempVideoPath: string }): void;
+  }
+  interface CameraContext {
+    /** 拍照，可指定质量，成功则返回图片 */
+    takePhoto(options: TakePhotoOptions): void;
+    /** 开始录像 */
+    startRecord(options: StartRecordOptions): void;
+    /** 结束录像，成功则返回封面与视频 */
+    stopRecord(options: StopRecordOptions): void;
+  }
+  /**
+   * 创建并返回 camera 上下文 cameraContext 对象
+   * cameraContext 与页面的 camera 组件绑定
+   * 一个页面只能有一个camera，通过它可以操作对应的 <camera/> 组件。
+   * 在自定义组件下，第一个参数传入组件实例this，以操作组件内 <camera/> 组件
+   * @version 1.6.0
+   */
+  function createCameraContext(instance: any): CameraContext;
+  interface RequestFullScreenOptions extends BaseOptions {
+    /** 有效值为 0（正常竖向）, 90（屏幕逆时针90度）, -90（屏幕顺时针90度） */
+    direction: number;
+  }
+  interface LivePlayerContext {
+    /** 播放 */
+    play(options: BaseOptions): void;
+    /** 停止 */
+    stop(options: BaseOptions): void;
+    /** 静音 */
+    mute(options: BaseOptions): void;
+    /** 进入全屏 */
+    requestFullScreen(options: RequestFullScreenOptions): void;
+    /** 退出全屏 */
+    exitFullScreen(options: BaseOptions): void;
+  }
+  /**
+   * 操作对应的 <live-player/> 组件。
+   * 创建并返回 live-player 上下文 LivePlayerContext 对象。
+   * 在自定义组件下，第二个参数传入组件实例this，以操作组件内 <live-player/> 组件
+   * @version 1.7.0
+   */
+  function createLivePlayerContext(id: string, instance: any): LivePlayerContext;
+  // 文件
+  interface SavedFileData {
+    /** 文件的保存路径 */
+    savedFilePath: string;
+  }
+  interface SaveFileOptions extends BaseOptions {
+    /** 需要保存的文件的临时路径 */
+    tempFilePath: string;
+    /** 返回文件的保存路径，res = {savedFilePath: '文件的保存路径'} */
+    success?(res: SavedFileData): void;
+  }
+  /**
+   * 保存文件到本地。
+   * 本地文件存储的大小限制为 10M
+   */
+  function saveFile(options: SaveFileOptions): void;
+  interface File {
+    /**
+     * 文件的本地路径
+     */
+    filePath: string;
+    /**
+     * 文件的保存时的时间戳，从1970/01/01 08:00:00 到当前时间的秒数
+     */
+    createTime: number;
+    /**
+     * 文件大小，单位B
+     */
+    size: number;
+  }
+  interface GetFileInfoOptions extends BaseOptions {
+    /** 本地文件路径 */
+    filePath: string;
+    /** 计算文件摘要的算法，默认值 md5，有效值：md5，sha1 */
+    digestAlgorithm?: string;
+    success?(options: GetFileInfoSuccess): void;
+  }
+  interface GetFileInfoSuccess {
+    /** 文件大小，单位：B */
+    size: number;
+    /** 按照传入的 digestAlgorithm 计算得出的的文件摘要 */
+    digest: string;
+    /** 调用结果 */
+    errMsg: string;
+  }
+  /**
+   *  获取文件信息
+   * @version 1.4.0
+   */
+  function getFileInfo(options: GetFileInfoOptions): void;
+  interface GetSavedFileListData {
+    /**
+     * 接口调用结果
+     */
+    errMsg: string;
+    /**
+     * 文件列表
+     */
+    fileList: File[];
+  }
+  interface GetSavedFileListOptions extends BaseOptions {
+    /** 接口调用成功的回调函数 */
+    success?(res: GetSavedFileListData): void;
+  }
+  /**
+   * 获取本地已保存的文件列表
+   */
+  function getSavedFileList(options: GetSavedFileListOptions): void;
+  interface SavedFileInfoData {
+    /**
+     * 接口调用结果
+     */
+    errMsg: string;
+    /**
+     * 文件大小，单位B
+     */
+    size: number;
+    /**
+     * 文件的保存是的时间戳，从1970/01/01 08:00:00 到当前时间的秒数
+     */
+    createTime: number;
+  }
+  interface GetSavedFileInfoOptions extends BaseOptions {
+    filePath: string;
+    /** 接口调用成功的回调函数 */
+    success?(res: SavedFileInfoData): void;
+  }
+  /**
+   * 获取本地文件的文件信息
+   */
+  function getSavedFileInfo(options: GetSavedFileInfoOptions): void;
+  type RemoveSavedFileOptions = BaseOptions;
+  /**
+   * 删除本地存储的文件
+   */
+  function removeSavedFile(options: RemoveSavedFileOptions): void;
+  interface OpenDocumentOptions extends BaseOptions {
+    /**
+     * 文件路径，可通过 downFile 获得
+     */
+    filePath: string;
+  }
+  /**
+   * 新开页面打开文档，支持格式：doc, xls, ppt, pdf, docx, xlsx, pptx
+   */
+  function openDocument(options: OpenDocumentOptions): void;
+  // 数据缓存
+  interface SetStorageOptions extends BaseOptions {
+    /** 本地缓存中的指定的 key */
+    key: string;
+    /** 需要存储的内容 */
+    data: any | string;
+  }
+  /**
+   * 将数据存储在本地缓存中指定的 key 中，
+   * 会覆盖掉原来该 key 对应的内容，这是一个异步接口。
+   */
+  function setStorage(options: SetStorageOptions): void;
+  /**
+   * 将 data 存储在本地缓存中指定的 key 中，
+   * 会覆盖掉原来该 key 对应的内容，这是一个同步接口。
+   *
+   * @param key 本地缓存中的指定的 key
+   * @param data 需要存储的内容
+   */
+  function setStorageSync(key: string, data: any | string): void;
+  interface GetStorageOptions extends BaseOptions {
+    /** 本地缓存中的指定的 key */
+    key: string;
+    /** 接口调用的回调函数,res = {data: key对应的内容} */
+    success(res: DataResponse): void;
+  }
+  /**
+   * 从本地缓存中异步获取指定 key 对应的内容。
+   */
+  function getStorage(options: GetStorageOptions): void;
+  /**
+   * 从本地缓存中同步获取指定 key 对应的内容。
+   *
+   */
+  function getStorageSync(key: string): any | string;
+  interface StorageInfo {
+    /**
+     * 当前storage中所有的key
+     */
+    keys: string[];
+    /**
+     * 当前占用的空间大小, 单位kb
+     */
+    currentSize: number;
+    /**
+     * 限制的空间大小，单位kb
+     */
+    limitSize: number;
+  }
+  interface GetStorageInfoOptions extends BaseOptions {
+    success(res: StorageInfo): void;
+  }
+  /**
+   * 异步获取当前storage的相关信息
+   */
+  function getStorageInfo(options: GetStorageInfoOptions): void;
+  function getStorageInfoSync(): GetStorageInfoOptions;
+  interface RemoveStorageOptions extends BaseOptions {
+    key: string;
+    success?(res: DataResponse): void;
+  }
+  function removeStorage(options: RemoveStorageOptions): void;
+  function removeStorageSync(key: string): DataResponse;
+  /**
+   * 清理本地数据缓存。
+   */
+  function clearStorage(): void;
+  /**
+   * 同步清理本地数据缓存
+   */
+  function clearStorageSync(): void;
+  // #endregion
+  // #region 位置API列表
+  // 位置-----获取位置
+  interface LocationData {
+    /** 纬度，浮点数，范围为-90~90，负数表示南纬 */
+    latitude: number;
+    /** 经度，浮点数，范围为-180~180，负数表示西经 */
+    longitude: number;
+    /** 速度，浮点数，单位m/s */
+    speed: number;
+    /** 位置的精确度 */
+    accuracy: number;
+  }
+  interface GetLocationOptions extends BaseOptions {
+    /** 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于wx.openLocation的坐标 */
+    type?: 'wgs84' | 'gcj02';
+    /** 接口调用成功的回调函数，返回内容详见返回参数说明。 */
+    success(res: LocationData): void;
+  }
+  /**
+   * 获取当前的地理位置、速度。
+   */
+  function getLocation(options: GetLocationOptions): void;
+  interface ChooseLocationData {
+    /**
+     * 位置名称
+     */
+    name: string;
+    /**
+     * 详细地址
+     */
+    address: string;
+    /**
+     * 纬度，浮点数，范围为-90~90，负数表示南纬
+     */
+    latitude: number;
+    /**
+     * 经度，浮点数，范围为-180~180，负数表示西经
+     */
+    longitude: number;
+  }
+  interface ChooseLocationOptions extends BaseOptions {
+    success(res: ChooseLocationData): void;
+  }
+  /**
+   * 打开地图选择位置
+   */
+  function chooseLocation(options: ChooseLocationOptions): void;
+  // 位置-----查看位置
+  interface OpenLocationOptions extends BaseOptions {
+    /** 纬度，范围为-90~90，负数表示南纬 */
+    latitude: number;
+    /** 经度，范围为-180~180，负数表示西经 */
+    longitude: number;
+    /** 缩放比例，范围1~28，默认为28 */
+    scale?: number;
+    /** 位置名 */
+    name?: string;
+    /** 地址的详细说明 */
+    address?: string;
+  }
+  /**
+   * 使用微信内置地图查看位置
+   */
+  function openLocation(options: OpenLocationOptions): void;
+  // 位置-----地图组件控制
+  interface GetCenterLocationOptions extends BaseOptions {
+    success(res: {
+      longitude: number;
+      latitude: number;
+    }): void;
+  }
+  /**
+   * mapContext 通过 mapId 跟一个 <map/> 组件绑定，通过它可以操作对应的 <map/> 组件。
+   */
+  interface MapContext {
+    /**
+     * 获取当前地图中心的经纬度，返回的是 gcj02 坐标系，可以用于 wx.openLocation
+     */
+    getCenterLocation(options: GetCenterLocationOptions): OpenLocationOptions;
+    /**
+     * 将地图中心移动到当前定位点，需要配合map组件的show-location使用
+     */
+    moveToLocation(): void;
+  }
+  /**
+   * 创建并返回 map 上下文 mapContext 对象
+   */
+  function createMapContext(mapId: string): MapContext;
+  // #endregion
+  // #region 设备API列表
+  // 设备-----系统信息
+  interface SystemInfo {
+    /** 手机型号 */
+    model: string;
+    /** 设备像素比 */
+    pixelRatio: number;
+    /** 窗口宽度 */
+    windowWidth: number;
+    /** 窗口高度 */
+    windowHeight: number;
+    /** 微信设置的语言 */
+    language: string;
+    /** 微信版本号 */
+    version: string;
+  }
+  interface GetSystemInfoOptions extends BaseOptions {
+    /** 成功获取系统信息的回调 */
+    success(res: SystemInfo): void;
+  }
+  /**
+   * 获取系统信息。
+   */
+  function getSystemInfo(options: GetSystemInfoOptions): void;
+  function getSystemInfoSync(): SystemInfo;
+  /**
+   * 判断小程序的API，回调，参数，组件等是否在当前版本可用。
+   * String参数说明：
+   * 使用 ${API}.${method}.${param}.${options}
+   * 或者 ${component}.${attribute}.${option}方式来调用
+   * 例如：
+   * ${API} 代表 API 名字
+   * ${method} 代表调用方式，有效值为return, success, object, callback
+   * ${param} 代表参数或者返回值
+   * ${options} 代表参数的可选值
+   * ${component} 代表组件名字
+   * ${attribute} 代表组件属性
+   * ${option} 代表组件属性的可选值
+   */
+  function canIUse(api: string): boolean;
+  // 设备-----网络状态
+  type networkType = '2g' | '3g' | '4g' | 'wifi' | 'unknown' | 'none';
+  interface NetworkTypeData {
+    /** 返回网络类型2g，3g，4g，wifi */
+    networkType: networkType;
+  }
+  interface GetNetworkTypeOptions extends BaseOptions {
+    /** 接口调用成功，返回网络类型 networkType */
+    success(res: NetworkTypeData): void;
+  }
+  /**
+   * 获取网络类型。
+   */
+  function getNetworkType(options: GetNetworkTypeOptions): void;
+  /**
+   * 监听网络状态变化。
+   * 微信客户端 6.5.6 版本开始支持
+   * @version 1.1.0
+   */
+  function onNetworkStatusChange(callback: (res: {
+    isConnected: boolean;
+    networkType: networkType;
+  }) => void): void;
+  // 设备-----加速度计
+  interface AccelerometerData {
+    /** X 轴 */
+    x: number;
+    /** Y 轴 */
+    y: number;
+    /** Z 轴 */
+    z: number;
+  }
+  type AccelerometerChangeCallback = (res: AccelerometerData) => void;
+  /**
+   * 监听重力感应数据，频率：5次/秒
+   */
+  function onAccelerometerChange(callback: AccelerometerChangeCallback): void;
+  type AccelerometerOptions = BaseOptions;
+  /**
+   * 开始监听加速度数据。
+   * 微信客户端 6.5.6 版本开始支持
+   * @version 1.1.0
+   */
+  function startAccelerometer(options: AccelerometerOptions): void;
+  /**
+   * 停止监听加速度数据。
+   * 微信客户端 6.5.6 版本开始支持
+   * @version 1.1.0
+   */
+  function stopAccelerometer(options: AccelerometerOptions): void;
+  // 设备-----罗盘
+  interface CompassData {
+    /** 面对的方向度数 */
+    direction: number;
+  }
+  type CompassChangeCallback = (res: CompassData) => void;
+  /**
+   * 监听罗盘数据，频率：5次/秒，接口调用后会自动开始监听，可使用wx.stopCompass停止监听。
+   */
+  function onCompassChange(callback: CompassChangeCallback): void;
+  type CompassOptions = BaseOptions;
+  /**
+   * 开始监听罗盘数据。
+   * 微信客户端 6.5.6 版本开始支持
+   * @version 1.1.0
+   */
+  function startCompass(options: CompassOptions): void;
+  function stopCompass(options: CompassOptions): void;
+  // 设备-----拨打电话
+  interface MakePhoneCallOptions extends BaseOptions {
+    /**
+     * 需要拨打的电话号码
+     */
+    phoneNumber: string;
+  }
+  /**
+   * 拨打电话
+   */
+  function makePhoneCall(options: MakePhoneCallOptions): void;
+  // 设备-----扫码
+  type scanType = "qrCode" | "barCode";
+  interface ScanCodeData {
+    /**
+     * 所扫码的内容
+     */
+    result: string;
+    /**
+     * 所扫码的类型
+     */
+    scanType: scanType;
+    /**
+     * 所扫码的字符集
+     */
+    charSet: string;
+    /**
+     * 当所扫的码为当前小程序的合法二维码时，会返回此字段，内容为二维码携带的 path
+     */
+    path: string;
+  }
+  interface ScanCodeOptions extends BaseOptions {
+    /**
+     * 是否只能从相机扫码，不允许从相册选择图片
+     * @version 1.2.0
+     */
+    onlyFromCamera?: boolean;
+    /**
+     * 扫码类型，参数类型是数组
+     * 二维码是'qrCode'，一维码是'barCode'，DataMatrix是‘datamatrix’，pdf417是‘pdf417’。
+     * @version 1.7.0
+     */
+    scanType?: string[];
+    success(res: ScanCodeData): void;
+  }
+  /**
+   * 调起客户端扫码界面，扫码成功后返回对应的结果
+   */
+  function scanCode(options: ScanCodeOptions): void;
+  // 设备-----剪贴板
+  interface ClipboardDataOptions extends BaseOptions {
+    data: string;
+    success?(res: DataResponse): void;
+  }
+  /**
+   * 设置系统剪贴板的内容
+   * 微信客户端 6.5.6 版本开始支持
+   * @version 1.1.0
+   */
+  function setClipboardData(options: ClipboardDataOptions): void;
+  /**
+   * 获取系统剪贴板内容
+   * 微信客户端 6.5.6 版本开始支持
+   * @version 1.1.0
+   */
+  function getClipboardData(options: ClipboardDataOptions): void;
+  // 设备-----蓝牙
+  interface OpenBluetoothAdapterOptions extends BaseOptions {
+    success(res: any): void;
+  }
+  /**
+   * 初始化蓝牙适配器
+   * @version 1.1.0
+   */
+  function openBluetoothAdapter(options: OpenBluetoothAdapterOptions): void;
+  interface CloseBluetoothAdapterOptions extends BaseOptions {
+    success(res: any): void;
+  }
+  /**
+   * 关闭蓝牙模块。调用该方法将断开所有已建立的链接并释放系统资源
+   * @version 1.1.0
+   */
+  function closeBluetoothAdapter(options: CloseBluetoothAdapterOptions): void;
+  interface BluetoothAdapterState {
+    /**
+     * 蓝牙适配器是否可用
+     */
+    available: boolean;
+    /**
+     * 蓝牙适配器是否处于搜索状态
+     */
+    discovering: boolean;
+  }
+  interface BluetoothAdapterStateData extends ErrMsgResponse {
+    /**
+     * 蓝牙适配器信息
+     */
+    adapterState: BluetoothAdapterState;
+  }
+  interface GetBluetoothAdapterStateOptions extends BaseOptions {
+    success(res: BluetoothAdapterStateData): void;
+  }
+  /**
+   * 获取本机蓝牙适配器状态
+   * @version 1.1.0
+   */
+  function getBluetoothAdapterState(options: GetBluetoothAdapterStateOptions): void;
+  /**
+   * 监听蓝牙适配器状态变化事件
+   * @version 1.1.0
+   */
+  function onBluetoothAdapterStateChange(callback: (res: BluetoothAdapterState) => void): void;
+  interface StartBluetoothDevicesDiscoveryOptions extends BaseOptions {
+    success(res: ErrMsgResponse): void;
+    /**
+     * 蓝牙设备主 service 的 uuid 列表
+     * 某些蓝牙设备会广播自己的主 service 的 uuid。如果这里传入该数组，那么根据该 uuid 列表，只搜索有这个主服务的设备。
+     */
+    services?: string[];
+  }
+  /**
+   * 开始搜寻附近的蓝牙外围设备。
+   * 注意，该操作比较耗费系统资源，请在搜索并连接到设备后调用 stop 方法停止搜索。
+   * @example
+   * // 以微信硬件平台的蓝牙智能灯为例，主服务的 UUID 是 FEE7。传入这个参数，只搜索主服务 UUID 为 FEE7 的设备
+   * wx.startBluetoothDevicesDiscovery({
+   *   services: ['FEE7'],
+   *   success: function (res) {
+   *     console.log(res)
+   *   }
+   * });
+   */
+  function startBluetoothDevicesDiscovery(options: StartBluetoothDevicesDiscoveryOptions): void;
+  interface StopBluetoothDevicesDiscoveryOptions extends BaseOptions {
+    success(res: ErrMsgResponse): void;
+  }
+  /**
+   * 停止搜寻附近的蓝牙外围设备。请在确保找到需要连接的设备后调用该方法停止搜索。
+   * @version 1.1.0
+   */
+  function stopBluetoothDevicesDiscovery(options: StopBluetoothDevicesDiscoveryOptions): void;
+  /**
+   * 蓝牙设备信息
+   */
+  interface BluetoothDevice {
+    /**
+     * 蓝牙设备名称，某些设备可能没有
+     */
+    name: string;
+    /**
+     * 用于区分设备的 id
+     */
+    deviceId: string;
+    /**
+     * int 当前蓝牙设备的信号强度
+     */
+    RSSI: number;
+    /**
+     * 当前蓝牙设备的广播内容
+     */
+    advertisData: ArrayBuffer;
+  }
+  interface GetBluetoothDevicesOptions extends BaseOptions {
+    success(res: {
+      devices: BluetoothDevice[];
+    } & ErrMsgResponse): void;
+  }
+  /**
+   * 获取所有已发现的蓝牙设备，包括已经和本机处于连接状态的设备
+   */
+  function getBluetoothDevices(options: GetBluetoothDevicesOptions): void;
+  /**
+   * 监听寻找到新设备的事件
+   * @version 1.1.0
+   */
+  function onBluetoothDeviceFound(callback: (res: {
+    devices: BluetoothDevice[]
+  }) => void): void;
+  interface GetConnectedBluetoothDevicesOptions extends BaseOptions {
+    services: string[];
+    success(res: {
+      devices: BluetoothDevice[]
+    } & ErrMsgResponse): void;
+  }
+  /**
+   * 根据 uuid 获取处于已连接状态的设备
+   * @version 1.1.0
+   */
+  function getConnectedBluetoothDevices(options: GetConnectedBluetoothDevicesOptions): void;
+  interface CreateBLEConnectionOptions extends BaseOptions {
+    success(res: ErrMsgResponse): void;
+  }
+  /**
+   * 低功耗蓝牙接口
+   * @version 1.1.0
+   */
+  function createBLEConnection(options: CreateBLEConnectionOptions): void;
+  interface CloseBLEConnectionOptions extends BaseOptions {
+    /**
+     * 蓝牙设备 id，参考 getDevices 接口
+     */
+    deviceId: string;
+    success(res: ErrMsgResponse): void;
+  }
+  /**
+   * 断开与低功耗蓝牙设备的连接
+   * @version 1.1.0
+   */
+  function closeBLEConnection(options: CloseBLEConnectionOptions): void;
+  interface GetBLEDeviceServicesOptions extends BaseOptions {
+    /**
+     * 蓝牙设备 id，参考 getDevices 接口
+     */
+    deviceId: string;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success(res: {
+      services: Array<{
+        uuid: string;
+        isPrimary: boolean;
+      }>;
+    } & ErrMsgResponse): void;
+  }
+  /**
+   * 获取蓝牙设备所有 service（服务）
+   */
+  function getBLEDeviceServices(options: GetBLEDeviceServicesOptions): void;
+  interface GetBLEDeviceCharacteristicsOptions extends BaseOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId: string;
+    /**
+     * 蓝牙服务 uuid
+     */
+    serviceId: string;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success(res: {
+      characteristics: Array<{
+        uuid: string;
+        properties: Array<{
+          /**
+           * 该特征值是否支持 read 操作
+           */
+          read: boolean;
+          /**
+           * 该特征值是否支持 write 操作
+           */
+          write: boolean;
+          /**
+           * 该特征值是否支持 notify 操作
+           */
+          notify: boolean;
+          /**
+           * 该特征值是否支持 indicate 操作
+           */
+          indicate: boolean;
+        }>;
+      }>;
+    } & ErrMsgResponse): void;
+  }
+  /**
+   * 获取蓝牙设备所有 characteristic（特征值）
+   */
+  function getBLEDeviceCharacteristics(options: GetBLEDeviceCharacteristicsOptions): void;
+  interface BLECharacteristicValueOptions extends BaseOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId: string;
+    /**
+     * 蓝牙特征值对应服务的 uuid
+     */
+    serviceId: string;
+    /**
+     * 蓝牙特征值的 uuid
+     */
+    characteristicId: string;
+    success(res: {
+      characteristic: {
+        /**
+         * 蓝牙设备特征值的 uuid
+         */
+        characteristicId: string;
+        /**
+         * 蓝牙设备特征值对应服务的 uuid
+         */
+        serviceId: string;
+        /**
+         * 蓝牙设备特征值对应的二进制值
+         */
+        value: ArrayBuffer;
+      };
+    } & ErrMsgResponse): void;
+  }
+  /**
+   * 读取低功耗蓝牙设备的特征值的二进制数据值。
+   * 注意：必须设备的特征值支持read才可以成功调用，具体参照 characteristic 的 properties 属性
+   */
+  function readBLECharacteristicValue(options: BLECharacteristicValueOptions): void;
+  /**
+   * 向低功耗蓝牙设备特征值中写入二进制数据。
+   * 注意：必须设备的特征值支持write才可以成功调用，具体参照 characteristic 的 properties 属性
+   * tips: 并行调用多次读写接口存在读写失败的可能性
+   */
+  function writeBLECharacteristicValue(options: BLECharacteristicValueOptions): void;
+  /**
+   * 启用低功耗蓝牙设备特征值变化时的 notify 功能。
+   * 注意：必须设备的特征值支持notify才可以成功调用，具体参照 characteristic 的 properties 属性
+   * 另外，必须先启用notify才能监听到设备 characteristicValueChange 事件
+   */
+  function notifyBLECharacteristicValueChanged(options: BLECharacteristicValueOptions): void;
+  /**
+   * 监听低功耗蓝牙连接的错误事件，包括设备丢失，连接异常断开等等。
+   */
+  function onBLEConnectionStateChanged(callback: (res: {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId: string;
+    /**
+     * 连接目前的状态
+     */
+    connected: boolean;
+  }) => void): void;
+  /**
+   * 监听低功耗蓝牙设备的特征值变化。必须先启用notify接口才能接收到设备推送的notification。
+   */
+  function onBLECharacteristicValueChange(callback: (
+    res: {
+      /**
+       * 蓝牙设备 id，参考 device 对象
+       */
+      deviceId: string;
+      /**
+       * 特征值所属服务 uuid
+       */
+      serviceId: string;
+      /**
+       * 特征值 uuid
+       */
+      characteristicId: string;
+      /**
+       * 特征值最新的值
+       */
+      value: ArrayBuffer;
+    }
+  ) => void): void;
+  // #region iBeacon
+  interface BeaconDiscoveryOptions extends BaseOptions {
+    /**
+     * iBeacon设备广播的 uuids
+     */
+    uuids: string | string[];
+    success?(errMsg: string): void;
+  }
+  /**
+   * 开始搜索附近的iBeacon设备
+   * @version 1.2.0
+   */
+  function startBeaconDiscovery(options: BeaconDiscoveryOptions): void;
+  /**
+   * 停止搜索附近的iBeacon设备
+   * @version 1.2.0
+   */
+  function stopBeaconDiscovery(options: BeaconDiscoveryOptions): void;
+  interface Beacon {
+    /** iBeacon 设备广播的 uuid */
+    uuid: string;
+    /** iBeacon 设备的主 id */
+    major: string;
+    /** iBeacon 设备的次 id */
+    minor: string;
+    /** 表示设备距离的枚举值 */
+    proximity: number;
+    /** iBeacon 设备的距离 */
+    accuracy: number;
+    /** 表示设备的信号强度 */
+    rssi: number;
+  }
+  interface GetBeaconsSuccess {
+    beacons: Beacon[];
+    errMsg: string;
+  }
+  interface GetBeaconsOptions extends BaseOptions {
+    success?(options: GetBeaconsSuccess): void;
+  }
+  /**
+   * 获取所有已搜索到的iBeacon设备
+   * @version 1.2.0
+   */
+  function getBeacons(options: GetBeaconsOptions): void;
+  /**
+   * 监听 iBeacon 设备的更新事件
+   * @version 1.2.0
+   */
+  function onBeaconUpdate(callback?: (beacons: Beacon[]) => void): void;
+  /**
+   * 监听 iBeacon 服务的状态变化
+   * @version 1.2.0
+   */
+  function onBeaconServiceChange(callback?: (available?: boolean, discovering?: boolean) => void): void;
+  // #endregion
+  // 设备-----屏幕亮度
+  interface SetScreenBrightnessOptions {
+    /** 屏幕亮度值，范围 0~1，0 最暗，1 最亮 */
+    value: number;
+  }
+  /**
+   * 设置屏幕亮度
+   * @version 1.2.0
+   */
+  function setScreenBrightness(options: SetScreenBrightnessOptions): void;
+  interface GetScreenBrightnessOptions extends BaseOptions {
+    /** 屏幕亮度值，范围 0~1，0 最暗，1 最亮 */
+    success(value: number): void;
+  }
+  /**
+   * 获取屏幕亮度
+   * @version 1.2.0
+   */
+  function getScreenBrightness(options?: GetScreenBrightnessOptions): void;
+  interface SetKeepScreenOnOptions extends BaseOptions {
+    /** 是否保持屏幕常亮 */
+    keepScreenOn: boolean;
+    success?(errMsg: string): void;
+  }
+  /**
+   * 设置是否保持常亮状态。
+   * 仅在当前小程序生效，离开小程序后设置失效。
+   * @version 1.4.0
+   */
+  function setKeepScreenOn(options?: SetKeepScreenOnOptions): void;
+  // 设备-----震动
+  /**
+   * 使手机发生较长时间的振动（400ms）
+   * @version 1.2.0
+   */
+  function vibrateLong(options?: BaseOptions): void;
+  /**
+   * 使手机发生较短时间的振动（15ms）
+   * @version 1.2.0
+   */
+  function vibrateShort(options?: BaseOptions): void;
+  /**
+   * 监听用户主动截屏事件，用户使用系统截屏按键截屏时触发此事件
+   * @version 1.4.0
+   */
+  function onUserCaptureScreen(callback?: (res: any) => void): void;
+  // 设备-----手机联系人
+  interface PhoneContact extends BaseOptions {
+    /** 头像本地文件路径 */
+    photoFilePath?: string;
+    /** 昵称 */
+    nickName?: string;
+    /** 姓氏 */
+    lastName?: string;
+    /** 中间名 */
+    middleName?: string;
+    /** 名字 */
+    firstName: string;
+    /** 备注 */
+    remark?: string;
+    /** 手机号 */
+    mobilePhoneNumber?: string;
+    /** 微信号 */
+    weChatNumber?: string;
+    /** 联系地址国家 */
+    addressCountry?: string;
+    /** 联系地址省份 */
+    addressState?: string;
+    /** 联系地址城市 */
+    addressCity?: string;
+    /** 联系地址街道 */
+    addressStreet?: string;
+    /** 联系地址邮政编码 */
+    addressPostalCode?: string;
+    /** 公司 */
+    organization?: string;
+    /** 职位 */
+    title?: string;
+    /** 工作传真 */
+    workFaxNumber?: string;
+    /** 工作电话 */
+    workPhoneNumber?: string;
+    /** 公司电话 */
+    hostNumber?: string;
+    /** 电子邮件 */
+    email?: string;
+    /** 网站 */
+    url?: string;
+    /** 工作地址国家 */
+    workAddressCountry?: string;
+    /** 工作地址省份 */
+    workAddressState?: string;
+    /** 工作地址城市 */
+    workAddressCity?: string;
+    /** 工作地址街道 */
+    workAddressStreet?: string;
+    /** 工作地址邮政编码 */
+    workAddressPostalCode?: string;
+    /** 住宅传真 */
+    homeFaxNumber?: string;
+    /** 住宅电话 */
+    homePhoneNumber?: string;
+    /** 住宅地址国家 */
+    homeAddressCountry?: string;
+    /** 住宅地址省份 */
+    homeAddressState?: string;
+    /** 住宅地址城市 */
+    homeAddressCity?: string;
+    /** 住宅地址街道 */
+    homeAddressStreet?: string;
+    /** 住宅地址邮政编码 */
+    homeAddressPostalCode?: string;
+  }
+  /**
+   * 增加 手机联系人
+   * 调用后，用户可以选择将该表单以“新增联系人”或“添加到已有联系人”的方式
+   * 写入手机系统通讯录
+   * 完成手机通讯录联系人和联系方式的增加。
+   * @version 1.2.0
+   */
+  function addPhoneContact(options: PhoneContact): void;
+  // 设备-----Wi-Fi
+  /**
+   * 初始化 Wi-Fi 模块。
+   * @version 1.6.0
+   */
+  function startWifi(options?: BaseOptions): void;
+  /**
+   * 关闭 Wi-Fi 模块。
+   * @version 1.6.0
+   */
+  function stopWifi(options?: BaseOptions): void;
+  interface ConnectWiFiOptions extends BaseOptions {
+    /** Wi-Fi 设备ssid */
+    SSID: string;
+    /** Wi-Fi 设备bssid */
+    BSSID: string;
+    /** Wi-Fi 设备密码 */
+    password?: string;
+  }
+  /**
+   * 连接 Wi-Fi。
+   * 若已知 Wi-Fi 信息，可以直接利用该接口连接。
+   * 仅 Android 与 iOS 11 以上版本支持。
+   * @version 1.6.0
+   */
+  function connectWifi(options?: ConnectWiFiOptions): void;
+  /**
+   * 请求获取 Wi-Fi 列表
+   * 在 onGetWifiList 注册的回调中返回 wifiList 数据。
+   * iOS 将跳转到系统的 Wi-Fi 界面，Android 不会跳转。
+   * iOS 11.0 及 iOS 11.1 两个版本因系统问题，该方法失效。但在 iOS 11.2 中已修复。
+   * @version 1.6.0
+   */
+  function getWifiList(options?: BaseOptions): void;
+  interface WiFi {
+    /** Wi-Fi 的SSID */
+    SSID: string;
+    /** Wi-Fi 的BSSID */
+    BSSID: string;
+    /** Wi-Fi 是否安全 */
+    secure: boolean;
+    /** Wi-Fi 信号强度 */
+    signalStrength: number;
+  }
+  interface GetWifiListOptions {
+    /** Wi-Fi 列表数据 */
+    wifiList: WiFi[];
+  }
+  /**
+   * 监听在获取到 Wi-Fi 列表数据时的事件，在回调中将返回 wifiList。
+   * @version 1.6.0
+   */
+  function onGetWifiList(callback?: (res: GetWifiListOptions) => void): void;
+  interface SetWifiList {
+    /** Wi-Fi 设备ssid */
+    SSID: string;
+    /** Wi-Fi 设备bssid */
+    BSSID: string;
+    /** Wi-Fi 设备密码 */
+    password: string;
+  }
+  interface SetWifiListOptions extends BaseOptions {
+    /** 提供预设的 Wi-Fi 信息列表 */
+    wifiList: SetWifiList[];
+  }
+  /**
+   * iOS特有接口 在 onGetWifiList 回调后，利用接口设置 wifiList 中 AP 的相关信息。
+   * 注意：
+   * + 该接口只能在 onGetWifiList 回调之后才能调用。
+   * + 此时客户端会挂起，等待小程序设置 Wi-Fi 信息，请务必尽快调用该接口，若无数据请传入一个空数组。
+   * + 有可能随着周边 Wi-Fi 列表的刷新，单个流程内收到多次带有存在重复的 Wi-Fi 列表的回调。
+   * @version 1.6.0
+   */
+  function setWifiList(options: SetWifiListOptions): void;
+  /**
+   * 监听连接上 Wi-Fi 的事件。
+   * @version 1.6.0
+   */
+  function onWifiConnected(callback?: (wifi: WiFi) => void): void;
+  interface GetConnectedWifiOptions extends BaseOptions {
+    success(wifi: WiFi): void;
+  }
+  /**
+   * 获取已连接中的 Wi-Fi 信息
+   * @version 1.6.0
+   */
+  function getConnectedWifi(options?: GetConnectedWifiOptions): void;
+  // #endregion
+  // #region 界面API列表
+  interface ToastOptions extends BaseOptions {
+    /**
+     * 提示的内容
+     */
+    title: string;
+    /**
+     * 图标，只支持"success"、"loading"
+     */
+    icon?: 'success' | 'loading';
+    /**
+     * 自定义图标的本地路径，image 的优先级高于 icon
+     */
+    image?: string;
+    /**
+     * 提示的延迟时间，单位毫秒，默认：1500
+     */
+    duration?: number;
+    /**
+     * 是否显示透明蒙层，防止触摸穿透，默认：false
+     */
+    mask?: boolean;
+  }
+  /**
+   * 显示消息提示框
+   */
+  function showToast(options: ToastOptions): void;
+  function hideToast(): void;
+  interface LoadingOptions extends BaseOptions {
+    /**
+     * 提示的内容
+     */
+    title: string;
+    /**
+     * 是否显示透明蒙层，防止触摸穿透，默认：false
+     */
+    mask?: boolean;
+  }
+  /**
+   * 显示 loading 提示框, 需主动调用 wx.hideLoading 才能关闭提示框
+   */
+  function showLoading(options: LoadingOptions): void;
+  /**
+   * 隐藏消息提示框
+   */
+  function hideLoading(): void;
+  interface ModalOptions extends BaseOptions {
+    /**
+     * 提示的标题
+     */
+    title: string;
+    /**
+     * 提示的内容
+     */
+    content: string;
+    /**
+     * 是否显示取消按钮，默认为 true
+     */
+    showCancel?: boolean;
+    /**
+     * 取消按钮的文字，默认为"取消"，最多 4 个字符
+     */
+    cancelText?: string;
+    /**
+     * 取消按钮的文字颜色，默认为"#000000"
+     */
+    cancelColor?: string;
+    /**
+     * 确定按钮的文字，默认为"确定"，最多 4 个字符
+     */
+    confirmText?: string;
+    /**
+     * 确定按钮的文字颜色，默认为"#3CC51F"
+     */
+    confirmColor?: string;
+    success?(res: {
+      /**
+       * 为 true 时，表示用户点击了确定按钮
+       */
+      confirm: boolean;
+      /**
+       * 为 true 时，表示用户点击了取消（用于 Android 系统区分点击蒙层关闭还是点击取消按钮关闭）
+       */
+      cancel: boolean;
+    }): void;
+  }
+  /**
+   * 显示模态弹窗
+   */
+  function showModal(options: ModalOptions): void;
+  interface ActionSheetOptions extends BaseOptions {
+    /**
+     * 按钮的文字数组，数组长度最大为6个
+     */
+    itemList: string[];
+    /**
+     * 按钮的文字颜色，默认为"#000000"
+     */
+    itemColor?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?(res: {
+      /**
+       * 用户点击的按钮，从上到下的顺序，从0开始
+       */
+      tapIndex: number;
+    }): void;
+  }
+  /**
+   * 显示操作菜单
+   */
+  function showActionSheet(options: ActionSheetOptions): void;
+  // 界面-----设置置顶信息
+  interface SetTopBarTextOptions extends BaseOptions {
+    /**
+     * 置顶栏文字内容
+     */
+    text: string;
+  }
+  /**
+   * 动态设置置顶栏文字内容
+   * 只有当前小程序被置顶时能生效，如果当前小程序没有被置顶，也能调用成功，但是不会立即生效
+   * 只有在用户将这个小程序置顶后才换上设置的文字内容。
+   * 注意：调用成功后，需间隔 5s 才能再次调用此接口，如果在 5s 内再次调用此接口，会回调
+   * fail，errMsg："setTopBarText: fail invoke too frequently"
+   * @version 1.4.3
+   */
+  function setTopBarText(options?: SetTopBarTextOptions): void;
+  // 界面-----设置导航条
+  interface SetNavigationBarTitleOptions extends BaseOptions {
+    /** 页面标题 */
+    title: string;
+  }
+  /**
+   * 动态设置当前页面的标题。
+   * @version 1.4.3
+   */
+  function setNavigationBarTitle(options: SetNavigationBarTitleOptions): void;
+  /**
+   * 在当前页面显示导航条加载动画。
+   * @version 1.4.3
+   */
+  function showNavigationBarLoading(): void;
+  /**
+   * 隐藏导航条加载动画。
+   * @version 1.4.3
+   */
+  function hideNavigationBarLoading(): void;
+  interface SetTabBarBadgeOptions extends BaseOptions {
+    /**
+     * tabBar的哪一项，从左边算起
+     */
+    index: number;
+    /**
+     * 显示的文本，超过 3 个字符则显示成“…”
+     */
+    text: string;
+  }
+  // 界面-----设置tabBar
+  /**
+   * 为 tabBar 某一项的右上角添加文本
+   * @version 1.9.0
+   */
+  function setTabBarBadge(options: SetTabBarBadgeOptions): void;
+  interface TabBarBadgeOptions extends BaseOptions {
+    /**
+     * tabBar的哪一项，从左边算起
+     */
+    index: number;
+  }
+  /**
+   * 移除 tabBar 某一项右上角的文本
+   * @version 1.9.0
+   */
+  function removeTabBarBadge(options: TabBarBadgeOptions): void;
+  /**
+   * 显示 tabBar 某一项的右上角的红点
+   * @version 1.9.0
+   */
+  function showTabBarRedDot(option: TabBarBadgeOptions): void;
+  /**
+   * 隐藏 tabBar 某一项的右上角的红点
+   * @version 1.9.0
+   */
+  function hideTabBarRedDot(option: TabBarBadgeOptions): void;
+  interface SetTabBarStyleOptions extends BaseOptions {
+    /** tab 上的文字默认颜色 */
+    color: string;
+    /** tab 上的文字选中时的颜色 */
+    selectedColor: string;
+    /** tab 的背景色 */
+    backgroundColor: string;
+    /** tabbar上边框的颜色， 仅支持 black/white */
+    borderStyle: string;
+  }
+  /**
+   * 动态设置 tabBar 的整体样式
+   * @version 1.9.0
+   */
+  function setTabBarStyle(options: SetTabBarStyleOptions): void;
+  interface SetTabBarItemOptions extends BaseOptions {
+    /** tabBar 的哪一项，从左边算起 */
+    index: number;
+    /** tab 上按钮文字 */
+    text?: string;
+    /**
+     * 图片路径, icon 大小限制为40kb
+     * 建议尺寸为 81px * 81px
+     * 当 postion 为 top 时，此参数无效，不支持网络图片
+     */
+    iconPath?: string;
+    /**
+     * 选中时的图片路径
+     * icon 大小限制为40kb，建议尺寸为 81px * 81px
+     * 当 postion 为 top
+     */
+    selectedIconPath?: string;
+  }
+  /**
+   * 动态设置 tabBar 某一项的内容
+   * @version 1.9.0
+   */
+  function setTabBarItem(options: SetTabBarItemOptions): void;
+  interface ShowTabBarOptions extends BaseOptions {
+    /** 是否需要动画效果，默认无 */
+    aniamtion?: boolean;
+  }
+  /**
+   * 显示 tabBar
+   * @version 1.9.0
+   */
+  function showTabBar(options: ShowTabBarOptions): void;
+  /**
+   * 隐藏 tabBar
+   * @version 1.9.0
+   */
+  function hideTabBar(options: ShowTabBarOptions): void;
+  // 界面-----导航
+  interface NavigateToOptions extends BaseOptions {
+    /** 需要跳转的应用内页面的路径 */
+    url: string;
+  }
+  /**
+   * 保留当前页面，跳转到应用内的某个页面，使用wx.navigateBack可以返回到原页面。
+   *
+   * 注意：为了不让用户在使用小程序时造成困扰，
+   * 我们规定页面路径只能是五层，请尽量避免多层级的交互方式。
+   */
+  function navigateTo(options: NavigateToOptions): void;
+  interface SwitchTabOptions extends BaseOptions {
+    /**
+     * 需要跳转的 tabBar 页面的路径
+     * （需在 app.json 的 tabBar 字段定义的页面），路径后不能带参数
+     */
+    url: string;
+  }
+  /**
+   * 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面
+   */
+  function switchTab(options: SwitchTabOptions): void;
+  interface RedirectToOptions extends BaseOptions {
+    /** 需要跳转的应用内页面的路径 */
+    url: string;
+  }
+  /**
+   * 关闭当前页面，跳转到应用内的某个页面。
+   */
+  function redirectTo(options: RedirectToOptions): void;
+  interface NavigateBackOptions {
+    /** 返回的页面数，如果 delta 大于现有页面数，则返回到首页。 */
+    delta: number;
+  }
+  /**
+   * 关闭当前页面，回退前一页面。
+   */
+  function navigateBack(options?: NavigateBackOptions): void;
+  interface ReLaunchOptions extends BaseOptions {
+    /**
+     * 需要跳转的应用内页面路径 , 路径后可以带参数。
+     * 参数与路径之间使用?分隔，参数键与参数值用=相连，不同参数用&分隔
+     * 如 'path?key=value&key2=value2'，如果跳转的页面路径是 tabBar 页面则不能带参数
+     */
+    url: string;
+  }
+  /**
+   * 关闭所有页面，打开到应用内的某个页面。
+   * @version 1.1.0
+   */
+  function reLaunch(options?: ReLaunchOptions): void;
+  // 界面-----动画
+  type TimingFunction = 'linear' | 'ease' | 'ease-in' | 'ease-in-out' | 'ease-out' | 'step-start' | 'step-end';
+  interface CreateAnimationOptions {
+    /** 动画持续时间，单位ms，默认值 400 */
+    duration?: number;
+    /** 定义动画的效果，默认值"linear"，有效值："linear","ease","ease-in","ease-in-out","ease-out","step-start","step-end" */
+    timingFunction?: TimingFunction;
+    /** 动画持续时间，单位 ms，默认值 0 */
+    delay?: number;
+    /** 设置transform-origin，默认为"50% 50% 0" */
+    transformOrigin?: string;
+  }
+  interface Animator {
+    actions: AnimationAction[];
+  }
+  interface AnimationAction {
+    animates: Animate[];
+    option: AnimationActionOption;
+  }
+  interface AnimationActionOption {
+    transformOrigin: string;
+    transition: AnimationTransition;
+  }
+  interface AnimationTransition {
+    delay: number;
+    duration: number;
+    timingFunction: TimingFunction;
+  }
+  interface Animate {
+    type: string;
+    args: any[];
+  }
+  /**
+   * 创建一个动画实例animation。调用实例的方法来描述动画。
+   * 最后通过动画实例的export方法导出动画数据传递给组件的animation属性。
+   *
+   * 注意: export 方法每次调用后会清掉之前的动画操作
+   */
+  function createAnimation(options?: CreateAnimationOptions): Animation;
+  /** 动画实例可以调用以下方法来描述动画，调用结束后会返回自身，支持链式调用的写法。 */
+  interface Animation {
+    /**
+     * 调用动画操作方法后要调用 step() 来表示一组动画完成，
+     * 可以在一组动画中调用任意多个动画方法，
+     * 一组动画中的所有动画会同时开始，
+     * 一组动画完成后才会进行下一组动画。
+     * @param options 指定当前组动画的配置
+     */
+    step(options?: CreateAnimationOptions): void;
+    /**
+     * 导出动画操作
+     *
+     * 注意: export 方法每次调用后会清掉之前的动画操作
+     */
+    export(): Animator;
+    /** 透明度，参数范围 0~1 */
+    opacity(value: number): Animation;
+    /** 颜色值 */
+    backgroundColor(color: string): Animation;
+    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+    width(length: number): Animation;
+    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+    height(length: number): Animation;
+    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+    top(length: number): Animation;
+    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+    left(length: number): Animation;
+    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+    bottom(length: number): Animation;
+    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+    right(length: number): Animation;
+    /** deg的范围-180~180，从原点顺时针旋转一个deg角度 */
+    rotate(deg: number): Animation;
+    /** deg的范围-180~180，在X轴旋转一个deg角度 */
+    rotateX(deg: number): Animation;
+    /** deg的范围-180~180，在Y轴旋转一个deg角度 */
+    rotateY(deg: number): Animation;
+    /** deg的范围-180~180，在Z轴旋转一个deg角度 */
+    rotateZ(deg: number): Animation;
+    /** 同transform-function rotate3d */
+    rotate3d(x: number, y: number, z: number, deg: number): Animation;
+    /**
+     * 一个参数时，表示在X轴、Y轴同时缩放sx倍数；
+     * 两个参数时表示在X轴缩放sx倍数，在Y轴缩放sy倍数
+     */
+    scale(sx: number, sy?: number): Animation;
+    /** 在X轴缩放sx倍数 */
+    scaleX(sx: number): Animation;
+    /** 在Y轴缩放sy倍数 */
+    scaleY(sy: number): Animation;
+    /** 在Z轴缩放sy倍数 */
+    scaleZ(sz: number): Animation;
+    /** 在X轴缩放sx倍数，在Y轴缩放sy倍数，在Z轴缩放sz倍数 */
+    scale3d(sx: number, sy: number, sz: number): Animation;
+    /**
+     * 一个参数时，表示在X轴偏移tx，单位px；
+     * 两个参数时，表示在X轴偏移tx，在Y轴偏移ty，单位px。
+     */
+    translate(tx: number, ty?: number): Animation;
+    /**
+     * 在X轴偏移tx，单位px
+     */
+    translateX(tx: number): Animation;
+    /**
+     * 在Y轴偏移tx，单位px
+     */
+    translateY(ty: number): Animation;
+    /**
+     * 在Z轴偏移tx，单位px
+     */
+    translateZ(tz: number): Animation;
+    /**
+     * 在X轴偏移tx，在Y轴偏移ty，在Z轴偏移tz，单位px
+     */
+    translate3d(tx: number, ty: number, tz: number): Animation;
+    /**
+     * 参数范围-180~180；
+     * 一个参数时，Y轴坐标不变，X轴坐标延顺时针倾斜ax度；
+     * 两个参数时，分别在X轴倾斜ax度，在Y轴倾斜ay度
+     */
+    skew(ax: number, ay?: number): Animation;
+    /** 参数范围-180~180；Y轴坐标不变，X轴坐标延顺时针倾斜ax度 */
+    skewX(ax: number): Animation;
+    /** 参数范围-180~180；X轴坐标不变，Y轴坐标延顺时针倾斜ay度 */
+    skewY(ay: number): Animation;
+    /**
+     * 同transform-function matrix
+     */
+    matrix(a: number, b: number, c: number, d: number, tx: number, ty: number): Animation;
+    /** 同transform-function matrix3d */
+    matrix3d(
+      a1: number, b1: number, c1: number, d1: number, a2: number,
+      b2: number, c2: number, d2: number, a3: number, b3: number,
+      c3: number, d3: number, a4: number, b4: number, c4: number,
+      d4: number
+    ): Animation;
+  }
+  // #region 位置API
+  interface PageScrollToOptions {
+    /** 滚动到页面的目标位置（单位px */
+    scrollTop: number;
+    /** 滚动动画的时长，默认300ms，单位 ms */
+    duration?: number;
+  }
+  function pageScrollTo(options: PageScrollToOptions): void;
+  /**
+   * 返回一个SelectorQuery对象实例。
+   * 可以在这个实例上使用select等方法选择节点，并使用boundingClientRect等方法选择需要查询的信息。
+   * @version 1.4.0
+   */
+  function createSelectorQuery(): SelectorQuery;
+  interface NodesRefRect {
+    /** 节点的ID */
+    id: string;
+    /** 节点的dataset */
+    dataset: any;
+    /** 节点的左边界坐标 */
+    left: number;
+    /** 节点的右边界坐标 */
+    right: number;
+    /** 节点的上边界坐标 */
+    top: number;
+    /** 节点的下边界坐标 */
+    bottom: number;
+    /** 节点的宽度 */
+    width: number;
+    /** 节点的高度 */
+    height: number;
+  }
+  interface NodeRefOffset {
+    /** 节点的ID */
+    id: string;
+    /** 节点的dataset */
+    dataset: any;
+    /** 节点的水平滚动位置 */
+    scrollLeft: number;
+    /** 节点的竖直滚动位置 */
+    scrollTop: number;
+  }
+  interface NodeRefFieldsOptions {
+    /** 是否返回节点id */
+    id?: true;
+    /** 是否返回节点dataset */
+    dataset?: true;
+    /** 是否返回节点布局位置（left right top bottom */
+    rect?: true;
+    /** 是否返回节点尺寸（width height） */
+    size?: true;
+    /** 是否返回节点的 scrollLeft scrollTop ，节点必须是scroll-view或者viewport */
+    scrollOffset?: true;
+    /**
+     * 指定属性名列表
+     * 返回节点对应属性名的当前属性值（只能获得组件文档中标注的常规属性值， id class style 和事件绑定的属性值不可获取
+     */
+    properties?: string[];
+  }
+  interface NodeRefFieldsValue {
+    id: {
+      id: boolean;
+    };
+    dataset: {
+      dataset: string;
+    };
+    rect: {
+      left: number;
+      right: number;
+      top: number;
+      bottom: number;
+    };
+    size: {
+      width: number;
+      height: number;
+    };
+    scrollOffset: {
+      scrollLeft: number;
+      scrollTop: number;
+    };
+    properties: {
+      properties: any;
+    };
+  }
+  interface NodesRef {
+    /**
+     * 添加节点的布局位置的查询请求，相对于显示区域，以像素为单位。
+     * 其功能类似于DOM的getBoundingClientRect。
+     * 返回值是nodesRef对应的selectorQuery。
+     * 返回的节点信息中，每个节点的位置用
+     * left、right、top、bottom、width、height字段描述。
+     * 如果提供了callback回调函数，在执行selectQuery的exec方法后
+     * 节点信息会在callback中返回。
+     */
+    boundingClientRect<T extends NodesRefRect | NodesRefRect[]>(callback?: (rect: T) => void): SelectorQuery;
+    /**
+     * 添加节点的滚动位置查询请求，以像素为单位。
+     * 节点必须是scroll-view或者viewport。
+     * 返回值是nodesRef对应的selectorQuery。
+     * 返回的节点信息中，每个节点的滚动位置用scrollLeft、scrollHeight字段描述。
+     * 如果提供了callback回调函数，在执行selectQuery的exec方法后，节点信息会在callback中返回。
+     */
+    scrollOffset(callback?: (rect: NodeRefOffset) => void): SelectorQuery;
+    /**
+     * 获取节点的相关信息，需要获取的字段在fields中指定。
+     * 返回值是nodesRef对应的selectorQuery。
+     */
+    fields(fields: NodeRefFieldsOptions, callback?: (result: any) => void): SelectorQuery;
+  }
+  /**
+   * SelectorQuery对象实例
+   */
+  interface SelectorQuery {
+    /**
+     * 将选择器的选取范围更改为自定义组件component内
+     * （初始时，选择器仅选取页面范围的节点，不会选取任何自定义组件中的节点
+     * @version 1.6.0
+     */
+    in(component: Component<object>): SelectorQuery;
+    /**
+     * 在当前页面下选择第一个匹配选择器selector的节点，返回一个NodesRef对象实例，可以用于获取节点信息。
+     * selector类似于CSS的选择器，但仅支持下列语法。
+     * + ID选择器：#the-id
+     * + class选择器（可以连续指定多个）：.a-class.another-class
+     * + 子元素选择器：.the-parent > .the-child
+     * + 后代选择器：.the-ancestor .the-descendant
+     * + 跨自定义组件的后代选择器：.the-ancestor >>> .the-descendant
+     * + 多选择器的并集：#a-node, .some-other-nodes
+     */
+    select(selector: string): NodesRef;
+    /**
+     * 在当前页面下选择匹配选择器selector的节点，返回一个NodesRef对象实例。
+     * 与selectorQuery.selectNode(selector)不同的是，它选择所有匹配选择器的节点。
+     */
+    selectAll(selector: string): NodesRef;
+    /**
+     * 选择显示区域，可用于获取显示区域的尺寸、滚动位置等信息
+     * 返回一个NodesRef对象实例。
+     */
+    selectViewport(): NodesRef;
+    /**
+     * 执行所有的请求
+     * 请求结果按请求次序构成数组，在callback的第一个参数中返回。
+     */
+    exec(callback?: (result: any[]) => void): void;
+  }
+  // #endregion
+  // 界面-----绘图
+  interface CanvasAction {
+    method: string;
+    data: CanvasAction[] | Array<number | string>;
+  }
+  type LineCapType = 'butt' | 'round' | 'square';
+  type LineJoinType = 'bevel' | 'round' | 'miter';
+  /**
+   * context只是一个记录方法调用的容器，用于生成记录绘制行为的actions数组。context跟<canvas/>不存在对应关系，一个context生成画布的绘制动作数组可以应用于多个<canvas/>。
+   */
+  interface CanvasContext {
+    /** 获取当前context上存储的绘图动作(不推荐使用) */
+    getActions(): CanvasAction[];
+    /** 清空当前的存储绘图动作(不推荐使用) */
+    clearActions(): void;
+    /**
+     * 对横纵坐标进行缩放
+     * 在调用scale方法后，之后创建的路径其横纵坐标会被缩放。
+     * 多次调用scale，倍数会相乘。
+     *
+     * @param scaleWidth 横坐标缩放的倍数
+     * @param scaleHeight 纵坐标轴缩放的倍数
+     */
+    scale(scaleWidth: number, scaleHeight?: number): void;
+    /**
+     * 对坐标轴进行顺时针旋转
+     * 以原点为中心，原点可以用 translate方法修改。
+     * 顺时针旋转当前坐标轴。多次调用rotate，旋转的角度会叠加。
+     *
+     * @param rotate 旋转角度，以弧度计。
+     */
+    rotate(rotate: number): void;
+    /**
+     * 对坐标原点进行缩放
+     * 对当前坐标系的原点(0, 0)进行变换，默认的坐标系原点为页面左上角。
+     *
+     * @param x 水平坐标平移量
+     * @param y 竖直坐标平移量
+     */
+    translate(x: number, y: number): void;
+    /**
+     * 保存当前的绘图上下文。
+     */
+    save(): void;
+    /**
+     * 恢复之前保存的绘图上下文。
+     */
+    restore(): void;
+    /**
+     * 在给定的矩形区域内，清除画布上的像素
+     * 清除画布上在该矩形区域内的内容。
+     *
+     * @param x 矩形区域左上角的x坐标
+     * @param y 矩形区域左上角的y坐标
+     * @param width 矩形区域的宽度
+     * @param height 矩形区域的高度
+     */
+    clearRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 在画布上绘制被填充的文本
+     *
+     * @param text 在画布上输出的文本
+     * @param x 绘制文本的左上角x坐标位置
+     * @param y 绘制文本的左上角y坐标位置
+     */
+    fillText(text: string, x: number, y: number): void;
+    /**
+     * 用于设置文字的对齐
+     */
+    setTextAlign(align: 'left' | 'center' | 'right'): void;
+    /**
+     * 绘制图像，图像保持原始尺寸。
+     * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
+     * @param dx            源图像的矩形选择框的左上角 X 坐标
+     * @param dy            源图像的矩形选择框的左上角 Y 坐标
+     */
+    drawImage(imageResource: string, dx: number, dy: number): void;
+    /**
+     * 绘制图像，图像保持原始尺寸。
+     * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
+     * @param dx            源图像的矩形选择框的左上角 X 坐标
+     * @param dy            源图像的矩形选择框的左上角 Y 坐标
+     * @param dWidth        源图像的矩形选择框的高度
+     * @param dHeight       源图像的矩形选择框的高度
+     */
+    drawImage(imageResource: string, dx: number, dy: number, dWidth: number, dHeight: number): void;
+    /**
+     * 绘制图像，图像保持原始尺寸。
+     * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
+     * @param sx            图像的左上角在目标canvas上 X 轴的位置
+     * @param sy            图像的左上角在目标canvas上 Y 轴的位置
+     * @param sWidth        在目标画布上绘制图像的宽度，允许对绘制的图像进行缩放
+     * @param sHeight       在目标画布上绘制图像的高度，允许对绘制的图像进行缩放
+     * @param dx            源图像的矩形选择框的左上角 X 坐标
+     * @param dy            源图像的矩形选择框的左上角 Y 坐标
+     * @param dWidth        源图像的矩形选择框的高度
+     * @param dHeight       源图像的矩形选择框的高度
+     * @version 1.9.0
+     */
+    drawImage(imageResource: string, sx: number, sy: number, sWidth: number, sHeight: number, dx: number, dy: number, dWidth: number, dHeight: number): void;
+    /**
+     * 设置全局画笔透明度。
+     * @param alpha 0~1  透明度，0 表示完全透明，1 表示完全不透明
+     */
+    setGlobalAlpha(alpha: number): void;
+    /**
+     * 对当前路径进行填充
+     */
+    fill(): void;
+    /**
+     * 对当前路径进行描边
+     */
+    stroke(): void;
+    /**
+     * 开始创建一个路径，需要调用fill或者stroke才会使用路径进行填充或描边。
+     * Tip: 在最开始的时候相当于调用了一次 beginPath()。
+     * Tip: 同一个路径内的多次setFillStyle、setStrokeStyle、setLineWidth等设置，
+     * 以最后一次设置为准。
+     */
+    beginPath(): void;
+    /**
+     * 关闭一个路径
+     * Tip: 关闭路径会连接起点和终点。
+     * Tip: 如果关闭路径后没有调用 fill() 或者 stroke() 并开启了新的路径，那之前的路径将不会被渲染。
+     */
+    closePath(): void;
+    /**
+     * 把路径移动到画布中的指定点，但不创建线条。
+     *
+     * @param x 目标位置的x坐标
+     * @param y 目标位置的y坐标
+     */
+    moveTo(x: number, y: number): void;
+    /**
+     * 在当前位置添加一个新点，然后在画布中创建从该点到最后指定点的路径。
+     *
+     * @param x 目标位置的x坐标
+     * @param y 目标位置的y坐标
+     */
+    lineTo(x: number, y: number): void;
+    /**
+     * 添加一个矩形路径到当前路径。
+     *
+     * @param x 矩形路径左上角的x坐标
+     * @param y 矩形路径左上角的y坐标
+     * @param width 矩形路径的宽度
+     * @param height 矩形路径的高度
+     */
+    rect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 填充一个矩形。
+     * Tip: 用 setFillStyle() 设置矩形的填充色，如果没设置默认是黑色。
+     * @param x 矩形路径左上角的x坐标
+     * @param y 矩形路径左上角的y坐标
+     * @param width 矩形路径的宽度
+     * @param height 矩形路径的高度
+     *
+     */
+    fillRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 画一个矩形(非填充)。
+     * Tip: 用 setFillStroke() 设置矩形线条的颜色，如果没设置默认是黑色。
+     * @param x 矩形路径左上角的x坐标
+     * @param y 矩形路径左上角的y坐标
+     * @param width 矩形路径的宽度
+     * @param height 矩形路径的高度
+     *
+     */
+    strokeRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 添加一个弧形路径到当前路径，顺时针绘制。
+     *
+     * @param x 圆的x坐标
+     * @param y 圆的y坐标
+     * @param radius 圆的半径
+     * @param startAngle 起始弧度，单位弧度（在3点钟方向）
+     * @param endAngle 终止弧度
+     * @param counterclockwise 指定弧度的方向是逆时针还是顺时针。默认是false，即顺时针。
+     */
+    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void;
+    /**
+     * 创建二次方贝塞尔曲线
+     *
+     * @param cpx 贝塞尔控制点的x坐标
+     * @param cpy 贝塞尔控制点的y坐标
+     * @param x 结束点的x坐标
+     * @param y 结束点的y坐标
+     */
+    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    /**
+     * 创建三次方贝塞尔曲线
+     *
+     * @param cp1x 第一个贝塞尔控制点的 x 坐标
+     * @param cp1y 第一个贝塞尔控制点的 y 坐标
+     * @param cp2x 第二个贝塞尔控制点的 x 坐标
+     * @param cp2y 第二个贝塞尔控制点的 y 坐标
+     * @param x 结束点的x坐标
+     * @param y 结束点的y坐标
+     */
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
+    /**
+     * 设置填充样式
+     *
+     * @param color 设置为填充样式的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
+     */
+    setFillStyle(color: string): void;
+    /**
+     * 设置线条样式
+     *
+     * @param color 设置为填充样式的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
+     */
+    setStrokeStyle(color: string): void;
+    /**
+     * 设置阴影
+     *
+     * @param offsetX 阴影相对于形状在水平方向的偏移
+     * @param offsetY 阴影相对于形状在竖直方向的偏移
+     * @param blur 阴影的模糊级别，数值越大越模糊 0~100
+     * @param color 阴影的颜色。 'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
+     */
+    setShadow(offsetX: number, offsetY: number, blur: number, color: string): void;
+    /**
+     * 创建一个线性的渐变颜色。
+     * Tip: 需要使用 addColorStop() 来指定渐变点，至少要两个。
+     * @param x0 起点的x坐标
+     * @param y0 起点的y坐标
+     * @param x1 终点的x坐标
+     * @param y1 终点的y坐标
+     */
+    createLinearGradient(x0: number, y0: number, x1: number, y1: number): void;
+    /**
+     * 创建一个颜色的渐变点。
+     * Tip: 小于最小 stop 的部分会按最小 stop 的 color 来渲染，大于最大 stop 的部分会按最大 stop 的 color 来渲染。
+     * Tip: 需要使用 addColorStop() 来指定渐变点，至少要两个。
+     * @param stop (0-1)  表示渐变点在起点和终点中的位置
+     * @param color 渐变点的颜色
+     *
+     */
+    addColorStop(stop: number, color: string): void;
+    /**
+     * 创建一个圆形的渐变颜色。
+     *
+     * @param x 圆心的x坐标
+     * @param y 圆心的y坐标
+     * @param r 圆的半径
+     *
+     */
+    createCircularGradient(x: number, y: number, r: number): void;
+    /**
+     * 设置字体大小
+     *
+     * @param fontSize 字体的字号
+     */
+    setFontSize(fontSize: number): void;
+    /**
+     * 设置线条端点的样式
+     *
+     * @param lineCap 线条的结束端点样式。 'butt'、'round'、'square'
+     */
+    setLineCap(lineCap: LineCapType): void;
+    /**
+     * 设置两线相交处的样式
+     *  @param lineJoin 两条线相交时，所创建的拐角类型
+     */
+    setLineJoin(lineJoin: LineJoinType): void;
+    /**
+     * 设置线条宽度
+     *
+     * @param lineWidth 线条的宽度
+     */
+    setLineWidth(lineWidth: number): void;
+    /**
+     * 设置最大斜接长度，斜接长度指的是在两条线交汇处内角和外角之间的距离。
+     * 当 setLineJoin为 miter 时才有效。
+     * 超过最大倾斜长度的，连接处将以 lineJoin 为 bevel 来显示
+     *
+     * @param miterLimit 最大斜接长度
+     */
+    setMiterLimit(miterLimit: number): void;
+    /**
+     * 将之前在绘图上下文中的描述（路径、变形、样式）画到 canvas 中。
+     * Tip: 绘图上下文需要由 wx.createCanvasContext(canvasId) 来创建。
+     * @param [reserve] 非必填。本次绘制是否接着上一次绘制，即reserve参数为false，则在本次调用drawCanvas绘制之前native层应先清空画布再继续绘制；若reserver参数为true，则保留当前画布上的内容，本次调用drawCanvas绘制的内容覆盖在上面，默认 false
+     *
+     */
+    draw(reserve?: boolean): void;
+  }
+  /**
+   * 创建并返回绘图上下文context对象。
+   * context只是一个记录方法调用的容器，
+   * 用于生成记录绘制行为的actions数组。c
+   * ontext跟<canvas/>不存在对应关系，
+   * 一个context生成画布的绘制动作数组可以应用于多个<canvas/>。
+   */
+  function createContext(): CanvasContext;
+  interface DrawCanvasOptions {
+    /** 画布标识，传入 <canvas/> 的 cavas-id */
+    canvasId: number | string;
+    /**
+     * 绘图动作数组，由 wx.createContext 创建的 context，
+     * 调用 getActions 方法导出绘图动作数组。
+     */
+    actions: CanvasAction[];
+  }
+  /**
+   * 绘制画布
+   */
+  function drawCanvas(options: DrawCanvasOptions): void;
+  interface CanvasToTempFilePathOptions extends BaseOptions {
+    /**
+     * 画布标识，传入 <canvas/> 的 cavas-id
+     */
+    canvasId: string;
+  }
+  /**
+   * 把当前画布的内容导出生成图片，并返回文件路径
+   */
+  function canvasToTempFilePath(options: CanvasToTempFilePathOptions): void;
+  interface CanvasImageDataOptions extends BaseOptions {
+    /** 画布标识，传入 <canvas /> 的 canvas-id  */
+    canvasId: string;
+    /** 将要被提取的图像数据矩形区域的左上角 x 坐标 */
+    x: number;
+    /** 将要被提取的图像数据矩形区域的左上角 y 坐标 */
+    y: number;
+    /** 将要被提取的图像数据矩形区域的宽度 */
+    width: number;
+    /** 将要被提取的图像数据矩形区域的高度 */
+    height: number;
+  }
+  /**
+   * 返回一个数组，用来描述 canvas 区域隐含的像素数据
+   * @version 1.9.0
+   */
+  function canvasGetImageData(options: CanvasImageDataOptions): void;
+  /**
+   * 将像素数据绘制到画布的方法
+   * @version 1.9.0
+   */
+  function canvasPutImageData(options: CanvasImageDataOptions): void;
+  // 页面-----下拉刷新
+  /**
+   * 开始下拉刷新，调用后触发下拉刷新动画，效果与用户手动下拉刷新一致
+   * @version 1.5.0
+   */
+  function startPullDownRefresh(options?: BaseOptions): void;
+  /**
+   * 停止当前页面下拉刷新
+   * @version 1.5.0
+   */
+  function stopPullDownRefresh(options?: BaseOptions): void;
+  // #endregion
+  // #region 第三方平台
+  interface ExtConfig {
+    /** 第三方平台自定义的数据 */
+    extConfig: any;
+  }
+  interface GetExtConfigOptions extends BaseOptions {
+    success(res: {
+      /* 调用结果 */
+      errMsg: string;
+    } & ExtConfig): void;
+  }
+  /**
+   * 获取第三方平台自定义的数据字段。
+   * @version 1.1.0
+   */
+  function getExtConfig(options?: GetExtConfigOptions): void;
+  /**
+   * 获取第三方平台自定义的数据字段的同步接口。
+   * @version 1.1.0
+   */
+  function getExtConfigSync(): ExtConfig;
+  // #endregion
+  // #region 开放接口
+  // 开放接口-----签名加密
+  // [签名加密](https://mp.weixin.qq.com/debug/wxadoc/dev/api/signature.html)
+  /**
+   * 登录态维护
+   * 通过 wx.login() 获取到用户登录态之后，需要维护登录态。
+   * 开发者要注意不应该直接把 session_key、openid 等字段作为用户的标识
+   * 或者 session 的标识，而应该自己派发一个 session 登录态（请参考登录时序图）。
+   * 对于开发者自己生成的 session，应该保证其安全性且不应该设置较长的过期时间。
+   * session 派发到小程序客户端之后，可将其存储在 storage ，用于后续通信使用。
+   * 通过wx.checkSession() 检测用户登录态是否失效。并决定是否调用wx.login()
+   * 重新获取登录态
+   */
+  interface LoginResponse {
+    /** 调用结果 */
+    errMsg: string;
+    /**
+     * 用户允许登录后，回调内容会带上 code（有效期五分钟），
+     * 开发者需要将 code 发送到开发者服务器后台，
+     * 使用code 换取 session_key api，
+     * 将 code 换成 openid 和 session_key
+     */
+    code: string;
+  }
+  interface LoginOptions extends BaseOptions {
+    /** 接口调用成功的回调函数 */
+    success?(res: LoginResponse): void;
+  }
+  /**
+   * 调用接口获取登录凭证（code）进而换取用户登录态信息，
+   * 包括用户的唯一标识（openid） 及本次登录的 会话密钥（session_key）。
+   * 用户数据的加解密通讯需要依赖会话密钥完成。
+   */
+  function login(option: LoginOptions): void;
+  type CheckSessionOption = BaseOptions;
+  /**
+   * 检测当前用户登录态是否有效。
+   * 通过wx.login获得的用户登录态拥有一定的时效性。用户越久未使用小程序，用户登录态越有可能失效。反之如果用户一直在使用小程序，则用户登录态一直保持有效。具体时效逻辑由微信维护，对开发者透明。开发者只需要调用wx.checkSession接口检测当前用户登录态是否有效。登录态过期后开发者可以再调用wx.login获取新的用户登录态。
+   *
+   */
+  function checkSession(options: CheckSessionOption): void;
+  /**
+   * 提前向用户发起授权请求。
+   * 调用后会立刻弹窗询问用户是否同意授权小程序使用某项功能或获取用户的某些数据，
+   * 但不会实际调用对应接口。如果用户之前已经同意授权，则不会出现弹窗，直接返回成功。
+   */
+  function authorize(options: AuthSetting): void;
+  // 开放接口-----用户信息
+  interface UserInfo {
+    nickName: string;
+    avatarUrl: string;
+    gender: number;
+    province: string;
+    city: string;
+    country: string;
+  }
+  interface UserInfoResponse {
+    /** 用户信息对象，不包含 openid 等敏感信息 */
+    userInfo: UserInfo;
+    /** 不包括敏感信息的原始数据字符串，用于计算签名。 */
+    rawData: string;
+    /** 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息。 */
+    signature: string;
+    /** 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法 */
+    encryptData: string;
+  }
+  interface GetUserInfoOptions extends BaseOptions {
+    /** 接口调用成功的回调函数 */
+    success?(res: UserInfoResponse): void;
+  }
+  /**
+   * 获取用户信息，需要先调用 wx.login 接口。
+   */
+  function getUserInfo(options: GetUserInfoOptions): void;
+  // 开放接口-----微信支付
+  type PaymentSignType = 'MD5';
+  interface RequestPaymentOptions extends BaseOptions {
+    /** 时间戳从1970年1月1日00:00:00至今的秒数,即当前的时间 */
+    timeStamp: string | number;
+    /** 随机字符串，长度为32个字符以下。 */
+    nonceStr: string;
+    /** 统一下单接口返回的 prepay_id 参数值，提交格式如：prepay_id=* */
+    package: string;
+    /** 签名算法，暂支持 MD5 */
+    signType: PaymentSignType;
+    /** 签名,具体签名方案参见微信公众号支付帮助文档; */
+    paySign: string;
+  }
+  /**
+   * 发起微信支付。
+   */
+  function requestPayment(options: RequestPaymentOptions): void;
+  // 开放接口-----分享
+  interface ShareAppMessage extends BaseOptions {
+    /**
+     * 分享标题  默认为当前小程序名称
+     *
+     */
+    title?: string;
+    /**
+     * 分享描述, 默认为当前小程序名称
+     */
+    desc?: string;
+    /**
+     * 自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG
+     * 不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
+     * @version 1.5.0
+     */
+    imageUrl?: string;
+    /**
+     * 分享路径  当默认为前页面 path ，
+     * 必须是以 / 开头的完整路径
+     *
+     */
+    path?: string;
+    success?(res: {
+      /** 每一项是一个 shareTicket ，对应一个转发对象 */
+      shareTickets: string[];
+    }): void;
+  }
+  type ShareMenuOptions = BaseOptions;
+  /**
+   * 显示分享按钮
+   * @version 1.1.0
+   */
+  function showShareMenu(options?: ShareMenuOptions): void;
+  /**
+   * 隐藏分享按钮
+   * @version 1.1.0
+   */
+  function hideShareMenu(options?: ShareMenuOptions): void;
+  interface UpdateShareMenuOptions extends BaseOptions {
+    /** 是否使用带 shareTicket 的转发详情 */
+    withShareTicket?: boolean;
+  }
+  /**
+   * 更新转发属性
+   * @version 1.2.0
+   */
+  function updateShareMenu(options?: UpdateShareMenuOptions): void;
+  interface GetShareInfoOptions extends BaseOptions {
+    /** shareTicket */
+    shareTicket: string;
+    success(res: {
+      /** 错误信息 */
+      errMsg: string;
+      /** 包括敏感数据在内的完整转发信息的加密数据，详细见[加密数据解密算法](https://mp.weixin.qq.com/debug/wxadoc/dev/api/signature.html#%E5%8A%A0%E5%AF%86%E6%95%B0%E6%8D%AE%E8%A7%A3%E5%AF%86%E7%AE%97%E6%B3%95) */
+      encryptedData: string;
+      /** 加密算法的初始向量，详细见[加密数据解密算法](https://mp.weixin.qq.com/debug/wxadoc/dev/api/signature.html#%E5%8A%A0%E5%AF%86%E6%95%B0%E6%8D%AE%E8%A7%A3%E5%AF%86%E7%AE%97%E6%B3%95) */
+      iv: string;
+    }): void;
+  }
+  /**
+   * 获取转发详细信息
+   * @version 1.1.0
+   */
+  function getShareInfo(options?: GetShareInfoOptions): void;
+  // 开放接口-----收货地址
+  interface ChooseAddressOptions extends BaseOptions {
+    success?(res: {
+      /**
+       * 调用结果
+       *
+       */
+      errMsg: string;
+      /**
+       * 收货人姓名
+       *
+       */
+      userName: string;
+      /**
+       * 邮编
+       *
+       */
+      postalCode: string;
+      /**
+       * 国标收货地址第一级地址
+       *
+       */
+      provinceName: string;
+      /**
+       * 国标收货地址第二级地址
+       *
+       */
+      cityName: string;
+      /**
+       * 国标收货地址第三级地址
+       *
+       */
+      countyName: string;
+      /**
+       * 详细收货地址信息
+       *
+       */
+      detailInfo: string;
+      /**
+       * 收货地址国家码
+       *
+       */
+      nationalCode: string;
+      /**
+       * 收货人手机号码
+       *
+       */
+      telNumber: string;
+    }): void;
+  }
+  function chooseAddress(options: ChooseAddressOptions): void;
+  // 开放接口-----卡券
+  interface Card {
+    cardId: string;
+    cardExt: string;
+    code: string;
+  }
+  interface CardOptions extends BaseOptions {
+    cardList: Card[];
+  }
+  /**
+   * 批量添加卡券。
+   *
+   */
+  function addCard(options: ChooseAddressOptions): void;
+  interface OpenCardOptions extends BaseOptions {
+    cardList: Card[];
+  }
+  /**
+   * 查看微信卡包中的卡券。
+   *
+   */
+  function openCard(options: OpenCardOptions): void;
+  // 开放接口-----设置
+  interface AuthSetting {
+    'scope.userInfo': boolean;
+    'scope.userLocation': boolean;
+    'scope.address': boolean;
+    'scope.record': boolean;
+  }
+  interface OpenSettingOptions extends BaseOptions {
+    success?(res: {
+      authSetting: AuthSetting
+    }): void;
+  }
+  /**
+   * 调起客户端小程序设置界面，返回用户设置的操作结果。
+   * 注：设置界面只会出现小程序已经向用户请求过的权限。
+   * @version 1.1.0
+   */
+  function openSetting(options: OpenSettingOptions): void;
+  /**
+   * 获取用户的当前设置。
+   * 注：返回值中只会出现小程序已经向用户请求过的权限。
+   * @version 1.2.0
+   */
+  function getSetting(options: OpenSettingOptions): void;
+  // #endregion
+  // #region 微信运动
+  interface StepInfo {
+    /** 时间戳，表示数据对应的时间 */
+    timestamp: number;
+    /** 微信运动步数 */
+    step: number;
+  }
+  /** 用户过去三十天的微信运动步数 */
+  interface StepInfoList {
+    stepInfoList: StepInfo[];
+  }
+  interface WeRunDataOptions extends BaseOptions {
+    success(res: {
+      /** 调用结果 */
+      errMsg: string;
+      /** 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法 */
+      encryptedData: string | StepInfoList;
+      /** 加密算法的初始向量，详细见加密数据解密算法 */
+      iv: string;
+    }): void;
+  }
+  /**
+   * 获取用户过去三十天微信运动步数
+   * 需要先调用 wx.login 接口。
+   * 需要用户授权 scope.werun
+   */
+  function getWeRunData(options?: WeRunDataOptions): void;
+  // #endregion
+  // #region 拓展接口
+  /**
+   * 将 ArrayBuffer 数据转成 Base64 字符串
+   *
+   */
+  function arrayBufferToBase64(arrayBuffer: ArrayBuffer): string;
+  /**
+   * 将 Base64 字符串转成 ArrayBuffer 数据
+   *
+   */
+  function base64ToArrayBuffer(base64: string): ArrayBuffer;
+  /**
+   * 收起键盘。
+   */
+  function hideKeyboard(): void;
+  interface EventTarget {
+    id: string;
+    tagName: string;
+    dataset: { [name: string]: string; };
+  }
+  interface BaseEvent {
+    type: 'tap' | 'touchstart' | 'touchmove' | 'touchcancel' | 'touchend' | 'tap' | 'longtap';
+    timeStamp: number;
+    currentTarget: EventTarget;
+    target: EventTarget;
+  }
+  interface InputEvent extends BaseEvent {
+    detail: {
+      target: EventTarget;
+      value: string;
+      /**
+       * 指定focus时的光标位置
+       * @version 1.5.0
+       */
+      cursor: number;
+    };
+  }
+  interface FormEvent extends BaseEvent {
+    detail: {
+      target: EventTarget;
+      value: { [name: string]: string | boolean | number; };
+    };
+  }
+  interface Touch {
+    identifier: number;
+    pageX: number;
+    pageY: number;
+    clientX: number;
+    clientY: number;
+  }
+  interface TouchEvent extends BaseEvent {
+    detail: {
+      x: number;
+      y: number;
+    };
+    touches: Touch[];
+    changedTouches: Touch[];
+  }
+  // #endregion
 }
-// 发起请求
-declare namespace wx {
-	interface RequestHeader {
-		[key: string]: string;
-	}
-	interface RequestOptions extends BaseOptions {
-		/** 开发者服务器接口地址 */
-		url: string;
-		/** 请求的参数 */
-		data?: string | any;
-		/** 设置请求的 header , header 中不能设置 Referer */
-		header?: RequestHeader;
-		/** 默认为 GET，有效值：OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT */
-		method?: string;
-		/** 收到开发者服务成功返回的回调函数，res = {data: '开发者服务器返回的内容'} */
-		success?(res: DataResponse): void;
-	}
-	/**
-	 * wx.request发起的是https请求。一个微信小程序，同时只能有5个网络请求连接。
-	 */
-	function request(options: RequestOptions): void;
+// #region App里的onLaunch、onShow回调参数
+interface LaunchOptions {
+  /**
+   * 打开小程序的路径
+   */
+  path: string;
+  /**
+   * 打开小程序的query
+   */
+  query: object;
+  /**
+   * 打开小程序的[场景值](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/app-service/scene.html)
+   */
+  scene: number;
+  /**
+   * shareTicket，详见 获取更多[转发信息](https://mp.weixin.qq.com/debug/wxadoc/dev/api/share.html#获取更多转发信息)
+   */
+  shareTicket: string;
+  /**
+   * 当场景为由从另一个小程序或公众号或App打开时，返回此字段
+   */
+  referrerInfo: object;
+  /**
+   * 来源小程序或公众号或App的 appId，详见下方说明
+   */
+  "referrerInfo.appId": string;
+  /**
+   * 来源小程序传过来的数据，scene=1037或1038时支持
+   */
+  "referrerInfo.extraData": object;
 }
-// 上传下载
-declare namespace wx {
-	interface UploadFileOptions extends BaseOptions {
-		/** 开发者服务器 url */
-		url: string;
-		/** 要上传文件资源的路径 */
-		filePath: string;
-		/** 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容 */
-		name: string;
-		/** HTTP 请求 Header , header 中不能设置 Referer */
-		header?: RequestHeader;
-		/** HTTP 请求中其他额外的 form data */
-		formData?: any;
-	}
-	/**
-	 * 将本地资源上传到开发者服务器。
-	 * 如页面通过 wx.chooseImage 等接口获取到一个本地资源的临时文件路径后，
-	 * 可通过此接口将本地资源上传到指定服务器。
-	 * 客户端发起一个 HTTPS POST 请求，
-	 * 其中 Content-Type 为 multipart/form-data 。
-	 */
-	function uploadFile(options: UploadFileOptions): void;
-
-	interface DownloadFileOptions extends BaseOptions {
-		/** 下载资源的 url */
-		url: string;
-		/** 下载资源的类型，用于客户端识别处理，有效值：image/audio/video */
-		type?: string;
-		/** HTTP 请求 Header */
-		header?: RequestHeader;
-		/** 下载成功后以 tempFilePath 的形式传给页面，res = {tempFilePath: '文件的临时路径'} */
-		success?(res: TempFileResponse): void;
-	}
-	/**
-	 * 下载文件资源到本地。客户端直接发起一个 HTTP GET 请求，
-	 * 把下载到的资源根据 type 进行处理，并返回文件的本地临时路径。
-	 */
-	function downloadFile(options: DownloadFileOptions): void;
-}
-// WebSocket
-declare namespace wx {
-	interface ConnectSocketOptions extends BaseOptions {
-		/** 开发者服务器接口地址，必须是 HTTPS 协议，且域名必须是后台配置的合法域名 */
-		url: string;
-		/** 请求的数据 */
-		data?: any;
-		/** HTTP Header , header 中不能设置 Referer */
-		header?: RequestHeader;
-		/** 默认是GET，有效值为： OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT */
-		method?: string;
-	}
-	/**
-	 * 创建一个 WebSocket 连接；
-	 * 一个微信小程序同时只能有一个 WebSocket 连接，
-	 * 如果当前已存在一个 WebSocket 连接，
-	 * 会自动关闭该连接，并重新创建一个 WebSocket 连接。
-	 */
-	function connectSocket(options: ConnectSocketOptions): void;
-
-	/** 监听WebSocket连接打开事件。 */
-	function onSocketOpen(callback: () => void): void;
-
-	/** 监听WebSocket错误。 */
-	function onSocketError(callback: (error: any) => void): void;
-
-	interface SendSocketMessageOptions extends BaseOptions {
-		/** 需要发送的内容 */
-		data: string;
-	}
-	/**
-	 * 通过 WebSocket 连接发送数据，需要先 wx.connectSocket，
-	 * 并在 wx.onSocketOpen 回调之后才能发送。
-	 */
-	function sendSocketMessage(options: SendSocketMessageOptions): void;
-
-	/**
-	 * 监听WebSocket接受到服务器的消息事件。
-	 */
-	function onSocketMessage(callback: (res: DataResponse) => void): void;
-
-	/**
-	 * 关闭WebSocket连接。
-	 */
-	function closeSocket(): void;
-
-	/** 监听WebSocket关闭。 */
-	function onSocketClose(callback: () => void): void;
-}
-// 媒体-----图片
-declare namespace wx {
-	type ImageSizeType = 'original' | 'compressed';
-	type ImageSourceType = 'album' | 'camera';
-	type VideoSourceType = 'album' | 'camera';
-	type CameraDevice = 'front' | 'back';
-
-	interface TempFilesData {
-		/** 文件的临时路径 */
-		tempFilePaths: string;
-	}
-	interface ChooseImageOptions extends BaseOptions {
-		/** 最多可以选择的图片张数，默认9 */
-		count?: number;
-		/** original 原图，compressed 压缩图，默认二者都有 */
-		sizeType?: ImageSizeType[];
-		/** album 从相册选图，camera 使用相机，默认二者都有 */
-		sourceType?: ImageSourceType[];
-		/** 成功则返回图片的本地文件路径列表 tempFilePaths */
-		success(res: TempFilesData): void;
-	}
-	/**
-	 * 从本地相册选择图片或使用相机拍照。
-	 */
-	function chooseImage(options: ChooseImageOptions): void;
-
-	interface PreviewImageOptions extends BaseOptions {
-		/** 当前显示图片的链接，不填则默认为 urls 的第一张 */
-		current?: string;
-		/** 需要预览的图片链接列表 */
-		urls: string[];
-	}
-	/**
-	 * 预览图片。
-	 */
-	function previewImage(options: PreviewImageOptions): void;
-
-	interface GetImageInfoOptions extends BaseOptions {
-		/**
-		 * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
-		 */
-		src: string;
-	}
-
-	/**
-	 * 获取图片信息
-	 */
-	function getImageInfo(options: GetImageInfoOptions): void;
-}
-// 媒体-----录音
-declare namespace wx {
-	interface StartRecordOptions extends BaseOptions {
-		/** 录音成功后调用，返回录音文件的临时文件路径，res = {tempFilePath: '录音文件的临时路径'} */
-		success?(res: TempFileResponse): void;
-	}
-
-	/**
-	 * 开始录音。当主动调用wx.stopRecord，
-	 * 或者录音超过1分钟时自动结束录音，返回录音文件的临时文件路径。
-	 * 注：文件的临时路径，在小程序本次启动期间可以正常使用，
-	 * 如需持久保存，需在主动调用wx.saveFile，在小程序下次启动时才能访问得到。
-	 */
-	function startRecord(options: StartRecordOptions): void;
-
-	/**
-	 * ​ 主动调用停止录音。
-	 */
-	function stopRecord(): void;
-}
-// 媒体-----音频播放控制
-declare namespace wx {
-	interface PlayVoiceOptions extends BaseOptions {
-		/** 需要播放的语音文件的文件路径 */
-		filePath: string;
-	}
-	/**
-	 * 开始播放语音，同时只允许一个语音文件正在播放，
-	 * 如果前一个语音文件还没播放完，将中断前一个语音播放。
-	 */
-	function playVoice(options: PlayVoiceOptions): void;
-
-	/**
-	 * 暂停正在播放的语音。
-	 * 再次调用wx.playVoice播放同一个文件时，会从暂停处开始播放。
-	 * 如果想从头开始播放，需要先调用 wx.stopVoice。
-	 */
-	function pauseVoice(): void;
-
-	/**
-	 * 结束播放语音。
-	 */
-	function stopVoice(): void;
-}
-// 媒体-----音乐播放控制
-declare namespace wx {
-	interface BackgroundAudioPlayerState {
-		/** 选定音频的长度（单位：s），只有在当前有音乐播放时返回 */
-		duration?: number;
-		/** 选定音频的播放位置（单位：s），只有在当前有音乐播放时返回 */
-		currentPosition?: number;
-		/** 播放状态（2：没有音乐在播放，1：播放中，0：暂停中） */
-		status: number;
-		/** 音频的下载进度（整数，80 代表 80%），只有在当前有音乐播放时返回 */
-		downloadPercent?: number;
-		/** 歌曲数据链接，只有在当前有音乐播放时返回 */
-		dataUrl?: string;
-	}
-	type GetBackgroundAudioPlayerStateSuccessCallback = (state: BackgroundAudioPlayerState) => void;
-	interface GetBackgroundAudioPlayerStateOptions extends BaseOptions {
-		/** 接口调用成功的回调函数 */
-		success?: GetBackgroundAudioPlayerStateSuccessCallback;
-		/** 接口调用失败的回调函数 */
-		fail?(): void;
-		/** 接口调用结束的回调函数（调用成功、失败都会执行） */
-		complete?(): void;
-	}
-	/** 获取音乐播放状态。 */
-	function getBackgroundAudioPlayerState(options: GetBackgroundAudioPlayerStateOptions): void;
-
-	interface PlayBackgroundAudioOptions extends BaseOptions {
-		/** 音乐链接 */
-		dataUrl: string;
-		/** 音乐标题 */
-		title?: string;
-		/** 封面URL */
-		coverImgUrl?: string;
-	}
-	/** 播放音乐，同时只能有一首音乐正在播放。 */
-	function playBackgroundAudio(options: PlayBackgroundAudioOptions): void;
-
-	/** 暂停播放音乐。 */
-	function pauseBackgroundAudio(): void;
-
-	interface SeekBackgroundAudioOptions extends BaseOptions {
-		/** 音乐位置，单位：秒 */
-		position: number;
-	}
-	/**
-	 * 控制音乐播放进度。
-	 */
-	function seekBackgroundAudio(options: SeekBackgroundAudioOptions): void;
-
-	/**
-	 * 停止播放音乐。
-	 */
-	function stopBackgroundAudio(): void;
-
-	/** 监听音乐播放。 */
-	function onBackgroundAudioPlay(callback: () => void): void;
-
-	/** 监听音乐暂停。 */
-	function onBackgroundAudioPause(callback: () => void): void;
-
-	/** 监听音乐停止。 */
-	function onBackgroundAudioStop(callback: () => void): void;
-}
-// 媒体-----音频组件控制
-declare namespace wx {
-	/**
-	 * audioContext 通过 audioId 跟一个 <audio/> 组件绑定，通过它可以操作对应的 <audio/> 组件。
-	 */
-	interface AudioContext {
-		/**
-		 * 音频的地址
-		 */
-		setSrc(src: string): void;
-		/**
-		 * 播放
-		 */
-		play(): void;
-		/**
-		 * 暂停
-		 */
-		pause(): void;
-		/**
-		 * 跳转到指定位置，单位 s
-		 */
-		seek(position: number): void;
-	}
-
-	/**
-	 * 创建并返回 audio 上下文 audioContext 对象
-	 * @param audioId audio标签id <audio  src="{{src}}" id="myAudio" ></audio>
-	 * @example
-	 * <!-- audio.wxml -->
-	 * <audio  src="{{src}}" id="myAudio" ></audio>
-	 * <button type="primary" bindtap="audioPlay">播放</button>
-	 * <button type="primary" bindtap="audioPause">暂停</button>
-	 * <button type="primary" bindtap="audio14">设置当前播放时间为14秒</button>
-	 * <button type="primary" bindtap="audioStart">回到开头</button>
-	 * // audio.js
-	 * Page({
-	 * onReady: function (e) {
-	 * 	// 使用 wx.createAudioContext 获取 audio 上下文 context
-	 * 	this.audioCtx = wx.createAudioContext('myAudio')
-	 * 	this.audioCtx.setSrc('http://ws.stream.qqmusic.qq.com/
-	 * M500001VfvsJ21xFqb.mp3?guid=ffffffff82def4af4b12b3cd9337d5e7&
-	 * uin=346897220&vkey=6292F51E1E384E06DCBDC9AB7C49FD713D632D313AC4858BACB8DDD29067D3C601481D36E62053BF8DFEAF74C0A5CCFADD6471160CAF3E6A&
-	 * fromtag=46')
-	 * 	this.audioCtx.play()
-	 * },
-	 * data: {
-	 * 	src: ''
-	 * },
-	 * audioPlay: function () {
-	 * 	this.audioCtx.play()
-	 * },
-	 * audioPause: function () {
-	 * 	this.audioCtx.pause()
-	 * },
-	 * audio14: function () {
-	 * 	this.audioCtx.seek(14)
-	 * },
-	 * audioStart: function () {
-	 * 	this.audioCtx.seek(0)
-	 * }
-	 * })
-	 */
-	function createAudioContext(audioId: string): AudioContext;
-}
-// 媒体-----视频
-declare namespace wx {
-	interface ChooseVideoOptions extends BaseOptions {
-		/** album 从相册选视频，camera 使用相机拍摄，默认为：['album', 'camera'] */
-		sourceType?: VideoSourceType[];
-		/** 拍摄视频最长拍摄时间，单位秒。最长支持60秒 */
-		maxDuration?: number;
-		/** 前置或者后置摄像头，默认为前后都有，即：['front', 'back'] */
-		camera?: CameraDevice[];
-		/** 接口调用成功，返回视频文件的临时文件路径，详见返回参数说明 */
-		success?(res: VideoData): void;
-	}
-	/**
-	 * 拍摄视频或从手机相册中选视频，返回视频的临时文件路径。
-	 */
-	function chooseVideo(options: ChooseVideoOptions): void;
-}
-// 媒体-----视频组件控制
-declare namespace wx {
-	interface VideoContext {
-		/**
-		 * 播放
-		 */
-		play(): void;
-		/**
-		 * 暂停
-		 */
-		pause(): void;
-		/**
-		 * 跳转到指定位置，单位 s
-		 */
-		seek(position: number): void;
-		/**
-		 * 发送弹幕，danmu 包含两个属性 text, color。
-		 */
-		sendDanmu(danmu: {
-			text: string;
-			color: number | string;
-		}): void;
-	}
-
-	interface VideoData {
-		/** 选定视频的临时文件路径 */
-		tempFilePath: string;
-		/** 选定视频的时间长度 */
-		duration: number;
-		/** 选定视频的数据量大小 */
-		size: number;
-		/** 返回选定视频的长 */
-		height: number;
-		/** 返回选定视频的宽 */
-		width: number;
-	}
-	/**
-	 * 创建并返回 video 上下文 videoContext 对象
-	 * @param videoId video标签id <video  src="{{src}}" id="myVideo" ></video>
-	 */
-	function createVideoContext(videoId: string): VideoContext;
-}
-// 文件
-declare namespace wx {
-	interface SavedFileData {
-		/** 文件的保存路径 */
-		savedFilePath: string;
-	}
-	interface SaveFileOptions extends BaseOptions {
-		/** 需要保存的文件的临时路径 */
-		tempFilePath: string;
-		/** 返回文件的保存路径，res = {savedFilePath: '文件的保存路径'} */
-		success?(res: SavedFileData): void;
-	}
-	/**
-	 * 保存文件到本地。
-	 * 本地文件存储的大小限制为 10M
-	 */
-	function saveFile(options: SaveFileOptions): void;
-
-	interface File {
-		/**
-		 * 文件的本地路径
-		 */
-		filePath: string;
-		/**
-		 * 文件的保存时的时间戳，从1970/01/01 08:00:00 到当前时间的秒数
-		 */
-		createTime: number;
-		/**
-		 * 文件大小，单位B
-		 */
-		size: number;
-	}
-	interface GetSavedFileListData {
-		/**
-		 * 接口调用结果
-		 */
-		errMsg: string;
-		/**
-		 * 文件列表
-		 */
-		fileList: File[];
-	}
-
-	interface GetSavedFileListOptions extends BaseOptions {
-		/** 接口调用成功的回调函数 */
-		success?(res: GetSavedFileListData): void;
-	}
-	/**
-	 * 获取本地已保存的文件列表
-	 */
-	function getSavedFileList(options: GetSavedFileListOptions): void;
-
-	interface SavedFileInfoData {
-		/**
-		 * 接口调用结果
-		 */
-		errMsg: string;
-		/**
-		 * 文件大小，单位B
-		 */
-		size: number;
-		/**
-		 * 文件的保存是的时间戳，从1970/01/01 08:00:00 到当前时间的秒数
-		 */
-		createTime: number;
-	}
-	interface GetSavedFileInfoOptions extends BaseOptions {
-		filePath: string;
-		/** 接口调用成功的回调函数 */
-		success?(res: SavedFileInfoData): void;
-	}
-	/**
-	 * 获取本地文件的文件信息
-	 */
-	function getSavedFileInfo(options: GetSavedFileInfoOptions): void;
-
-	type RemoveSavedFileOptions = BaseOptions;
-	/**
-	 * 删除本地存储的文件
-	 */
-	function removeSavedFile(options: RemoveSavedFileOptions): void;
-	interface OpenDocumentOptions extends BaseOptions {
-		/**
-		 * 文件路径，可通过 downFile 获得
-		 */
-		filePath: string;
-	}
-	/**
-	 * 新开页面打开文档，支持格式：doc, xls, ppt, pdf, docx, xlsx, pptx
-	 */
-	function openDocument(options: OpenDocumentOptions): void;
-}
-// 数据缓存
-declare namespace wx {
-	interface SetStorageOptions extends BaseOptions {
-		/** 本地缓存中的指定的 key */
-		key: string;
-		/** 需要存储的内容 */
-		data: any | string;
-	}
-	/**
-	 * 将数据存储在本地缓存中指定的 key 中，
-	 * 会覆盖掉原来该 key 对应的内容，这是一个异步接口。
-	 */
-	function setStorage(options: SetStorageOptions): void;
-	/**
-	 * 将 data 存储在本地缓存中指定的 key 中，
-	 * 会覆盖掉原来该 key 对应的内容，这是一个同步接口。
-	 *
-	 * @param key 本地缓存中的指定的 key
-	 * @param data 需要存储的内容
-	 */
-	function setStorageSync(key: string, data: any | string): void;
-
-	interface GetStorageOptions extends BaseOptions {
-		/** 本地缓存中的指定的 key */
-		key: string;
-		/** 接口调用的回调函数,res = {data: key对应的内容} */
-		success(res: DataResponse): void;
-	}
-	/**
-	 * 从本地缓存中异步获取指定 key 对应的内容。
-	 */
-	function getStorage(options: GetStorageOptions): void;
-
-	/**
-	 * 从本地缓存中同步获取指定 key 对应的内容。
-	 *
-	 */
-	function getStorageSync(key: string): any | string;
-
-	interface StorageInfo {
-		/**
-		 * 当前storage中所有的key
-		 */
-		keys: string[];
-		/**
-		 * 当前占用的空间大小, 单位kb
-		 */
-		currentSize: number;
-		/**
-		 * 限制的空间大小，单位kb
-		 */
-		limitSize: number;
-	}
-	interface GetStorageInfoOptions extends BaseOptions {
-		success(res: StorageInfo): void;
-	}
-	/**
-	 * 异步获取当前storage的相关信息
-	 */
-	function getStorageInfo(options: GetStorageInfoOptions): void;
-	function getStorageInfoSync(): GetStorageInfoOptions;
-	interface RemoveStorageOptions extends BaseOptions {
-		key: string;
-		success?(res: DataResponse): void;
-	}
-	function removeStorage(options: RemoveStorageOptions): void;
-	function removeStorageSync(key: string): DataResponse;
-
-	/**
-	 * 清理本地数据缓存。
-	 */
-	function clearStorage(): void;
-	/**
-	 * 同步清理本地数据缓存
-	 */
-	function clearStorageSync(): void;
-}
-// 位置-----获取位置
-declare namespace wx {
-	interface LocationData {
-		/** 纬度，浮点数，范围为-90~90，负数表示南纬 */
-		latitude: number;
-		/** 经度，浮点数，范围为-180~180，负数表示西经 */
-		longitude: number;
-		/** 速度，浮点数，单位m/s */
-		speed: number;
-		/** 位置的精确度 */
-		accuracy: number;
-	}
-
-	interface GetLocationOptions extends BaseOptions {
-		/** 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于wx.openLocation的坐标 */
-		type?: 'wgs84' | 'gcj02';
-		/** 接口调用成功的回调函数，返回内容详见返回参数说明。 */
-		success(res: LocationData): void;
-	}
-	/**
-	 * 获取当前的地理位置、速度。
-	 */
-	function getLocation(options: GetLocationOptions): void;
-
-	interface ChooseLocationData {
-		/**
-		 * 位置名称
-		 */
-		name: string;
-		/**
-		 * 详细地址
-		 */
-		address: string;
-		/**
-		 * 纬度，浮点数，范围为-90~90，负数表示南纬
-		 */
-		latitude: number;
-		/**
-		 * 经度，浮点数，范围为-180~180，负数表示西经
-		 */
-		longitude: number;
-	}
-	interface ChooseLocationOptions extends BaseOptions {
-		success(res: ChooseLocationData): void;
-	}
-	/**
-	 * 打开地图选择位置
-	 */
-	function chooseLocation(options: ChooseLocationOptions): void;
-}
-// 位置-----查看位置
-declare namespace wx {
-	interface OpenLocationOptions extends BaseOptions {
-		/** 纬度，范围为-90~90，负数表示南纬 */
-		latitude: number;
-		/** 经度，范围为-180~180，负数表示西经 */
-		longitude: number;
-		/** 缩放比例，范围1~28，默认为28 */
-		scale?: number;
-		/** 位置名 */
-		name?: string;
-		/** 地址的详细说明 */
-		address?: string;
-	}
-	/**
-	 * 使用微信内置地图查看位置
-	 */
-	function openLocation(options: OpenLocationOptions): void;
-}
-// 位置-----地图组件控制
-declare namespace wx {
-	interface GetCenterLocationOptions extends BaseOptions {
-		success(res: {
-			longitude: number;
-			latitude: number;
-		}): void;
-	}
-	/**
-	 * mapContext 通过 mapId 跟一个 <map/> 组件绑定，通过它可以操作对应的 <map/> 组件。
-	 */
-	interface MapContext {
-		/**
-		 * 获取当前地图中心的经纬度，返回的是 gcj02 坐标系，可以用于 wx.openLocation
-		 */
-		getCenterLocation(options: GetCenterLocationOptions): OpenLocationOptions;
-		/**
-		 * 将地图中心移动到当前定位点，需要配合map组件的show-location使用
-		 */
-		moveToLocation(): void;
-	}
-	/**
-	 * 创建并返回 map 上下文 mapContext 对象
-	 */
-	function createMapContext(mapId: string): MapContext;
-}
-// 设备-----系统信息
-declare namespace wx {
-	interface SystemInfo {
-		/** 手机型号 */
-		model: string;
-		/** 设备像素比 */
-		pixelRatio: number;
-		/** 窗口宽度 */
-		windowWidth: number;
-		/** 窗口高度 */
-		windowHeight: number;
-		/** 微信设置的语言 */
-		language: string;
-		/** 微信版本号 */
-		version: string;
-	}
-	interface GetSystemInfoOptions extends BaseOptions {
-		/** 成功获取系统信息的回调 */
-		success(res: SystemInfo): void;
-	}
-	/**
-	 * 获取系统信息。
-	 */
-	function getSystemInfo(options: GetSystemInfoOptions): void;
-	function getSystemInfoSync(): SystemInfo;
-}
-// 设备-----网络状态
-declare namespace wx {
-	type networkType = '2g' | '3g' | '4g' | 'wifi' | 'unknown' | 'none';
-	interface NetworkTypeData {
-		/** 返回网络类型2g，3g，4g，wifi */
-		networkType: networkType;
-	}
-	interface GetNetworkTypeOptions extends BaseOptions {
-		/** 接口调用成功，返回网络类型 networkType */
-		success(res: NetworkTypeData): void;
-	}
-	/**
-	 * 获取网络类型。
-	 */
-	function getNetworkType(options: GetNetworkTypeOptions): void;
-
-	/**
-	 * 监听网络状态变化。
-	 * 基础库版本 1.1.0 开始支持，低版本需做兼容处理
-	 * 微信客户端 6.5.6 版本开始支持
-	 */
-	function onNetworkStatusChange(callback: (res: {
-		isConnected: boolean;
-		networkType: networkType;
-	}) => void): void;
-}
-// 设备-----加速度计
-declare namespace wx {
-	interface AccelerometerData {
-		/** X 轴 */
-		x: number;
-		/** Y 轴 */
-		y: number;
-		/** Z 轴 */
-		z: number;
-	}
-	type AccelerometerChangeCallback = (res: AccelerometerData) => void;
-	/**
-	 * 监听重力感应数据，频率：5次/秒
-	 */
-	function onAccelerometerChange(callback: AccelerometerChangeCallback): void;
-
-	type AccelerometerOptions = BaseOptions;
-	/**
-	 * 开始监听加速度数据。
-	 * 基础库版本 1.1.0 开始支持，低版本需做兼容处理
-	 * 微信客户端 6.5.6 版本开始支持
-	 */
-	function startAccelerometer(options: AccelerometerOptions): void;
-	/**
-	 * 停止监听加速度数据。
-	 * 基础库版本 1.1.0 开始支持，低版本需做兼容处理
-	 * 微信客户端 6.5.6 版本开始支持
-	 */
-	function stopAccelerometer(options: AccelerometerOptions): void;
-}
-// 设备-----罗盘
-declare namespace wx {
-	interface CompassData {
-		/** 面对的方向度数 */
-		direction: number;
-	}
-	type CompassChangeCallback = (res: CompassData) => void;
-	/**
-	 * 监听罗盘数据，频率：5次/秒，接口调用后会自动开始监听，可使用wx.stopCompass停止监听。
-	 */
-	function onCompassChange(callback: CompassChangeCallback): void;
-	type CompassOptions = BaseOptions;
-	/**
-	 * 开始监听罗盘数据。
-	 * 基础库版本 1.1.0 开始支持，低版本需做兼容处理
-	 * 微信客户端 6.5.6 版本开始支持
-	 */
-	function startCompass(options: CompassOptions): void;
-	function stopCompass(options: CompassOptions): void;
-}
-// 设备-----拨打电话
-declare namespace wx {
-	interface MakePhoneCallOptions extends BaseOptions {
-		/**
-		 * 需要拨打的电话号码
-		 */
-		phoneNumber: string;
-	}
-	/**
-	 * 拨打电话
-	 */
-	function makePhoneCall(options: MakePhoneCallOptions): void;
-}
-// 设备-----扫码
-declare namespace wx {
-	type scanType = "qrCode" | "barCode";
-	interface ScanCodeData {
-		/**
-		 * 所扫码的内容
-		 */
-		result: string;
-		/**
-		 * 所扫码的类型
-		 */
-		scanType: scanType;
-		/**
-		 * 所扫码的字符集
-		 */
-		charSet: string;
-		/**
-		 * 当所扫的码为当前小程序的合法二维码时，会返回此字段，内容为二维码携带的 path
-		 */
-		path: string;
-	}
-	interface ScanCodeOptions extends BaseOptions {
-		success(res: ScanCodeData): void;
-	}
-	/**
-	 * 调起客户端扫码界面，扫码成功后返回对应的结果
-	 */
-	function scanCode(options: ScanCodeOptions): void;
-}
-// 设备-----剪贴板
-declare namespace wx {
-	interface ClipboardDataOptions extends BaseOptions {
-		data: string;
-		success?(res: DataResponse): void;
-	}
-	/**
-	 * 设置系统剪贴板的内容
-	 * 基础库版本 1.1.0 开始支持，低版本需做兼容处理
-	 * 微信客户端 6.5.6 版本开始支持
-	 */
-	function setClipboardData(options: ClipboardDataOptions): void;
-	/**
-	 * 获取系统剪贴板内容
-	 * 基础库版本 1.1.0 开始支持，低版本需做兼容处理
-	 * 微信客户端 6.5.6 版本开始支持
-	 */
-	function getClipboardData(options: ClipboardDataOptions): void;
-}
-// 设备-----蓝牙
-declare namespace wx {
-	interface OpenBluetoothAdapterOptions extends BaseOptions {
-		success(res: any): void;
-	}
-	/**
-	 * 初始化蓝牙适配器
-	 */
-	function openBluetoothAdapter(options: OpenBluetoothAdapterOptions): void;
-	interface CloseBluetoothAdapterOptions extends BaseOptions {
-		success(res: any): void;
-	}
-	/**
-	 * 关闭蓝牙模块。调用该方法将断开所有已建立的链接并释放系统资源
-	 */
-	function closeBluetoothAdapter(options: CloseBluetoothAdapterOptions): void;
-	interface BluetoothAdapterState {
-		/**
-		 * 蓝牙适配器是否可用
-		 */
-		available: boolean;
-		/**
-		 * 蓝牙适配器是否处于搜索状态
-		 */
-		discovering: boolean;
-	}
-	interface BluetoothAdapterStateData extends ErrMsgResponse {
-		/**
-		 * 蓝牙适配器信息
-		 */
-		adapterState: BluetoothAdapterState;
-	}
-	interface GetBluetoothAdapterStateOptions extends BaseOptions {
-		success(res: BluetoothAdapterStateData): void;
-	}
-	/**
-	 * 获取本机蓝牙适配器状态
-	 */
-	function getBluetoothAdapterState(options: GetBluetoothAdapterStateOptions): void;
-	/**
-	 * 监听蓝牙适配器状态变化事件
-	 */
-	function onBluetoothAdapterStateChange(callback: (res: BluetoothAdapterState) => void): void;
-	interface StartBluetoothDevicesDiscoveryOptions extends BaseOptions {
-		success(res: ErrMsgResponse): void;
-		/**
-		 * 蓝牙设备主 service 的 uuid 列表
-		 * 某些蓝牙设备会广播自己的主 service 的 uuid。如果这里传入该数组，那么根据该 uuid 列表，只搜索有这个主服务的设备。
-		 */
-		services?: string[];
-	}
-	/**
-	 * 开始搜寻附近的蓝牙外围设备。注意，该操作比较耗费系统资源，请在搜索并连接到设备后调用 stop 方法停止搜索。
-	 * @example
-	 * // 以微信硬件平台的蓝牙智能灯为例，主服务的 UUID 是 FEE7。传入这个参数，只搜索主服务 UUID 为 FEE7 的设备
-	 * wx.startBluetoothDevicesDiscovery({
-	 * 	services: ['FEE7'],
-	 * 	success: function (res) {
-	 * 		console.log(res)
-	 * 	}
-	 * });
-	 */
-	function startBluetoothDevicesDiscovery(options: StartBluetoothDevicesDiscoveryOptions): void;
-	interface StopBluetoothDevicesDiscoveryOptions extends BaseOptions {
-		success(res: ErrMsgResponse): void;
-	}
-	/**
-	 * 停止搜寻附近的蓝牙外围设备。请在确保找到需要连接的设备后调用该方法停止搜索。
-	 */
-	function stopBluetoothDevicesDiscovery(options: StopBluetoothDevicesDiscoveryOptions): void;
-
-	/**
-	 * 蓝牙设备信息
-	 */
-	interface BluetoothDevice {
-		/**
-		 * 蓝牙设备名称，某些设备可能没有
-		 */
-		name: string;
-		/**
-		 * 用于区分设备的 id
-		 */
-		deviceId: string;
-		/**
-		 * int 当前蓝牙设备的信号强度
-		 */
-		RSSI: number;
-		/**
-		 * 当前蓝牙设备的广播内容
-		 */
-		advertisData: ArrayBuffer;
-	}
-	interface GetBluetoothDevicesOptions extends BaseOptions {
-		success(res: {
-			devices: BluetoothDevice[];
-		} & ErrMsgResponse): void;
-	}
-	/**
-	 * 获取所有已发现的蓝牙设备，包括已经和本机处于连接状态的设备
-	 */
-	function getBluetoothDevices(options: GetBluetoothDevicesOptions): void;
-	/**
-	 * 监听寻找到新设备的事件
-	 */
-	function onBluetoothDeviceFound(callback: (res: {
-		devices: BluetoothDevice[]
-	}) => void): void;
-
-	interface GetConnectedBluetoothDevicesOptions extends BaseOptions {
-		services: string[];
-		success(res: {
-			devices: BluetoothDevice[]
-		} & ErrMsgResponse): void;
-	}
-	/**
-	 * 根据 uuid 获取处于已连接状态的设备
-	 */
-	function getConnectedBluetoothDevices(options: GetConnectedBluetoothDevicesOptions): void;
-
-	interface CreateBLEConnectionOptions extends BaseOptions {
-		success(res: ErrMsgResponse): void;
-	}
-	/**
-	 * 低功耗蓝牙接口
-	 */
-	function createBLEConnection(options: CreateBLEConnectionOptions): void;
-
-	interface CloseBLEConnectionOptions extends BaseOptions {
-		/**
-		 * 蓝牙设备 id，参考 getDevices 接口
-		 */
-		deviceId: string;
-		success(res: ErrMsgResponse): void;
-	}
-	/**
-	 * 断开与低功耗蓝牙设备的连接
-	 */
-	function closeBLEConnection(options: CloseBLEConnectionOptions): void;
-
-	interface GetBLEDeviceServicesOptions extends BaseOptions {
-		/**
-		 * 蓝牙设备 id，参考 getDevices 接口
-		 */
-		deviceId: string;
-		/**
-		 * 成功则返回本机蓝牙适配器状态
-		 */
-		success(res: {
-			services: Array<{
-				uuid: string;
-				isPrimary: boolean;
-			}>;
-		} & ErrMsgResponse): void;
-	}
-	/**
-	 * 获取蓝牙设备所有 service（服务）
-	 */
-	function getBLEDeviceServices(options: GetBLEDeviceServicesOptions): void;
-
-	interface GetBLEDeviceCharacteristicsOptions extends BaseOptions {
-		/**
-		 * 蓝牙设备 id，参考 device 对象
-		 */
-		deviceId: string;
-		/**
-		 * 蓝牙服务 uuid
-		 */
-		serviceId: string;
-		/**
-		 * 成功则返回本机蓝牙适配器状态
-		 */
-		success(res: {
-			characteristics: Array<{
-				uuid: string;
-				properties: Array<{
-					/**
-					 * 该特征值是否支持 read 操作
-					 */
-					read: boolean;
-					/**
-					 * 该特征值是否支持 write 操作
-					 */
-					write: boolean;
-					/**
-					 * 该特征值是否支持 notify 操作
-					 */
-					notify: boolean;
-					/**
-					 * 该特征值是否支持 indicate 操作
-					 */
-					indicate: boolean;
-				}>;
-			}>;
-		} & ErrMsgResponse): void;
-	}
-	/**
-	 * 获取蓝牙设备所有 characteristic（特征值）
-	 */
-	function getBLEDeviceCharacteristics(options: GetBLEDeviceCharacteristicsOptions): void;
-
-	interface BLECharacteristicValueOptions extends BaseOptions {
-		/**
-		 * 蓝牙设备 id，参考 device 对象
-		 */
-		deviceId: string;
-		/**
-		 * 蓝牙特征值对应服务的 uuid
-		 */
-		serviceId: string;
-		/**
-		 * 蓝牙特征值的 uuid
-		 */
-		characteristicId: string;
-		success(res: {
-			characteristic: {
-				/**
-				 * 蓝牙设备特征值的 uuid
-				 */
-				characteristicId: string;
-				/**
-				 * 蓝牙设备特征值对应服务的 uuid
-				 */
-				serviceId: string;
-				/**
-				 * 蓝牙设备特征值对应的二进制值
-				 */
-				value: ArrayBuffer;
-			};
-		} & ErrMsgResponse): void;
-	}
-	/**
-	 * 读取低功耗蓝牙设备的特征值的二进制数据值。
-	 * 注意：必须设备的特征值支持read才可以成功调用，具体参照 characteristic 的 properties 属性
-	 */
-	function readBLECharacteristicValue(options: BLECharacteristicValueOptions): void;
-	/**
-	 * 向低功耗蓝牙设备特征值中写入二进制数据。
-	 * 注意：必须设备的特征值支持write才可以成功调用，具体参照 characteristic 的 properties 属性
-	 * tips: 并行调用多次读写接口存在读写失败的可能性
-	 */
-	function writeBLECharacteristicValue(options: BLECharacteristicValueOptions): void;
-	/**
-	 * 启用低功耗蓝牙设备特征值变化时的 notify 功能。
-	 * 注意：必须设备的特征值支持notify才可以成功调用，具体参照 characteristic 的 properties 属性
-	 * 另外，必须先启用notify才能监听到设备 characteristicValueChange 事件
-	 */
-	function notifyBLECharacteristicValueChanged(options: BLECharacteristicValueOptions): void;
-	/**
-	 * 监听低功耗蓝牙连接的错误事件，包括设备丢失，连接异常断开等等。
-	 */
-	function onBLEConnectionStateChanged(callback: (res: {
-		/**
-		 * 蓝牙设备 id，参考 device 对象
-		 */
-		deviceId: string;
-		/**
-		 * 连接目前的状态
-		 */
-		connected: boolean;
-	}) => void): void;
-	/**
-	 * 监听低功耗蓝牙设备的特征值变化。必须先启用notify接口才能接收到设备推送的notification。
-	 */
-	function onBLECharacteristicValueChange(callback: (
-		res: {
-			/**
-			 * 蓝牙设备 id，参考 device 对象
-			 */
-			deviceId: string;
-			/**
-			 * 特征值所属服务 uuid
-			 */
-			serviceId: string;
-			/**
-			 * 特征值 uuid
-			 */
-			characteristicId: string;
-			/**
-			 * 特征值最新的值
-			 */
-			value: ArrayBuffer;
-		}
-	) => void): void;
-}
-// 界面-----交互反馈
-declare namespace wx {
-	interface ToastOptions extends BaseOptions {
-		/**
-		 * 提示的内容
-		 */
-		title: string;
-		/**
-		 * 图标，只支持"success"、"loading"
-		 */
-		icon?: 'success' | 'loading';
-		/**
-		 * 自定义图标的本地路径，image 的优先级高于 icon
-		 */
-		image?: string;
-		/**
-		 * 提示的延迟时间，单位毫秒，默认：1500
-		 */
-		duration?: number;
-		/**
-		 * 是否显示透明蒙层，防止触摸穿透，默认：false
-		 */
-		mask?: boolean;
-	}
-	/**
-	 * 显示消息提示框
-	 */
-	function showToast(options: ToastOptions): void;
-	function hideToast(): void;
-
-	interface LoadingOptions extends BaseOptions {
-		/**
-		 * 提示的内容
-		 */
-		title: string;
-		/**
-		 * 是否显示透明蒙层，防止触摸穿透，默认：false
-		 */
-		mask?: boolean;
-	}
-	/**
-	 * 显示 loading 提示框, 需主动调用 wx.hideLoading 才能关闭提示框
-	 */
-	function showLoading(options: LoadingOptions): void;
-	/**
-	 * 隐藏消息提示框
-	 */
-	function hideLoading(): void;
-
-	interface ModalOptions extends BaseOptions {
-		/**
-		 * 提示的标题
-		 */
-		title: string;
-		/**
-		 * 提示的内容
-		 */
-		content: string;
-		/**
-		 * 是否显示取消按钮，默认为 true
-		 */
-		showCancel?: boolean;
-		/**
-		 * 取消按钮的文字，默认为"取消"，最多 4 个字符
-		 */
-		cancelText?: string;
-		/**
-		 * 取消按钮的文字颜色，默认为"#000000"
-		 */
-		cancelColor?: string;
-		/**
-		 * 确定按钮的文字，默认为"确定"，最多 4 个字符
-		 */
-		confirmText?: string;
-		/**
-		 * 确定按钮的文字颜色，默认为"#3CC51F"
-		 */
-		confirmColor?: string;
-		success?(res: {
-			/**
-			 * 为 true 时，表示用户点击了确定按钮
-			 */
-			confirm: boolean;
-			/**
-			 * 为 true 时，表示用户点击了取消（用于 Android 系统区分点击蒙层关闭还是点击取消按钮关闭）
-			 */
-			cancel: boolean;
-		}): void;
-	}
-	/**
-	 * 显示模态弹窗
-	 */
-	function showModal(options: ModalOptions): void;
-
-	interface ActionSheetOptions extends BaseOptions {
-		/**
-		 * 按钮的文字数组，数组长度最大为6个
-		 */
-		itemList: string[];
-		/**
-		 * 按钮的文字颜色，默认为"#000000"
-		 */
-		itemColor?: string;
-		/**
-		 * 接口调用成功的回调函数
-		 */
-		success?(res: {
-			/**
-			 * 用户点击的按钮，从上到下的顺序，从0开始
-			 */
-			tapIndex: number;
-		}): void;
-	}
-	/**
-	 * 显示操作菜单
-	 */
-	function showActionSheet(options: ActionSheetOptions): void;
-}
-// 界面-----设置导航条
-declare namespace wx {
-	interface SetNavigationBarTitleOptions extends BaseOptions {
-		/** 页面标题 */
-		title?: string;
-	}
-	/**
-	 * 动态设置当前页面的标题。
-	 */
-	function setNavigationBarTitle(options: SetNavigationBarTitleOptions): void;
-
-	/**
-	 * 在当前页面显示导航条加载动画。
-	 */
-	function showNavigationBarLoading(): void;
-	/**
-	 * 隐藏导航条加载动画。
-	 */
-	function hideNavigationBarLoading(): void;
-}
-// 界面-----导航
-declare namespace wx {
-	interface NavigateToOptions extends BaseOptions {
-		/** 需要跳转的应用内页面的路径 */
-		url: string;
-	}
-	/**
-	 * 保留当前页面，跳转到应用内的某个页面，使用wx.navigateBack可以返回到原页面。
-	 *
-	 * 注意：为了不让用户在使用小程序时造成困扰，
-	 * 我们规定页面路径只能是五层，请尽量避免多层级的交互方式。
-	 */
-	function navigateTo(options: NavigateToOptions): void;
-
-	interface RedirectToOptions extends BaseOptions {
-		/** 需要跳转的应用内页面的路径 */
-		url: string;
-	}
-	/**
-	 * 关闭当前页面，跳转到应用内的某个页面。
-	 */
-	function redirectTo(options: RedirectToOptions): void;
-
-	/**
-	 * 关闭当前页面，回退前一页面。
-	 */
-	function navigateBack(): void;
-}
-// 界面-----动画
-declare namespace wx {
-	type TimingFunction = 'linear' | 'ease' | 'ease-in' | 'ease-in-out' | 'ease-out' | 'step-start' | 'step-end';
-
-	interface CreateAnimationOptions {
-		/** 动画持续时间，单位ms，默认值 400 */
-		duration?: number;
-		/** 定义动画的效果，默认值"linear"，有效值："linear","ease","ease-in","ease-in-out","ease-out","step-start","step-end" */
-		timingFunction?: TimingFunction;
-		/** 动画持续时间，单位 ms，默认值 0 */
-		delay?: number;
-		/** 设置transform-origin，默认为"50% 50% 0" */
-		transformOrigin?: string;
-	}
-
-	interface Animator {
-		actions: AnimationAction[];
-	}
-	interface AnimationAction {
-		animates: Animate[];
-		option: AnimationActionOption;
-	}
-	interface AnimationActionOption {
-		transformOrigin: string;
-		transition: AnimationTransition;
-	}
-	interface AnimationTransition {
-		delay: number;
-		duration: number;
-		timingFunction: TimingFunction;
-	}
-	interface Animate {
-		type: string;
-		args: any[];
-	}
-
-	/**
-	 * 创建一个动画实例animation。调用实例的方法来描述动画。
-	 * 最后通过动画实例的export方法导出动画数据传递给组件的animation属性。
-	 *
-	 * 注意: export 方法每次调用后会清掉之前的动画操作
-	 */
-	function createAnimation(options?: CreateAnimationOptions): Animation;
-	/** 动画实例可以调用以下方法来描述动画，调用结束后会返回自身，支持链式调用的写法。 */
-	interface Animation {
-		/**
-		 * 调用动画操作方法后要调用 step() 来表示一组动画完成，
-		 * 可以在一组动画中调用任意多个动画方法，
-		 * 一组动画中的所有动画会同时开始，
-		 * 一组动画完成后才会进行下一组动画。
-		 * @param options 指定当前组动画的配置
-		 */
-		step(options?: CreateAnimationOptions): void;
-		/**
-		 * 导出动画操作
-		 *
-		 * 注意: export 方法每次调用后会清掉之前的动画操作
-		 */
-		export(): Animator;
-
-		/** 透明度，参数范围 0~1 */
-		opacity(value: number): Animation;
-		/** 颜色值 */
-		backgroundColor(color: string): Animation;
-		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-		width(length: number): Animation;
-		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-		height(length: number): Animation;
-		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-		top(length: number): Animation;
-		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-		left(length: number): Animation;
-		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-		bottom(length: number): Animation;
-		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-		right(length: number): Animation;
-
-		/** deg的范围-180~180，从原点顺时针旋转一个deg角度 */
-		rotate(deg: number): Animation;
-		/** deg的范围-180~180，在X轴旋转一个deg角度 */
-		rotateX(deg: number): Animation;
-		/** deg的范围-180~180，在Y轴旋转一个deg角度 */
-		rotateY(deg: number): Animation;
-		/** deg的范围-180~180，在Z轴旋转一个deg角度 */
-		rotateZ(deg: number): Animation;
-		/** 同transform-function rotate3d */
-		rotate3d(x: number, y: number, z: number, deg: number): Animation;
-
-		/**
-		 * 一个参数时，表示在X轴、Y轴同时缩放sx倍数；
-		 * 两个参数时表示在X轴缩放sx倍数，在Y轴缩放sy倍数
-		 */
-		scale(sx: number, sy?: number): Animation;
-		/** 在X轴缩放sx倍数 */
-		scaleX(sx: number): Animation;
-		/** 在Y轴缩放sy倍数 */
-		scaleY(sy: number): Animation;
-		/** 在Z轴缩放sy倍数 */
-		scaleZ(sz: number): Animation;
-		/** 在X轴缩放sx倍数，在Y轴缩放sy倍数，在Z轴缩放sz倍数 */
-		scale3d(sx: number, sy: number, sz: number): Animation;
-
-		/**
-		 * 一个参数时，表示在X轴偏移tx，单位px；
-		 * 两个参数时，表示在X轴偏移tx，在Y轴偏移ty，单位px。
-		 */
-		translate(tx: number, ty?: number): Animation;
-		/**
-		 * 在X轴偏移tx，单位px
-		 */
-		translateX(tx: number): Animation;
-		/**
-		 * 在Y轴偏移tx，单位px
-		 */
-		translateY(ty: number): Animation;
-		/**
-		 * 在Z轴偏移tx，单位px
-		 */
-		translateZ(tz: number): Animation;
-		/**
-		 * 在X轴偏移tx，在Y轴偏移ty，在Z轴偏移tz，单位px
-		 */
-		translate3d(tx: number, ty: number, tz: number): Animation;
-
-		/**
-		 * 参数范围-180~180；
-		 * 一个参数时，Y轴坐标不变，X轴坐标延顺时针倾斜ax度；
-		 * 两个参数时，分别在X轴倾斜ax度，在Y轴倾斜ay度
-		 */
-		skew(ax: number, ay?: number): Animation;
-		/** 参数范围-180~180；Y轴坐标不变，X轴坐标延顺时针倾斜ax度 */
-		skewX(ax: number): Animation;
-		/** 参数范围-180~180；X轴坐标不变，Y轴坐标延顺时针倾斜ay度 */
-		skewY(ay: number): Animation;
-
-		/**
-		 * 同transform-function matrix
-		 */
-		matrix(a: number, b: number, c: number, d: number, tx: number, ty: number): Animation;
-		/** 同transform-function matrix3d */
-		matrix3d(
-			a1: number, b1: number, c1: number, d1: number, a2: number,
-			b2: number, c2: number, d2: number, a3: number, b3: number,
-			c3: number, d3: number, a4: number, b4: number, c4: number,
-			d4: number
-		): Animation;
-	}
-}
-// 界面-----绘图
-declare namespace wx {
-	interface CanvasAction {
-		method: string;
-		data: CanvasAction[] | Array<number | string>;
-	}
-	type LineCapType = 'butt' | 'round' | 'square';
-	type LineJoinType = 'bevel' | 'round' | 'miter';
-	/**
-	 * context只是一个记录方法调用的容器，用于生成记录绘制行为的actions数组。context跟<canvas/>不存在对应关系，一个context生成画布的绘制动作数组可以应用于多个<canvas/>。
-	 */
-	interface CanvasContext {
-		/** 获取当前context上存储的绘图动作(不推荐使用) */
-		getActions(): CanvasAction[];
-		/** 清空当前的存储绘图动作(不推荐使用) */
-		clearActions(): void;
-		/**
-		 * 对横纵坐标进行缩放
-		 * 在调用scale方法后，之后创建的路径其横纵坐标会被缩放。
-		 * 多次调用scale，倍数会相乘。
-		 *
-		 * @param scaleWidth 横坐标缩放的倍数
-		 * @param scaleHeight 纵坐标轴缩放的倍数
-		 */
-		scale(scaleWidth: number, scaleHeight?: number): void;
-		/**
-		 * 对坐标轴进行顺时针旋转
-		 * 以原点为中心，原点可以用 translate方法修改。
-		 * 顺时针旋转当前坐标轴。多次调用rotate，旋转的角度会叠加。
-		 *
-		 * @param rotate 旋转角度，以弧度计。
-		 */
-		rotate(rotate: number): void;
-		/**
-		 * 对坐标原点进行缩放
-		 * 对当前坐标系的原点(0, 0)进行变换，默认的坐标系原点为页面左上角。
-		 *
-		 * @param x 水平坐标平移量
-		 * @param y 竖直坐标平移量
-		 */
-		translate(x: number, y: number): void;
-		/**
-		 * 保存当前的绘图上下文。
-		 */
-		save(): void;
-		/**
-		 * 恢复之前保存的绘图上下文。
-		 */
-		restore(): void;
-		/**
-		 * 在给定的矩形区域内，清除画布上的像素
-		 * 清除画布上在该矩形区域内的内容。
-		 *
-		 * @param x 矩形区域左上角的x坐标
-		 * @param y 矩形区域左上角的y坐标
-		 * @param width 矩形区域的宽度
-		 * @param height 矩形区域的高度
-		 */
-		clearRect(x: number, y: number, width: number, height: number): void;
-		/**
-		 * 在画布上绘制被填充的文本
-		 *
-		 * @param text 在画布上输出的文本
-		 * @param x 绘制文本的左上角x坐标位置
-		 * @param y 绘制文本的左上角y坐标位置
-		 */
-		fillText(text: string, x: number, y: number): void;
-		/**
-		 * 用于设置文字的对齐
-		 *
-		 *
-		 */
-		setTextAlign(align: 'left' | 'center' | 'right'): void;
-		/**
-		 * 绘制图像，图像保持原始尺寸。
-		 *
-		 * @param imageResource 所要绘制的图片资源。 通过chooseImage得到一个文件路径或者一个项目目录内的图片
-		 * @param x 图像左上角的x坐标
-		 * @param y 图像左上角的y坐标
-		 * @param width 图像宽度
-		 * @param height 图像高度
-		 *
-		 */
-		drawImage(imageResource: string, x: number, y: number, width: number, height: number): void;
-		/**
-		 * 设置全局画笔透明度。
-		 *
-		 * @param alpha 0~1	透明度，0 表示完全透明，1 表示完全不透明
-		 *
-		 */
-		setGlobalAlpha(alpha: number): void;
-		/**
-		 * 对当前路径进行填充
-		 */
-		fill(): void;
-		/**
-		 * 对当前路径进行描边
-		 */
-		stroke(): void;
-		/**
-		 * 开始创建一个路径，需要调用fill或者stroke才会使用路径进行填充或描边。
-		 * Tip: 在最开始的时候相当于调用了一次 beginPath()。
-		 * Tip: 同一个路径内的多次setFillStyle、setStrokeStyle、setLineWidth等设置，
-		 * 以最后一次设置为准。
-		 */
-		beginPath(): void;
-		/**
-		 * 关闭一个路径
-		 * Tip: 关闭路径会连接起点和终点。
-		 * Tip: 如果关闭路径后没有调用 fill() 或者 stroke() 并开启了新的路径，那之前的路径将不会被渲染。
-		 */
-		closePath(): void;
-		/**
-		 * 把路径移动到画布中的指定点，但不创建线条。
-		 *
-		 * @param x 目标位置的x坐标
-		 * @param y 目标位置的y坐标
-		 */
-		moveTo(x: number, y: number): void;
-		/**
-		 * 在当前位置添加一个新点，然后在画布中创建从该点到最后指定点的路径。
-		 *
-		 * @param x 目标位置的x坐标
-		 * @param y 目标位置的y坐标
-		 */
-		lineTo(x: number, y: number): void;
-		/**
-		 * 添加一个矩形路径到当前路径。
-		 *
-		 * @param x 矩形路径左上角的x坐标
-		 * @param y 矩形路径左上角的y坐标
-		 * @param width 矩形路径的宽度
-		 * @param height 矩形路径的高度
-		 */
-		rect(x: number, y: number, width: number, height: number): void;
-
-		/**
-		 * 填充一个矩形。
-		 * Tip: 用 setFillStyle() 设置矩形的填充色，如果没设置默认是黑色。
-		 * @param x 矩形路径左上角的x坐标
-		 * @param y 矩形路径左上角的y坐标
-		 * @param width 矩形路径的宽度
-		 * @param height 矩形路径的高度
-		 *
-		 */
-		fillRect(x: number, y: number, width: number, height: number): void;
-		/**
-		 * 画一个矩形(非填充)。
-		 * Tip: 用 setFillStroke() 设置矩形线条的颜色，如果没设置默认是黑色。
-		 * @param x 矩形路径左上角的x坐标
-		 * @param y 矩形路径左上角的y坐标
-		 * @param width 矩形路径的宽度
-		 * @param height 矩形路径的高度
-		 *
-		 */
-		strokeRect(x: number, y: number, width: number, height: number): void;
-		/**
-		 * 添加一个弧形路径到当前路径，顺时针绘制。
-		 *
-		 * @param x 圆的x坐标
-		 * @param y 圆的y坐标
-		 * @param radius 圆的半径
-		 * @param startAngle 起始弧度，单位弧度（在3点钟方向）
-		 * @param endAngle 终止弧度
-		 * @param counterclockwise 指定弧度的方向是逆时针还是顺时针。默认是false，即顺时针。
-		 */
-		arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void;
-		/**
-		 * 创建二次方贝塞尔曲线
-		 *
-		 * @param cpx 贝塞尔控制点的x坐标
-		 * @param cpy 贝塞尔控制点的y坐标
-		 * @param x 结束点的x坐标
-		 * @param y 结束点的y坐标
-		 */
-		quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
-		/**
-		 * 创建三次方贝塞尔曲线
-		 *
-		 * @param cp1x 第一个贝塞尔控制点的 x 坐标
-		 * @param cp1y 第一个贝塞尔控制点的 y 坐标
-		 * @param cp2x 第二个贝塞尔控制点的 x 坐标
-		 * @param cp2y 第二个贝塞尔控制点的 y 坐标
-		 * @param x 结束点的x坐标
-		 * @param y 结束点的y坐标
-		 */
-		bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
-		/**
-		 * 设置填充样式
-		 *
-		 * @param color 设置为填充样式的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
-		 */
-		setFillStyle(color: string): void;
-		/**
-		 * 设置线条样式
-		 *
-		 * @param color 设置为填充样式的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
-		 */
-		setStrokeStyle(color: string): void;
-		/**
-		 * 设置阴影
-		 *
-		 * @param offsetX 阴影相对于形状在水平方向的偏移
-		 * @param offsetY 阴影相对于形状在竖直方向的偏移
-		 * @param blur 阴影的模糊级别，数值越大越模糊 0~100
-		 * @param color 阴影的颜色。 'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
-		 */
-		setShadow(offsetX: number, offsetY: number, blur: number, color: string): void;
-
-		/**
-		 * 创建一个线性的渐变颜色。
-		 * Tip: 需要使用 addColorStop() 来指定渐变点，至少要两个。
-		 * @param x0 起点的x坐标
-		 * @param y0 起点的y坐标
-		 * @param x1 终点的x坐标
-		 * @param y1 终点的y坐标
-		 *
-		 */
-		createLinearGradient(x0: number, y0: number, x1: number, y1: number): void;
-
-		/**
-		 * 创建一个颜色的渐变点。
-		 * Tip: 小于最小 stop 的部分会按最小 stop 的 color 来渲染，大于最大 stop 的部分会按最大 stop 的 color 来渲染。
-		 * Tip: 需要使用 addColorStop() 来指定渐变点，至少要两个。
-		 * @param stop (0-1)	表示渐变点在起点和终点中的位置
-		 * @param color 渐变点的颜色
-		 *
-		 */
-		addColorStop(stop: number, color: string): void;
-
-		/**
-		 * 创建一个圆形的渐变颜色。
-		 *
-		 * @param x 圆心的x坐标
-		 * @param y 圆心的y坐标
-		 * @param r 圆的半径
-		 *
-		 */
-		createCircularGradient(x: number, y: number, r: number): void;
-		/**
-		 * 设置字体大小
-		 *
-		 * @param fontSize 字体的字号
-		 */
-		setFontSize(fontSize: number): void;
-		/**
-		 * 设置线条端点的样式
-		 *
-		 * @param lineCap 线条的结束端点样式。 'butt'、'round'、'square'
-		 */
-		setLineCap(lineCap: LineCapType): void;
-		/**
-		 * 设置两线相交处的样式
-		 *  @param lineJoin 两条线相交时，所创建的拐角类型
-		 */
-		setLineJoin(lineJoin: LineJoinType): void;
-		/**
-		 * 设置线条宽度
-		 *
-		 * @param lineWidth 线条的宽度
-		 */
-		setLineWidth(lineWidth: number): void;
-		/**
-		 * 设置最大斜接长度，斜接长度指的是在两条线交汇处内角和外角之间的距离。
-		 * 当 setLineJoin为 miter 时才有效。
-		 * 超过最大倾斜长度的，连接处将以 lineJoin 为 bevel 来显示
-		 *
-		 * @param miterLimit 最大斜接长度
-		 */
-		setMiterLimit(miterLimit: number): void;
-		/**
-		 * 将之前在绘图上下文中的描述（路径、变形、样式）画到 canvas 中。
-		 * Tip: 绘图上下文需要由 wx.createCanvasContext(canvasId) 来创建。
-		 * @param [reserve] 非必填。本次绘制是否接着上一次绘制，即reserve参数为false，则在本次调用drawCanvas绘制之前native层应先清空画布再继续绘制；若reserver参数为true，则保留当前画布上的内容，本次调用drawCanvas绘制的内容覆盖在上面，默认 false
-		 *
-		 */
-		draw(reserve?: boolean): void;
-	}
-	/**
-	 * 创建并返回绘图上下文context对象。
-	 * context只是一个记录方法调用的容器，
-	 * 用于生成记录绘制行为的actions数组。c
-	 * ontext跟<canvas/>不存在对应关系，
-	 * 一个context生成画布的绘制动作数组可以应用于多个<canvas/>。
-	 */
-	function createContext(): CanvasContext;
-
-	interface DrawCanvasOptions {
-		/** 画布标识，传入 <canvas/> 的 cavas-id */
-		canvasId: number | string;
-		/**
-		 * 绘图动作数组，由 wx.createContext 创建的 context，
-		 * 调用 getActions 方法导出绘图动作数组。
-		 */
-		actions: CanvasAction[];
-	}
-	/**
-	 * 绘制画布
-	 */
-	function drawCanvas(options: DrawCanvasOptions): void;
-
-	interface CanvasToTempFilePathOptions extends BaseOptions {
-		/**
-		 * 画布标识，传入 <canvas/> 的 cavas-id
-		 */
-		canvasId: string;
-	}
-	/**
-	 * 把当前画布的内容导出生成图片，并返回文件路径
-	 */
-	function canvasToTempFilePath(options: CanvasToTempFilePathOptions): void;
-}
-// 界面-----下拉刷新
-declare namespace wx {
-	interface Page {
-		/**
-		 * 在 Page 中定义 onPullDownRefresh 处理函数，监听该页面用户下拉刷新事件。
-		 * 需要在 config 的window选项中开启 enablePullDownRefresh。
-		 * 当处理完数据刷新后，wx.stopPullDownRefresh可以停止当前页面的下拉刷新。
-		 */
-		onPullDownRefresh(): void;
-	}
-	/**
-	 * 停止当前页面下拉刷新。
-	 *
-	 */
-	function stopPullDownRefresh(): void;
-}
-// 开放接口-----登陆
-// [签名加密](https://mp.weixin.qq.com/debug/wxadoc/dev/api/signature.html)
-declare namespace wx {
-	/**
-	 * 登录态维护
-	 * 通过 wx.login() 获取到用户登录态之后，需要维护登录态。
-	 * 开发者要注意不应该直接把 session_key、openid 等字段作为用户的标识
-	 * 或者 session 的标识，而应该自己派发一个 session 登录态（请参考登录时序图）。
-	 * 对于开发者自己生成的 session，应该保证其安全性且不应该设置较长的过期时间。
-	 * session 派发到小程序客户端之后，可将其存储在 storage ，用于后续通信使用。
-	 * 通过wx.checkSession() 检测用户登录态是否失效。并决定是否调用wx.login()
-	 * 重新获取登录态
-	 */
-	interface LoginResponse {
-		/** 调用结果 */
-		errMsg: string;
-		/**
-		 * 用户允许登录后，回调内容会带上 code（有效期五分钟），
-		 * 开发者需要将 code 发送到开发者服务器后台，
-		 * 使用code 换取 session_key api，
-		 * 将 code 换成 openid 和 session_key
-		 */
-		code: string;
-	}
-	interface LoginOptions extends BaseOptions {
-		/** 接口调用成功的回调函数 */
-		success?(res: LoginResponse): void;
-	}
-
-	/**
-	 * 调用接口获取登录凭证（code）进而换取用户登录态信息，
-	 * 包括用户的唯一标识（openid） 及本次登录的 会话密钥（session_key）。
-	 * 用户数据的加解密通讯需要依赖会话密钥完成。
-	 */
-	function login(option: LoginOptions): void;
-	type CheckSessionOption = BaseOptions;
-	/**
-	 * 检测当前用户登录态是否有效。
-	 * 通过wx.login获得的用户登录态拥有一定的时效性。用户越久未使用小程序，用户登录态越有可能失效。反之如果用户一直在使用小程序，则用户登录态一直保持有效。具体时效逻辑由微信维护，对开发者透明。开发者只需要调用wx.checkSession接口检测当前用户登录态是否有效。登录态过期后开发者可以再调用wx.login获取新的用户登录态。
-	 *
-	 */
-	function checkSession(options: CheckSessionOption): void;
-}
-// 开放接口-----用户信息
-declare namespace wx {
-	interface UserInfo {
-		nickName: string;
-		avatarUrl: string;
-		gender: number;
-		province: string;
-		city: string;
-		country: string;
-	}
-	interface UserInfoResponse {
-		/** 用户信息对象，不包含 openid 等敏感信息 */
-		userInfo: UserInfo;
-		/** 不包括敏感信息的原始数据字符串，用于计算签名。 */
-		rawData: string;
-		/** 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息。 */
-		signature: string;
-		/** 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法 */
-		encryptData: string;
-	}
-	interface GetUserInfoOptions extends BaseOptions {
-		/** 接口调用成功的回调函数 */
-		success?(res: UserInfoResponse): void;
-	}
-	/**
-	 * 获取用户信息，需要先调用 wx.login 接口。
-	 */
-	function getUserInfo(options: GetUserInfoOptions): void;
-}
-// 开放接口-----微信支付
-declare namespace wx {
-	type PaymentSignType = 'MD5';
-	interface RequestPaymentOptions extends BaseOptions {
-		/** 时间戳从1970年1月1日00:00:00至今的秒数,即当前的时间 */
-		timeStamp: string | number;
-		/** 随机字符串，长度为32个字符以下。 */
-		nonceStr: string;
-		/** 统一下单接口返回的 prepay_id 参数值，提交格式如：prepay_id=* */
-		package: string;
-		/** 签名算法，暂支持 MD5 */
-		signType: PaymentSignType;
-		/** 签名,具体签名方案参见微信公众号支付帮助文档; */
-		paySign: string;
-	}
-	/**
-	 * 发起微信支付。
-	 */
-	function requestPayment(options: RequestPaymentOptions): void;
-}
-// 开放接口-----分享
-declare namespace wx {
-	interface ShareAppMessage extends BaseOptions {
-		/**
-		 * 分享标题	默认为当前小程序名称
-		 *
-		 */
-		title?: string;
-		/**
-		 * 分享路径	当默认为前页面 path ，
-		 * 必须是以 / 开头的完整路径
-		 *
-		 */
-		path?: string;
-	}
-	interface Page {
-		onShareAppMessage(): ShareAppMessage;
-	}
-
-	type ShareMenuOptions = BaseOptions;
-	/**
-	 * 显示分享按钮
-	 *
-	 */
-	function showShareMenu(options?: ShareMenuOptions): void;
-	/**
-	 * 隐藏分享按钮
-	 *
-	 */
-	function hideShareMenu(options?: ShareMenuOptions): void;
-}
-// 开放接口-----收货地址
-declare namespace wx {
-	interface ChooseAddressOptions extends BaseOptions {
-		success?(res: {
-			/**
-			 * 调用结果
-			 *
-			 */
-			errMsg: string;
-			/**
-			 * 收货人姓名
-			 *
-			 */
-			userName: string;
-			/**
-			 * 邮编
-			 *
-			 */
-			postalCode: string;
-			/**
-			 * 国标收货地址第一级地址
-			 *
-			 */
-			provinceName: string;
-			/**
-			 * 国标收货地址第二级地址
-			 *
-			 */
-			cityName: string;
-			/**
-			 * 国标收货地址第三级地址
-			 *
-			 */
-			countyName: string;
-			/**
-			 * 详细收货地址信息
-			 *
-			 */
-			detailInfo: string;
-			/**
-			 * 收货地址国家码
-			 *
-			 */
-			nationalCode: string;
-			/**
-			 * 收货人手机号码
-			 *
-			 */
-			telNumber: string;
-		}): void;
-	}
-	function chooseAddress(options: ChooseAddressOptions): void;
-}
-// 开放接口-----卡券
-declare namespace wx {
-	interface Card {
-		cardId: string;
-		cardExt: string;
-		code: string;
-	}
-	interface CardOptions extends BaseOptions {
-		cardList: Card[];
-	}
-	/**
-	 * 批量添加卡券。
-	 *
-	 */
-	function addCard(options: ChooseAddressOptions): void;
-	interface OpenCardOptions extends BaseOptions {
-		cardList: Card[];
-	}
-	/**
-	 * 查看微信卡包中的卡券。
-	 *
-	 */
-	function openCard(options: OpenCardOptions): void;
-}
-// 开放接口-----设置
-declare namespace wx {
-	interface AuthSetting {
-		'scope.userInfo': boolean;
-		'scope.userLocation': boolean;
-		'scope.address': boolean;
-		'scope.record': boolean;
-	}
-	interface OpenSettingOptions extends BaseOptions {
-		success?(res: {
-			authSetting: AuthSetting
-		}): void;
-	}
-	function openSetting(options: OpenSettingOptions): void;
-}
-// 拓展接口
-declare namespace wx {
-	/**
-	 * 将 ArrayBuffer 数据转成 Base64 字符串
-	 *
-	 */
-	function arrayBufferToBase64(arrayBuffer: ArrayBuffer): string;
-	/**
-	 * 将 Base64 字符串转成 ArrayBuffer 数据
-	 *
-	 */
-	function base64ToArrayBuffer(base64: string): ArrayBuffer;
-}
-declare namespace wx {
-	/**
-	 * 收起键盘。
-	 */
-	function hideKeyboard(): void;
-}
-
-// Page
-declare namespace wx {
-	interface Page {
-		/**
-		 * setData 函数用于将数据从逻辑层发送到视图层，
-		 * 同时改变对应的 this.data 的值。
-		 * 注意：
-		 *    1. 直接修改 this.data 无效，无法改变页面的状态，还会造成数据不一致。
-		 *    2. 单次设置的数据不能超过1024kB，请尽量避免一次设置过多的数据。
-		 */
-		setData(data: any): void;
-	}
-	/**
-	 * Page() 函数用来注册一个页面。
-	 * 接受一个 object 参数，其指定页面的初始数据、生命周期函数、事件处理函数等。
-	 */
-	type PageConstructor = (options: wx.PageOptions) => void;
-}
-declare var Page: wx.PageConstructor;
-// App
-declare namespace wx {
-	interface App {
-		/**
-		 * getCurrentPage() 函数用户获取当前页面的实例。
-		 * @deprecated
-		 */
-		getCurrentPage(): Page;
-	}
-	/**
-	 * App() 函数用来注册一个小程序。
-	 * 接受一个 object 参数，其指定小程序的生命周期函数等。
-	 */
-	type AppConstructor = (options: wx.AppOptions) => void;
-}
-
-declare namespace wx {
-	interface EventTarget {
-		id: string;
-		tagName: string;
-		dataset: { [name: string]: string; };
-	}
-	interface BaseEvent {
-		type: 'tap' | 'touchstart' | 'touchmove' | 'touchcancel' | 'touchend' | 'tap' | 'longtap';
-		timeStamp: number;
-		currentTarget: EventTarget;
-		target: EventTarget;
-	}
-}
-
-declare namespace wx {
-	interface InputEvent extends BaseEvent {
-		detail: {
-			target: EventTarget;
-			value: string;
-		};
-	}
-}
-
-declare namespace wx {
-	interface FormEvent extends BaseEvent {
-		detail: {
-			target: EventTarget;
-			value: { [name: string]: string | boolean | number; };
-		};
-	}
-}
-
-declare namespace wx {
-	interface Touch {
-		identifier: number;
-		pageX: number;
-		pageY: number;
-		clientX: number;
-		clientY: number;
-	}
-	interface TouchEvent extends BaseEvent {
-		detail: {
-			x: number;
-			y: number;
-		};
-		touches: Touch[];
-		changedTouches: Touch[];
-	}
-}
-
-declare var App: wx.AppConstructor;
-
+// #endregion
+// #region App 函数及参数
 /**
- * 我们提供了全局的 getApp() 函数，可以获取到小程序实例。
+ * App 实现的接口对象
+ * 开发者可以添加任意的函数或数据到 Object 参数中，用 this 可以访问
  */
-declare function getApp(): wx.App;
+interface AppOptions {
+  /**
+   * 监听小程序初始化。
+   * 当小程序初始化完成时，会触发 onLaunch（全局只触发一次）
+   * 生命周期函数
+   */
+  onLaunch?: (option: LaunchOptions) => void;
+  /**
+   * 监听小程序显示。
+   * 当小程序启动，或从后台进入前台显示，会触发 onShow
+   * 生命周期函数
+   */
+  onShow?: (option: LaunchOptions) => void;
+  /**
+   * 监听小程序隐藏。
+   * 当小程序从前台进入后台，会触发 onHide
+   * 生命周期函数
+   */
+  onHide?: () => void;
+  /**
+   * 错误监听函数
+   * 当小程序发生脚本错误或者 api 调用失败时
+   * 会触发 onError 并带上错误信息
+   */
+  onError?: (msg: string) => void;
+  /**
+   * 小程序退出时触发
+   */
+  onUnlaunch?: () => void;
+  /**
+   * 全局Data
+   */
+  globalData?: object;
+}
+interface App {
+  /**
+   * 获取当前页面
+   */
+  getCurrentPage(): Page;
+}
+/**
+ * App() 函数用来注册一个小程序。
+ * 接受一个 object 参数，其指定小程序的生命周期函数等。
+ */
+declare function App<T extends AppOptions>(app: T & ThisType<T & App>): void;
+/**
+ * 获取小程序实例
+ */
+declare function getApp(): App;
+// #endregion
+// #region Compontent组件
+type DefaultData<V> = object | ((this: V) => object);
+type DefaultProps = Record<string, any>;
+type ExtendedComponent<Instance extends Component<Data>, Data, Methods, Options, Props> = CombinedInstance<Instance, Data, Methods, Options, Props> & Component<Data>;
+type CombinedInstance<Instance extends Component<Data>, Data, Methods, Options, Props> = Data & Methods & Options & Props & Instance;
+type Prop<T> = (() => T) | { new(...args: any[]): T & object };
+type PropValidator<T> = PropOptions<T> | Prop<T> | Array<Prop<T>>;
+interface DefaultMethods<V> {
+  [key: string]: (this: V, ...args: any[]) => any;
+}
+interface PropOptions<T = any> {
+  type?: Prop<T> | Array<Prop<T>>;
+  value?: T | null | (() => object);
+  observer?(value: T, old: T): void;
+}
+type RecordPropsDefinition<T> = {
+  [K in keyof T]: PropValidator<T[K]>
+};
+type ArrayPropsDefinition<T> = Array<keyof T>;
+type PropsDefinition<T> = ArrayPropsDefinition<T> | RecordPropsDefinition<T>;
+type ThisTypedComponentOptionsWithRecordProps<V extends Component<Data>, Data, Methods, Options, Props> =
+  object &
+  ComponentOptions<V, Data | ((this: Readonly<Props> & V) => Data), Methods, Options, PropsDefinition<Props>> &
+  ThisType<CombinedInstance<V, Data, Methods, Options, Readonly<Props>>>;
 
-declare function getCurrentPages(): wx.Page[];
+interface ComponentRelation {
+  /** 目标组件的相对关系，可选的值为 parent 、 child 、 ancestor 、 descendant */
+  type: string;
+  /** 如果这一项被设置，则它表示关联的目标节点所应具有的behavior，所有拥有这一behavior的组件节点都会被关联 */
+  target?: string;
+  /** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */
+  linked?: (...args: any[]) => void;
+  /** 关系生命周期函数，当关系在页面节点树中发生改变时触发，触发时机在组件moved生命周期之后 */
+  linkChanged?: (...args: any[]) => void;
+  /** 关系生命周期函数，当关系脱离页面节点树时触发，触发时机在组件detached生命周期之后 */
+  unlinked?: (...args: any[]) => void;
+}
+/**
+ * Component组件参数
+ */
+interface ComponentOptions<
+  Instance extends Component<Data>,
+  Data = DefaultData<Instance>,
+  Methods = DefaultMethods<Instance>,
+  Options = object,
+  Props = PropsDefinition<DefaultProps>> {
+  /**
+   * 组件的对外属性，是属性名到属性设置的映射表
+   * 属性设置中可包含三个字段:
+   * type 表示属性类型、 value 表示属性初始值、 observer 表示属性值被更改时的响应函数
+   */
+  properties?: Props;
+  /**
+   * 组件的内部数据，和 properties 一同用于组件的模版渲染
+   */
+  data?: Data;
+  /**
+   * 组件的方法，包括事件响应函数和任意的自定义方法
+   * 关于事件响应函数的使用
+   * 参见[组件事件](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/events.html)
+   */
+  methods?: Methods;
+  /**
+   * 一些组件选项，请参见文档其他部分的说明
+   */
+  options?: Options;
+  /**
+   * 类似于mixins和traits的组件间代码复用机制
+   * 参见 [behaviors](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/behaviors.html)
+   */
+  behaviors?: Array<(ComponentOptions<Component<object>>) | string>;
+  /**
+   * 组件生命周期函数，在组件实例进入页面节点树时执行
+   * 注意此时不能调用 setData
+   */
+  created?(this: ThisType<ComponentOptions<Instance, Data, Methods, Options, Readonly<Props>>>): void;
+  /**
+   * 组件生命周期函数，在组件实例进入页面节点树时执行
+   */
+  attached?(): void;
+  /**
+   * 组件生命周期函数，在组件布局完成后执行，此时可以获取节点信息
+   * 使用 [SelectorQuery](https://mp.weixin.qq.com/debug/wxadoc/dev/api/wxml-nodes-info.html)
+   */
+  ready?(): void;
+  /**
+   * 组件生命周期函数，在组件实例被移动到节点树另一个位置时执行
+   */
+  moved?(): void;
+  /**
+   * 组件生命周期函数，在组件实例被从页面节点树移除时执行
+   */
+  detached?(): void;
+  /**
+   * 组件间关系定义，参见 [组件间关系](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/relations.html)
+   */
+  relations?: { [key: string]: ComponentRelation };
+}
+/**
+ * Component实例方法
+ */
+interface Component<T> {
+  /**
+   * 组件的文件路径
+   */
+  is: string;
+  /**
+   * 节点id
+   */
+  id: string;
+  /**
+   * 节点dataset
+   */
+  dataset: string;
+  /**
+   * 组件数据，包括内部数据和属性值
+   */
+  data: T;
+  /**
+   * 设置data并执行视图层渲染
+   */
+  setData(data: object): void;
+  /**
+   * 检查组件是否具有 behavior
+   * 检查时会递归检查被直接或间接引入的所有behavior
+   */
+  hasBehavior(behavior: any): void;
+  /**
+   * 触发事件，参见 [组件事件](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/events.html)
+   */
+  triggerEvent(name: string): void;
+  /**
+   * 创建一个 SelectorQuery 对象
+   * 选择器选取范围为这个[组件实例](https://mp.weixin.qq.com/debug/wxadoc/dev/api/wxml-nodes-info.html)内
+   */
+  createSelectorQuery(query: string): void;
+  /**
+   * 使用选择器选择组件实例节点
+   * 返回匹配到的第一个组件实例对象
+   */
+  selectComponent(selector: string): void;
+  /**
+   * selector  使用选择器选择组件实例节点，返回匹配到的全部组件实例对象组成的数组
+   */
+  selectAllComponents(selector: string): void;
+  /**
+   * 获取所有这个关系对应的所有关联节点，参见 [组件间关系](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/relations.html)
+   */
+  getRelationNodes(relationKey: string): void;
+}
+declare function Component<D, M, O, P>(options?: ThisTypedComponentOptionsWithRecordProps<Component<D>, D, M, O, P>): ExtendedComponent<Component<D>, D, M, O, P>;
+/**
+ * behaviors 是用于组件间代码共享的特性
+ * 类似于一些编程语言中的“mixins”或“traits”
+ * 每个 behavior 可以包含一组属性、数据、生命周期函数和方法
+ * 组件引用它时，它的属性、数据和方法会被合并到组件中，生命周期函数也会在对应时机被调用
+ * 每个组件可以引用多个 behavior
+ * behavior 也可以引用其他 behavior
+ */
+declare function Behavior<D, M, O, P>(options?: ThisTypedComponentOptionsWithRecordProps<Component<D>, D, M, O, P>): ExtendedComponent<Component<D>, D, M, O, P>;
+// #endregion
+// #region Page
+interface PageShareAppMessageOptions {
+  /** 转发事件来源。button：页面内转发按钮；menu：右上角转发菜单 */
+  from: 'button' | 'menu';
+  /** 如果 from 值是 button，则 target 是触发这次转发事件的 button，否则为 undefined */
+  target: object | undefined;
+}
+/**
+ * Page 实现的接口对象
+ */
+interface PageOptions {
+  /**
+   * 页面的初始数据
+   */
+  data?: any;
+  /**
+   * 生命周期函数--监听页面加载
+   * @param options 接收页面参数可以获取wx.navigateTo和wx.redirectTo及<navigator/>中的 query
+   */
+  onLoad?: (options: object) => void;
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady?: () => void;
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow?: () => void;
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide?: () => void;
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload?: () => void;
+  /**
+   * 下拉刷新
+   * 在 Page 中定义 onPullDownRefresh 处理函数，监听该页面用户下拉刷新事件。
+   * 需要在 config 的window选项中开启 enablePullDownRefresh。
+   * 当处理完数据刷新后，wx.stopPullDownRefresh可以停止当前页面的下拉刷新。
+   */
+  onPullDownRefresh?: () => void;
+  /**
+   * 页面上拉触底事件的处理函数
+   * 监听用户上拉触底事件。
+   * 可以在app.json的window选项中或页面配置中设置触发距离onReachBottomDistance。
+   * 在触发距离内滑动期间，本事件只会被触发一次。
+   */
+  onReachBottom?: () => void;
+  /**
+   * 在 Page 中定义 onShareAppMessage 函数，设置该页面的转发信息。
+   * + 只有定义了此事件处理函数，右上角菜单才会显示 “转发” 按
+   * + 用户点击转发按钮的时候会调
+   * + 此事件需要 return 一个 Object，用于自定义转发内容
+   */
+  onShareAppMessage?: (options?: PageShareAppMessageOptions) => wx.ShareAppMessage;
+  /**
+   * 页面滚动触发事件的处理函数
+   * 监听用户滑动页面事件。
+   * 参数为 Object，包含以下字段：
+   */
+  onPageScroll?: (option: { scrollTop: number }) => void;
+  /**
+   * 当前是 tab 页时，点击 tab 时触发
+   */
+  onTabItemTap?: (item: any) => void;
+}
+interface Page {
+  /**
+   * 强制更新
+   */
+  forceUpdate(): void;
+  /**
+   * 字段可以获取到当前页面的路径。
+   */
+  route(): void;
+  /**
+   * 将数据从逻辑层发送到视图层，同时改变对应的 this.data 的值
+   * 1. 直接修改 this.data 而不调用 this.setData 是无法改变页面的状态的，还会造成数据不一致。
+   * 2. 单次设置的数据不能超过1024kB，请尽量避免一次设置过多的数据。
+   * 3. 请不要把 data 中任何一项的 value 设为 undefined ，否则这一项将不被设置并可能遗留一些潜在问题
+   * @param data object 以 key，value 的形式表示将 this.data 中的 key 对应的值改变成 value
+   * @param [callback] callback 是一个回调函数，在这次setData对界面渲染完毕后调用
+   */
+  setData(data: { [key: string]: string | number | boolean | symbol | object | null | any[] }, callback?: () => any): void;
+  /**
+   * 更新
+   */
+  update(): void;
+  /**
+   * 将页面滚动到目标位置。
+   *
+   * scrollTop 滚动到页面的目标位置（单位px）
+   * [duration] 滚动动画的时长，默认300ms，单位 ms
+   * @version 1.4.0
+   */
+  pageScrollTo(option?: wx.PageScrollToOptions): void;
+}
+/**
+ * Page() 函数用来注册一个页面。
+ * 接受一个 object 参数，其指定页面的初始数据、生命周期函数、事件处理函数等。
+ */
+declare function Page<T extends PageOptions & object>(page: T & ThisType<T & Page>): void;
+/**
+ * getCurrentPages() 函数用于获取当前页面栈的实例，
+ * 以数组形式按栈的顺序给出，第一个元素为首页，最后一个元素为当前页面。
+ */
+declare function getCurrentPages(): Page[];
+
+// #endregion
diff --git a/types/weixin-app/tsconfig.json b/types/weixin-app/tsconfig.json
index 4b2efcd908..ea0864e5f1 100644
--- a/types/weixin-app/tsconfig.json
+++ b/types/weixin-app/tsconfig.json
@@ -1,24 +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",
-        "weixin-app-tests.ts"
-    ]
+  "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",
+      "weixin-app-tests.ts"
+  ]
 }
\ No newline at end of file
diff --git a/types/weixin-app/tslint.json b/types/weixin-app/tslint.json
index 28e4bbd73b..f9013c5df0 100644
--- a/types/weixin-app/tslint.json
+++ b/types/weixin-app/tslint.json
@@ -1,10 +1,7 @@
 {
-	"extends": "dtslint/dt.json",
-	"rules": {
-		// TODOs
-		"no-any-union": false,
-		"no-irregular-whitespace": false,
-		"no-mergeable-namespace": false,
-		"no-unnecessary-qualifier": false
-	}
-}
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "no-any-union": false,
+    "no-unnecessary-generics": false
+  }
+}
\ No newline at end of file
diff --git a/types/weixin-app/weixin-app-tests.ts b/types/weixin-app/weixin-app-tests.ts
index 30fa55838d..0430dd9115 100644
--- a/types/weixin-app/weixin-app-tests.ts
+++ b/types/weixin-app/weixin-app-tests.ts
@@ -1 +1,293 @@
 getCurrentPages();
+
+let behavior = Behavior({
+  behaviors: [],
+  properties: {
+    myBehaviorProperty: {
+      type: String
+    }
+  },
+  data: {
+    myBehaviorData: {}
+  },
+  attached() { },
+  methods: {
+    myBehaviorMethod() {
+      this.myBehaviorData;
+    }
+  }
+});
+
+Component({
+  behaviors: [behavior, 'wx://form-field'],
+
+  properties: {
+    myProperty: { // 属性名
+      type: String, // 类型（必填），目前接受的类型包括：String, Number, Boolean, Object, Array, null（表示任意类型）
+      value: '', // 属性初始值（可选），如果未指定则会根据类型选择一个
+      observer(newVal: string, oldVal: string) { } // 属性被改变时执行的函数（可选），也可以写成在methods段中定义的方法名字符串, 如：'_propertyChange'
+    },
+    myProperty2: String // 简化的定义方式
+  },
+  data: {}, // 私有数据，可用于模版渲染
+
+  // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
+  attached() { },
+  moved() { },
+  detached() { },
+  methods: {
+    onMyButtonTap() {
+      this.setData({
+        // 更新属性和数据的方法与更新页面数据的方法类似
+      });
+    },
+    _myPrivateMethod() {
+      // 内部方法建议以下划线开头
+      // this.replaceDataOnPath(['A', 0, 'B'], 'myPrivateData'); // 这里将 data.A[0].B 设为 'myPrivateData'
+      // this.applyDataUpdates();
+    },
+    _propertyChange(newVal: string, oldVal: string) {
+      //
+    }
+  },
+  relations: {
+    './custom-ul': {
+      type: 'parent', // 关联的目标节点应为父节点
+      linked(target) {
+        // 每次被插入到custom-ul时执行，target是custom-ul节点实例对象，触发在attached生命周期之后
+      },
+      linkChanged(target) {
+        // 每次被移动后执行，target是custom-ul节点实例对象，触发在moved生命周期之后
+      },
+      unlinked(target) {
+        // 每次被移除时执行，target是custom-ul节点实例对象，触发在detached生命周期之后
+      }
+    }
+  }
+});
+
+// index.js
+Page({
+  data: {
+    text: "This is page data."
+  },
+  onLoad: () => {
+    // Do some initialize when page load.
+  },
+  onReady: () => {
+    // Do something when page ready.
+  },
+  onShow: () => {
+    // Do something when page show.
+  },
+  onHide: () => {
+    // Do something when page hide.
+  },
+  onUnload: () => {
+    // Do something when page close.
+  },
+  onPullDownRefresh: () => {
+    // Do something when pull down.
+  },
+  onReachBottom: () => {
+    // Do something when page reach bottom.
+  },
+  onShareAppMessage: (res) => {
+    if (res && res.from === 'menu') {
+      //
+    }
+    // return custom share data when user share.
+    return {
+      success(res) {
+        console.log(res.shareTickets.length);
+      }
+    };
+  },
+  onPageScroll: () => {
+    // this.
+    // Do something when page scroll
+  },
+  onTabItemTap(item: any) {
+    this.setData({
+      1: null,
+      _2: "undefined"
+    });
+    console.log(item.index);
+    console.log(item.pagePath);
+    console.log(item.text);
+  },
+  // Event handler.
+  viewTap() {
+    this.setData({
+      text: 'Set some data for updating view.'
+    }, () => {
+      // this is setData callback
+    });
+  },
+  customData: {
+    hi: 'MINA'
+  }
+});
+
+Page({
+  getScrollOffset: () => {
+    wx.createSelectorQuery().selectViewport().scrollOffset((res) => {
+      res.id;      // 节点的ID
+      res.dataset; // 节点的dataset
+      res.scrollLeft; // 节点的水平滚动位置
+      res.scrollTop;  // 节点的竖直滚动位置
+    }).exec();
+  }
+});
+
+Page({
+  getFields: () => {
+    wx.createSelectorQuery().select('#the-id').fields({
+      id: true,
+      dataset: true,
+      size: true,
+      scrollOffset: true,
+      properties: ['scrollX', 'scrollY']
+    }, (res) => {
+      // res.
+      res.dataset;    // 节点的dataset
+      res.width;      // 节点的宽度
+      res.height;     // 节点的高度
+      res.scrollLeft; // 节点的水平滚动位置
+      res.scrollTop;  // 节点的竖直滚动位置
+      res.scrollX;    // 节点 scroll-x 属性的当前值
+      res.scrollY;    // 节点 scroll-x 属性的当前值
+    }).exec();
+  }
+});
+
+Page({
+  getRect: () => {
+    wx.createSelectorQuery().select('#the-id').boundingClientRect((rect: wx.NodesRefRect) => {
+      rect.id;      // 节点的ID
+      rect.dataset; // 节点的dataset
+      rect.left;    // 节点的左边界坐标
+      rect.right;   // 节点的右边界坐标
+      rect.top;     // 节点的上边界坐标
+      rect.bottom;  // 节点的下边界坐标
+      rect.width;   // 节点的宽度
+      rect.height;  // 节点的高度
+    }).exec();
+  },
+  getAllRects: () => {
+    wx.createSelectorQuery().selectAll('.a-class').boundingClientRect((rects: wx.NodesRefRect[]) => {
+      rects.forEach((rect) => {
+        rect.id;      // 节点的ID
+        rect.dataset; // 节点的dataset
+        rect.left;    // 节点的左边界坐标
+        rect.right;   // 节点的右边界坐标
+        rect.top;     // 节点的上边界坐标
+        rect.bottom;  // 节点的下边界坐标
+        rect.width;   // 节点的宽度
+        rect.height;  // 节点的高度
+      });
+    }).exec();
+  }
+});
+
+const recorderManager = wx.getRecorderManager();
+
+recorderManager.onStart(() => {
+  console.log('recorder start');
+});
+recorderManager.onResume(() => {
+  console.log('recorder resume');
+});
+recorderManager.onPause(() => {
+  console.log('recorder pause');
+});
+recorderManager.onStop((res) => {
+  console.log('recorder stop', res);
+  const { tempFilePath } = res;
+});
+recorderManager.onFrameRecorded((res) => {
+  const { frameBuffer } = res;
+  console.log('frameBuffer.byteLength', frameBuffer.byteLength);
+});
+
+const options = {
+  duration: 10000,
+  sampleRate: 44100,
+  numberOfChannels: 1,
+  encodeBitRate: 192000,
+  format: 'aac',
+  frameSize: 50
+};
+
+recorderManager.start(options);
+
+wx.onGetWifiList((res) => {
+  if (res.wifiList.length) {
+    wx.setWifiList({
+      wifiList: [{
+        SSID: res.wifiList[0].SSID,
+        BSSID: res.wifiList[0].BSSID,
+        password: '123456'
+      }]
+    });
+  } else {
+    wx.setWifiList({
+      wifiList: []
+    });
+  }
+});
+wx.getWifiList();
+
+wx.onWifiConnected((wifi) => {
+  // wifi.BSSID
+});
+
+wx.getConnectedWifi({
+  success(result) {
+    result.signalStrength;
+  }
+});
+
+wx.getWeRunData({
+  success(res) {
+    const encryptedData = res.encryptedData;
+  }
+});
+
+const uploadTask = wx.uploadFile({
+  url: 'http://example.weixin.qq.com/upload', // 仅为示例，非真实的接口地址
+  filePath: '/local/folder/file.ext',
+  name: 'file',
+  formData: {
+    user: 'test'
+  },
+  success: (res) => {
+    const data = res.data;
+    // do something
+  }
+});
+
+uploadTask.onProgressUpdate((res) => {
+  console.log('上传进度', res.progress);
+  console.log('已经上传的数据长度', res.totalBytesSent);
+  console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend);
+});
+
+uploadTask.abort(); // 取消上传任务
+
+const downloadTask = wx.downloadFile({
+  url: 'http://example.com/audio/123', // 仅为示例，并非真实的资源
+  success: (res) => {
+    wx.playVoice({
+      filePath: res.tempFilePath
+    });
+  }
+});
+
+downloadTask.onProgressUpdate((res) => {
+  console.log('下载进度', res.progress);
+  console.log('已经下载的数据长度', res.totalBytesWritten);
+  console.log('预期需要下载的数据总长度', res.totalBytesExpectedToWrite);
+});
+
+downloadTask.abort(); // 取消下载任务

From ebb032ad3a6ae568c5a2d75a318f87faa326fe70 Mon Sep 17 00:00:00 2001
From: Syncfusion-JavaScript <packages@syncfusion.com>
Date: Fri, 23 Feb 2018 14:31:41 +0530
Subject: [PATCH 221/388] Update Typescript file

---
 types/ej.web.all/ej.web.all-tests.ts | 1352 +++++++++++++-------------
 types/ej.web.all/index.d.ts          |    1 -
 2 files changed, 676 insertions(+), 677 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"
         });
     });
 
diff --git a/types/ej.web.all/index.d.ts b/types/ej.web.all/index.d.ts
index 2f1d415175..03f6b12c24 100644
--- a/types/ej.web.all/index.d.ts
+++ b/types/ej.web.all/index.d.ts
@@ -16,7 +16,6 @@
 *  applicable laws.
 */
 declare namespace ej {
-    /* tslint:disable:no-empty-interface */
     const dataUtil: dataUtil;
     function isMobile(): boolean;
     function isIOS(): boolean;

From ed8e6ff42de34d2d44b4d1af7fc206f750e754b4 Mon Sep 17 00:00:00 2001
From: Veit Lehmann <levito@users.noreply.github.com>
Date: Thu, 22 Feb 2018 23:20:57 +0100
Subject: [PATCH 222/388] react-navigation: update for v1.1

---
 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 2c3c384ac6..909d72d413 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.0
+// Type definitions for react-navigation 1.1
 // Project: https://github.com/react-community/react-navigation
 // Definitions by: Huhuanming <https://github.com/huhuanming>
 //                 mhcgrq <https://github.com/mhcgrq>
@@ -11,6 +11,7 @@
 //                 Tim Wang <https://github.com/timwangdev>
 //                 Qibang Sun <https://github.com/bang88>
 //                 Sergei Butko: <https://github.com/svbutko>
+//                 Veit Lehmann: <https://github.com/levito>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -278,6 +279,7 @@ export type NavigationStackScreenOptions = NavigationScreenOptions & {
 };
 
 export interface NavigationStackRouterConfig {
+  headerTransitionPreset?: 'fade-in-place' | 'uikit';
   initialRouteName?: string;
   initialRouteParams?: NavigationParams;
   paths?: NavigationPathsConfig;
@@ -608,6 +610,8 @@ export interface TabViewConfig {
 
 // From navigators/TabNavigator.js
 export interface TabNavigatorConfig extends NavigationTabRouterConfig, TabViewConfig {
+  lazy?: boolean;
+  removeClippedSubviews?: boolean;
   initialLayout?: { height: number, width: number };
 }
 

From 060e346f624fbc533f0e2c4e54f7c23a7b46757c Mon Sep 17 00:00:00 2001
From: Ben Stevens <ben@nebstone.co.uk>
Date: Fri, 23 Feb 2018 13:04:58 +0000
Subject: [PATCH 223/388] add types for jsontoxml

---
 types/jsontoxml/index.d.ts         | 22 ++++++++++++++++++++++
 types/jsontoxml/jsontoxml-tests.ts | 10 ++++++++++
 types/jsontoxml/tsconfig.json      | 24 ++++++++++++++++++++++++
 types/jsontoxml/tslint.json        |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 types/jsontoxml/index.d.ts
 create mode 100644 types/jsontoxml/jsontoxml-tests.ts
 create mode 100644 types/jsontoxml/tsconfig.json
 create mode 100644 types/jsontoxml/tslint.json

diff --git a/types/jsontoxml/index.d.ts b/types/jsontoxml/index.d.ts
new file mode 100644
index 0000000000..f683050031
--- /dev/null
+++ b/types/jsontoxml/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for jsontoxml 1.0
+// Project: https://github.com/soldair/node-jsontoxml
+// Definitions by: benstevens48 <https://github.com/benstevens48>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace jsontoxml {
+    function escape(str: string): string;
+    function cdata(str: string): string;
+    interface JsonToXmlOptions {
+        escape?: boolean;
+        xmlHeader?: boolean | {standalone?: boolean};
+        docType?: string;
+        prettyPrint?: boolean;
+        indent?: string;
+        removeIllegalNameCharacters?: boolean;
+        html?: boolean;
+    }
+}
+
+declare function jsontoxml(data: any, options?: jsontoxml.JsonToXmlOptions): string;
+
+export = jsontoxml;
diff --git a/types/jsontoxml/jsontoxml-tests.ts b/types/jsontoxml/jsontoxml-tests.ts
new file mode 100644
index 0000000000..98b9da5552
--- /dev/null
+++ b/types/jsontoxml/jsontoxml-tests.ts
@@ -0,0 +1,10 @@
+import jsontoxml = require('jsontoxml');
+
+// $ExpectType string
+jsontoxml({foo: 'bar'}, {escape: true, xmlHeader: true});
+
+// $ExpectType string
+jsontoxml.escape('&test');
+
+// $ExpectType string
+jsontoxml.cdata('test');
diff --git a/types/jsontoxml/tsconfig.json b/types/jsontoxml/tsconfig.json
new file mode 100644
index 0000000000..b69f2e8fd3
--- /dev/null
+++ b/types/jsontoxml/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "esModuleInterop": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsontoxml-tests.ts"
+    ]
+}
diff --git a/types/jsontoxml/tslint.json b/types/jsontoxml/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jsontoxml/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 93821e8dc0908965ee58aeb856eca17fe473815b Mon Sep 17 00:00:00 2001
From: Eric MORAND <emorand@emakina.ch>
Date: Fri, 23 Feb 2018 16:05:18 +0100
Subject: [PATCH 224/388] Fix a typo with luxon Settings::resetCaches()

See https://moment.github.io/luxon/docs/class/src/settings.js~Settings.html#static-method-resetCaches
---
 types/luxon/index.d.ts     | 2 +-
 types/luxon/luxon-tests.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index fac0b90fe6..64fe2c8610 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -372,7 +372,7 @@ declare module 'luxon' {
             let defaultZoneName: string;
             let throwOnInvalid: boolean;
             let now: () => number;
-            function resetCache(): void;
+            function resetCaches(): void;
         }
 
         type ZoneOffsetOptions = {
diff --git a/types/luxon/luxon-tests.ts b/types/luxon/luxon-tests.ts
index 11ef254ae9..ce9d09ac8f 100644
--- a/types/luxon/luxon-tests.ts
+++ b/types/luxon/luxon-tests.ts
@@ -88,6 +88,7 @@ Settings.defaultLocale = 'en';
 Settings.defaultZoneName = 'Europe/Paris';
 Settings.now();
 Settings.now = () => 0;
+Settings.resetCaches();
 
 // $ExpectError
 Settings.defaultZone = Settings.defaultZone;

From 24b320d5a024bb503a99c88694e1769cba57c97f Mon Sep 17 00:00:00 2001
From: Achim Weimert <achim.weimert@gmail.com>
Date: Fri, 23 Feb 2018 16:34:17 +0000
Subject: [PATCH 225/388] Update jest.clearAllMocks() description

Update the description of `jest.clearAllMocks()` to the one from:
https://facebook.github.io/jest/docs/en/jest-object.html#jestclearallmocks

This also removes the `@deprecated` annotation which seems to have been invalid: The docs don't mention that this method is deprecated.
---
 types/jest/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index f83c386d09..e82da44d3c 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -56,7 +56,8 @@ declare namespace jest {
      */
     function autoMockOn(): typeof jest;
     /**
-     * @deprecated use resetAllMocks instead
+     * Clears the mock.calls and mock.instances properties of all mocks.
+     * Equivalent to calling .mockClear() on every mocked function.
      */
     function clearAllMocks(): typeof jest;
     /**

From 0824c575b27c2cbb2c348d10e4544f4e51041525 Mon Sep 17 00:00:00 2001
From: Kelvin Jin <kelvinjin@google.com>
Date: Fri, 23 Feb 2018 10:00:54 -0800
Subject: [PATCH 226/388] [shimmer] Use keyof T generics

---
 types/shimmer/index.d.ts       | 30 +++++++++++++++---------------
 types/shimmer/shimmer-tests.ts | 33 +++++++++++++++++----------------
 types/shimmer/tslint.json      |  7 ++++++-
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/types/shimmer/index.d.ts b/types/shimmer/index.d.ts
index fd62f8074c..ceb4117ae9 100644
--- a/types/shimmer/index.d.ts
+++ b/types/shimmer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/othiym23/shimmer
 // Definitions by: Kelvin Jin <https://github.com/kjin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.2
 
 declare global {
     interface Function {
@@ -12,23 +12,23 @@ declare global {
 
 declare const shimmer: {
     (options: { logger?(msg: string): void }): void;
-    wrap<T extends (...args: any[]) => any>(
-        nodule: object,
-        name: string,
-        wrapper: (original: T) => T
+    wrap<Nodule extends object, FieldName extends keyof Nodule>(
+        nodule: Nodule,
+        name: FieldName,
+        wrapper: (original: Nodule[FieldName]) => Nodule[FieldName]
     ): void;
-    massWrap<T extends (...args: any[]) => any>(
-        nodules: object[],
-        names: string[],
-        wrapper: (original: T) => T
+    massWrap<Nodule extends object, FieldName extends keyof Nodule>(
+        nodules: Nodule[],
+        names: FieldName[],
+        wrapper: (original: Nodule[FieldName]) => Nodule[FieldName]
     ): void;
-    unwrap(
-        nodule: object,
-        name: string
+    unwrap<Nodule extends object>(
+        nodule: Nodule,
+        name: keyof Nodule
     ): void;
-    massUnwrap(
-        nodules: object[],
-        names: string[]
+    massUnwrap<Nodule extends object>(
+        nodules: Nodule[],
+        names: Array<keyof Nodule>
     ): void;
 };
 
diff --git a/types/shimmer/shimmer-tests.ts b/types/shimmer/shimmer-tests.ts
index c7b51debe2..4cdeb2a507 100644
--- a/types/shimmer/shimmer-tests.ts
+++ b/types/shimmer/shimmer-tests.ts
@@ -1,23 +1,24 @@
 import * as shimmer from 'shimmer';
 
-const isWrapped: boolean = [].forEach.__wrapped || false;
+const fish = {
+  name: 'shimmer',
+  age: 1,
+  getMotto: () => 'safer monkeypatching for Node.js'
+};
 
-shimmer.wrap(Array.prototype, 'forEach', (forEach) => {
-    return (...args: any[]) => {
-      forEach(...args);
-    };
+const turtle = {
+  name: 'node',
+  age: 9
+};
+
+shimmer.wrap(fish, 'name', (originalName) => {
+  return originalName + originalName;
 });
 
-shimmer.unwrap(Array.prototype, 'forEach');
-
-shimmer.massWrap([Map.prototype, Set.prototype], ['clear', 'forEach'], (fn) => {
-    return (...args: any[]) => {
-      const result = fn(...args);
-      if (result) {
-        throw new Error();
-      }
-      return result;
-    };
+shimmer.massWrap([fish, turtle], ['age'], (originalAge) => {
+  return Math.pow(originalAge, 2);
 });
 
-shimmer.massUnwrap([Map.prototype, Set.prototype], ['clear', 'forEach']);
+shimmer.unwrap(fish, 'name');
+
+shimmer.massUnwrap([fish, turtle], ['age']);
diff --git a/types/shimmer/tslint.json b/types/shimmer/tslint.json
index 3db14f85ea..4c4fc86ace 100644
--- a/types/shimmer/tslint.json
+++ b/types/shimmer/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "strict-export-declare-modifiers": false
+    }
+}

From 50aaafe653630be98697ea65c1e19062c5080c55 Mon Sep 17 00:00:00 2001
From: Flarna <deb2001-github@yahoo.de>
Date: Sat, 24 Feb 2018 00:14:04 +0100
Subject: [PATCH 227/388] [sinon] add calledOnceWithExactly() and
 calledOnceWith() added in 4.3.0

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

diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index f0433a694e..eb37be5e44 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Sinon 4.1
+// Type definitions for Sinon 4.3
 // Project: http://sinonjs.org/
 // Definitions by: William Sears <https://github.com/mrbigdog2u>
 //                 Jonathan Little <https://github.com/rationull>
@@ -26,6 +26,8 @@ declare namespace Sinon {
         calledOn(obj: any): boolean;
         calledWith(...args: any[]): boolean;
         calledWithExactly(...args: any[]): boolean;
+        calledOnceWith(...args: any[]): boolean;
+        calledOnceWithExactly(...args: any[]): boolean;
         calledWithMatch(...args: any[]): boolean;
         notCalledWith(...args: any[]): boolean;
         notCalledWithMatch(...args: any[]): boolean;
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index 2e2286e538..4311901355 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -85,6 +85,8 @@ function testNine() {
     callback.alwaysCalledWithMatch({ y: 5 });
     callback.neverCalledWithMatch({ x: 6 });
     callback.notCalledWithMatch({ x: 6 });
+    callback.calledOnceWith({ x: 5, y: 5 });
+    callback.calledOnceWithExactly({ x: 5, y: 5 });
     sinon.assert.calledWithMatch(callback, { x: 5 });
     sinon.assert.alwaysCalledWithMatch(callback, { y: 5 });
     sinon.assert.neverCalledWithMatch(callback, { x: 6 });

From 345f0b4e17533f97929c0bc8ca79d8961f3c728b Mon Sep 17 00:00:00 2001
From: azu <azuciao@gmail.com>
Date: Sat, 24 Feb 2018 14:56:21 +0900
Subject: [PATCH 228/388] Add structured-source definitions

---
 types/structured-source/index.d.ts            | 29 +++++++++++++++++++
 .../structured-source-tests.ts                | 15 ++++++++++
 types/structured-source/tsconfig.json         | 23 +++++++++++++++
 types/structured-source/tslint.json           |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 types/structured-source/index.d.ts
 create mode 100644 types/structured-source/structured-source-tests.ts
 create mode 100644 types/structured-source/tsconfig.json
 create mode 100644 types/structured-source/tslint.json

diff --git a/types/structured-source/index.d.ts b/types/structured-source/index.d.ts
new file mode 100644
index 0000000000..ce7325cf9d
--- /dev/null
+++ b/types/structured-source/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for structured-source 3.0
+// Project: https://github.com/Constellation/structured-source
+// Definitions by: azu <https://github.com/azu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace StructuredSource {
+    interface SourcePosition {
+        // Line number starts with 1.
+        line: number;
+        // Column number starts with 0.
+        column: number;
+    }
+    interface SourceLocation {
+        start: SourcePosition;
+        end: SourcePosition;
+    }
+}
+
+declare class StructuredSource {
+    /**
+     * @param source - source code text.
+     */
+    constructor(source: string);
+    locationToRange(loc: StructuredSource.SourceLocation): [number, number];
+    rangeToLocation(range: [number, number]): StructuredSource.SourceLocation;
+    positionToIndex(pos: StructuredSource.SourcePosition): number;
+    indexToPosition(index: number): StructuredSource.SourcePosition;
+}
+export = StructuredSource;
diff --git a/types/structured-source/structured-source-tests.ts b/types/structured-source/structured-source-tests.ts
new file mode 100644
index 0000000000..498cd7ddf2
--- /dev/null
+++ b/types/structured-source/structured-source-tests.ts
@@ -0,0 +1,15 @@
+import StructuredSource = require('structured-source');
+
+const src = new StructuredSource('aaa\u2028aaaa\u2029aaaaa\n');
+
+// positionToIndex({ line: number, column: number) -> number
+src.positionToIndex({ line: 1, column: 2 });
+// indexToPosition(number) -> { line: number, column: number }
+src.indexToPosition(2);
+// rangeToLocation([ number, number ]) -> { start: { line: number, column: number}, end: { line: number, column: number } }
+src.rangeToLocation([0, 2]);
+// locationToRange({ start: { line: number, column: number}, end: { line: number, column: number } }) -> [ number, number ]
+src.locationToRange({
+    start: { line: 1, column: 0 },
+    end: { line: 1, column: 2 }
+});
diff --git a/types/structured-source/tsconfig.json b/types/structured-source/tsconfig.json
new file mode 100644
index 0000000000..f0d949503e
--- /dev/null
+++ b/types/structured-source/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",
+        "structured-source-tests.ts"
+    ]
+}
diff --git a/types/structured-source/tslint.json b/types/structured-source/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/structured-source/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From dfde552d045f45150798df04b1461cac535b04d0 Mon Sep 17 00:00:00 2001
From: Ryo Kawaguchi <ryo@istellar.jp>
Date: Sat, 24 Feb 2018 17:06:08 +0900
Subject: [PATCH 229/388] Re-enble dt-header lint rule.

---
 types/material-ui/index.d.ts            | 7 +++----
 types/material-ui/material-ui-tests.tsx | 2 +-
 types/material-ui/tsconfig.json         | 2 +-
 types/material-ui/tslint.json           | 8 ++------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 85a8f46f65..8bea28fd5f 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for material-ui v0.20.1
+// Type definitions for material-ui 0.21
 // Project: https://github.com/callemall/material-ui
 // Definitions by: Nathan Brown <https://github.com/ngbrown>
 //                 Igor Beagorudsky <https://github.com/theigor>
@@ -519,7 +519,7 @@ declare namespace __MaterialUI {
         >(component: TComponent) => TComponent;
 
         export interface MuiThemeProviderProps {
-            muiTheme?: Styles.MuiTheme;
+            muiTheme?: MuiTheme;
         }
         export class MuiThemeProvider extends React.Component<MuiThemeProviderProps> {
         }
@@ -1864,8 +1864,7 @@ declare namespace __MaterialUI {
             value?: any;
             disabled?: boolean;
         }
-        export class Tab extends React.Component<
-            TabProps, {}> {
+        export class Tab extends React.Component<TabProps> {
         }
     }
 
diff --git a/types/material-ui/material-ui-tests.tsx b/types/material-ui/material-ui-tests.tsx
index 51b22c936c..c490a16265 100644
--- a/types/material-ui/material-ui-tests.tsx
+++ b/types/material-ui/material-ui-tests.tsx
@@ -4745,7 +4745,7 @@ class DropDownMenuOpenImmediateExample extends Component<{}, {value?: number}> {
   }
 }
 
-const DropDownMenuAnchorExample: React.SFC<{}> = () => (
+const DropDownMenuAnchorExample: React.SFC = () => (
   <DropDownMenu
     value={1}
     targetOrigin={{ horizontal: 'middle', vertical: 'top' }}
diff --git a/types/material-ui/tsconfig.json b/types/material-ui/tsconfig.json
index 0d3a5e6d32..97e4b12685 100644
--- a/types/material-ui/tsconfig.json
+++ b/types/material-ui/tsconfig.json
@@ -24,4 +24,4 @@
         "forceConsistentCasingInFileNames": true,
         "esModuleInterop": true
     }
-}
\ No newline at end of file
+}
diff --git a/types/material-ui/tslint.json b/types/material-ui/tslint.json
index b8cee022bf..cb655a4e78 100644
--- a/types/material-ui/tslint.json
+++ b/types/material-ui/tslint.json
@@ -3,15 +3,11 @@
     "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
+        "strict-export-declare-modifiers": false
     }
-}
\ No newline at end of file
+}

From fcdc84da8c1e90cc9f903254dc51b832f633f32e Mon Sep 17 00:00:00 2001
From: Matt Tennison <matt@matttennison.com>
Date: Sat, 24 Feb 2018 14:22:23 +0000
Subject: [PATCH 230/388] [fetch-mock] Add Mock Configuration Options

---
 types/fetch-mock/fetch-mock-tests.ts | 18 ++++++++++++++++++
 types/fetch-mock/index.d.ts          | 20 ++++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/types/fetch-mock/fetch-mock-tests.ts b/types/fetch-mock/fetch-mock-tests.ts
index 459c8e1076..1d4b706105 100644
--- a/types/fetch-mock/fetch-mock-tests.ts
+++ b/types/fetch-mock/fetch-mock-tests.ts
@@ -6,6 +6,14 @@ fetchMock.mock("http://test.com", 200, {
         test: "header"
     }
 });
+fetchMock.mock("http//test.com", 200, {
+    query: {
+        searchValue: "apples"
+    }
+});
+fetchMock.mock("http://test.com", 200, {
+    repeat: 2
+});
 fetchMock.mock(/test\.com/, 200);
 fetchMock.mock(() => true, 200);
 fetchMock.mock((url, opts) => true, 200);
@@ -73,3 +81,13 @@ const myMatcher: fetchMock.MockMatcherFunction = (
 
 fetchMock.flush().then(resolved => resolved.forEach(console.log));
 fetchMock.flush().catch(r => r);
+
+fetchMock.get("http://test.com", {
+    body: 'abc',
+    includeContentLength: false
+});
+
+fetchMock.get("http://test.com", {
+    body: 'abc',
+    redirectUrl: "http://example.org"
+});
diff --git a/types/fetch-mock/index.d.ts b/types/fetch-mock/index.d.ts
index 13563277b4..15babcba34 100644
--- a/types/fetch-mock/index.d.ts
+++ b/types/fetch-mock/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for fetch-mock 5.12
+// Type definitions for fetch-mock 6.0
 // Project: https://github.com/wheresrhys/fetch-mock
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 //                 Tamir Duberstein <https://github.com/tamird>
 //                 Risto Keravuori <https://github.com/merrywhether>
 //                 Chris Sinclair <https://github.com/chrissinclair>
+//                 Matt Tennison <https://github.com/matttennison>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -57,6 +58,17 @@ declare namespace fetchMock {
          * @default true
          */
         sendAsJson?: boolean;
+        /**
+         * Setting this property to true will automatically add the
+         * content-length header
+         * @default true
+         */
+        includeContentLength?: boolean;
+        /**
+         * The URL the response should be from (to imitate followed redirects
+         *  - will set redirected: true on the response)
+         */
+        redirectUrl?: string;
     }
     /**
      * Response: A Response instance - will be used unaltered
@@ -100,6 +112,10 @@ declare namespace fetchMock {
          * key/value map of headers to match
          */
         headers?: { [key: string]: string };
+        /**
+         * key/value map of query strings to match, in any order
+         */
+        query?: { [key: string]: string };
         /**
          * as specified above
          */
@@ -115,7 +131,7 @@ declare namespace fetchMock {
          * any other routes defined (which may eventually result in an error
          * if nothing matches it).
          */
-        times?: number;
+        repeat?: number;
     }
 
     type MockCall = [string, MockRequest];

From bc31f6523b70f2e6536ff8e96a4ec81360a4aeea Mon Sep 17 00:00:00 2001
From: Andrew G <andrew@ipaymy.com>
Date: Sun, 25 Feb 2018 00:47:27 +0800
Subject: [PATCH 231/388] * Removed StripeProps and use stripe.Stripe from
 @types/stripe-v3. * Add `props.stripe` to StripeProviderProps * Updated
 tests.

---
 types/react-stripe-elements/index.d.ts        | 14 ++-----
 .../react-stripe-elements-tests.tsx           | 40 ++++++++++++++-----
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index 8713d5828a..91e64d6117 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -3,6 +3,7 @@
 // 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>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -23,23 +24,14 @@ export namespace ReactStripeElements {
 		error?: { decline_code?: string };
 	};
 
-	interface StripeProviderProps {
-		apiKey: string;
-	}
-
-	interface StripeProps {
-		// I'm not sure what the definition for this is
-		createSource(): void;
-
-		createToken(options?: TokenOptions): Promise<PatchedTokenResponse>;
-	}
+    type StripeProviderProps = { apiKey: string; stripe?: never; } | { apiKey?: never; stripe: stripe.Stripe; };
 
 	interface InjectOptions {
 		withRef?: boolean;
 	}
 
 	interface InjectedStripeProps {
-		stripe?: StripeProps;
+		stripe?: stripe.Stripe;
 	}
 
 	interface ElementProps extends ElementsOptions {
diff --git a/types/react-stripe-elements/react-stripe-elements-tests.tsx b/types/react-stripe-elements/react-stripe-elements-tests.tsx
index e737914e31..d2cb66c6a3 100644
--- a/types/react-stripe-elements/react-stripe-elements-tests.tsx
+++ b/types/react-stripe-elements/react-stripe-elements-tests.tsx
@@ -107,18 +107,26 @@ interface ComponentProps {
     tokenCallback(token: PatchedTokenResponse): void;
 }
 
-class WrappedComponent extends React.Component<ComponentProps & InjectedStripeProps> {
+class WrappedComponent extends React.Component<
+    ComponentProps & InjectedStripeProps
+> {
     onSubmit = () => {
-        this.props.stripe!.createToken({
-            name: '',
-            address_line1: '',
-            address_line2: '',
-            address_city: '',
-            address_state: '',
-            address_zip: '',
-            address_country: '',
-            currency: '',
-        }).then((response: PatchedTokenResponse) => this.props.tokenCallback(response));
+        const elements = this.props.stripe!.elements();
+        const card = elements.create('card', { hidePostalCode: true });
+        this.props.stripe!
+            .createToken(card, {
+                name: '',
+                address_line1: '',
+                address_line2: '',
+                address_city: '',
+                address_state: '',
+                address_zip: '',
+                address_country: '',
+                currency: '',
+            })
+            .then((response: PatchedTokenResponse) =>
+                this.props.tokenCallback(response)
+            );
     }
 
     isFormValid = () => {
@@ -170,3 +178,13 @@ const ElementsDefaultPropsTest: React.SFC = () => (
         <PostalCodeElement />
     </div>
 );
+
+/**
+ * StripeProvider should either receive `apiKey` or `stripe`, but not both.
+ * See: https://github.com/stripe/react-stripe-elements/blob/d30b32b6b8df282dd8880a3521667c371e90083f/src/components/Provider.js#L83-L86
+ */
+const TestStripeProviderProps1: React.SFC = () => <StripeProvider apiKey="" />;
+
+const TestStripeProviderProps2: React.SFC<{
+    stripe: stripe.Stripe;
+}> = props => <StripeProvider stripe={props.stripe} />;

From f284533041ba21f7cba129ea407d91959d693240 Mon Sep 17 00:00:00 2001
From: Andrew G <andrew@ipaymy.com>
Date: Sun, 25 Feb 2018 01:26:34 +0800
Subject: [PATCH 232/388] It should allow nullable props.stripe also.

---
 types/react-stripe-elements/index.d.ts                    | 2 +-
 .../react-stripe-elements/react-stripe-elements-tests.tsx | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index 91e64d6117..1aff27d593 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -24,7 +24,7 @@ export namespace ReactStripeElements {
 		error?: { decline_code?: string };
 	};
 
-    type StripeProviderProps = { apiKey: string; stripe?: never; } | { apiKey?: never; stripe: stripe.Stripe; };
+    type StripeProviderProps = { apiKey: string; stripe?: never; } | { apiKey?: never; stripe: stripe.Stripe | null; };
 
 	interface InjectOptions {
 		withRef?: boolean;
diff --git a/types/react-stripe-elements/react-stripe-elements-tests.tsx b/types/react-stripe-elements/react-stripe-elements-tests.tsx
index d2cb66c6a3..fa127b29e4 100644
--- a/types/react-stripe-elements/react-stripe-elements-tests.tsx
+++ b/types/react-stripe-elements/react-stripe-elements-tests.tsx
@@ -188,3 +188,11 @@ const TestStripeProviderProps1: React.SFC = () => <StripeProvider apiKey="" />;
 const TestStripeProviderProps2: React.SFC<{
     stripe: stripe.Stripe;
 }> = props => <StripeProvider stripe={props.stripe} />;
+
+/**
+ * props.stripe is null until loaded.
+ * See: https://github.com/stripe/react-stripe-elements#props-shape
+ */
+const TestStripeProviderProps3: React.SFC<{
+    stripe: stripe.Stripe;
+}> = props => <StripeProvider stripe={null} />;

From 9e629aa4b5e6bb83da631fbc52c0aa1c799ecc78 Mon Sep 17 00:00:00 2001
From: Andrew G <andrew@ipaymy.com>
Date: Sun, 25 Feb 2018 02:31:19 +0800
Subject: [PATCH 233/388] Use back StripeProps instead of stripe.Stripe. It's
 more accurate.

---
 types/react-stripe-elements/index.d.ts                | 11 +++++++++--
 .../react-stripe-elements-tests.tsx                   |  9 ++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index 1aff27d593..da9b1c8072 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -24,14 +24,21 @@ export namespace ReactStripeElements {
 		error?: { decline_code?: string };
 	};
 
-    type StripeProviderProps = { apiKey: string; stripe?: never; } | { apiKey?: never; stripe: stripe.Stripe | null; };
+    type StripeProviderProps = { apiKey: string; stripe?: never; } | { apiKey?: never; stripe: StripeProps | null; };
+
+	interface StripeProps {
+		// I'm not sure what the definition for this is
+		createSource(): void;
+
+		createToken(options?: TokenOptions): Promise<PatchedTokenResponse>;
+	}
 
 	interface InjectOptions {
 		withRef?: boolean;
 	}
 
 	interface InjectedStripeProps {
-		stripe?: stripe.Stripe;
+		stripe?: StripeProps;
 	}
 
 	interface ElementProps extends ElementsOptions {
diff --git a/types/react-stripe-elements/react-stripe-elements-tests.tsx b/types/react-stripe-elements/react-stripe-elements-tests.tsx
index fa127b29e4..93a2a34588 100644
--- a/types/react-stripe-elements/react-stripe-elements-tests.tsx
+++ b/types/react-stripe-elements/react-stripe-elements-tests.tsx
@@ -16,6 +16,7 @@ import ElementChangeResponse = stripe.elements.ElementChangeResponse;
 import ElementsOptions = stripe.elements.ElementsOptions;
 import ElementsCreateOptions = stripe.elements.ElementsCreateOptions;
 import PatchedTokenResponse = ReactStripeElements.PatchedTokenResponse;
+import StripeProps = ReactStripeElements.StripeProps;
 
 const cardElementProps: ElementsOptions = {
     iconStyle: 'solid',
@@ -111,10 +112,8 @@ class WrappedComponent extends React.Component<
     ComponentProps & InjectedStripeProps
 > {
     onSubmit = () => {
-        const elements = this.props.stripe!.elements();
-        const card = elements.create('card', { hidePostalCode: true });
         this.props.stripe!
-            .createToken(card, {
+            .createToken({
                 name: '',
                 address_line1: '',
                 address_line2: '',
@@ -186,7 +185,7 @@ const ElementsDefaultPropsTest: React.SFC = () => (
 const TestStripeProviderProps1: React.SFC = () => <StripeProvider apiKey="" />;
 
 const TestStripeProviderProps2: React.SFC<{
-    stripe: stripe.Stripe;
+    stripe: StripeProps;
 }> = props => <StripeProvider stripe={props.stripe} />;
 
 /**
@@ -194,5 +193,5 @@ const TestStripeProviderProps2: React.SFC<{
  * See: https://github.com/stripe/react-stripe-elements#props-shape
  */
 const TestStripeProviderProps3: React.SFC<{
-    stripe: stripe.Stripe;
+    stripe: StripeProps;
 }> = props => <StripeProvider stripe={null} />;

From 746a790616ca4c7afb64137f0736cac995fa93f9 Mon Sep 17 00:00:00 2001
From: s0m3on3 <amedvedev@ciferox.com>
Date: Sat, 24 Feb 2018 23:25:13 +0200
Subject: [PATCH 234/388] [adone] main namespace fixes

---
 types/adone/adone.d.ts    | 40 ++++-------------------
 types/adone/test/index.ts | 67 +++++++++++++++------------------------
 2 files changed, 32 insertions(+), 75 deletions(-)

diff --git a/types/adone/adone.d.ts b/types/adone/adone.d.ts
index f1f5cbf694..91ebc4db7c 100644
--- a/types/adone/adone.d.ts
+++ b/types/adone/adone.d.ts
@@ -7,9 +7,8 @@ declare namespace adone {
     export function identity<T>(x: T): T;
     export function truly(): true;
     export function falsely(): false;
-    export const ok: "OK";
-    export const bad: "BAD";
-    export const exts: [".js", ".tjs", ".ajs"];
+    export const ok: "ok";
+    export const bad: "bad";
     export function log(...args: any[]): void;
     export function logFatal(...args: any[]): void;
     export function logError(...args: any[]): void;
@@ -76,35 +75,9 @@ declare namespace adone {
             set(Class: object, tag: string): void;
             has(obj: object, tag: string): boolean;
             define(tag: string, predicate?: string): void;
-            SUBSYSTEM: symbol;
-            APPLICATION: symbol;
-            TRANSFORM: symbol;
-            CORE_STREAM: symbol;
-            LOGGER: symbol;
-            LONG: symbol;
-            BIGNUMBER: symbol;
-            EXBUFFER: symbol;
-            EXDATE: symbol;
-            CONFIGURATION: symbol;
-            GENESIS_NETRON: symbol;
-            GENESIS_PEER: symbol;
-            NETRON: symbol;
-            NETRON_PEER: symbol;
-            NETRON_ADAPTER: symbol;
-            NETRON_DEFINITION: symbol;
-            NETRON_DEFINITIONS: symbol;
-            NETRON_REFERENCE: symbol;
-            NETRON_INTERFACE: symbol;
-            NETRON_STUB: symbol;
-            NETRON_REMOTESTUB: symbol;
-            NETRON_STREAM: symbol;
-            FAST_STREAM: symbol;
-            FAST_FS_STREAM: symbol;
-            FAST_FS_MAP_STREAM: symbol;
         }
     }
     export const tag: I.Tag;
-    export function bind(libName: string): object;
     export function getAssetAbsolutePath(relPath: string): string;
     export function loadAsset(relPath: string): string | Buffer;
     export function require(path: string): object;
@@ -122,11 +95,10 @@ declare namespace adone {
 
     export const runtime: I.Runtime;
 
-    export const homePath: string;
-    export const rootPath: string;
-    export const etcPath: string;
-    export const config: object;
-    export const emptyBuffer: Buffer;
+    export const ROOT_PATH: string;
+    export const ETC_PATH: string;
+    export const configuration: object;
+    export const EMPTY_BUFFER: Buffer;
 
     export const assert: assertion.I.AssertFunction;
     export const expect: assertion.I.ExpectFunction;
diff --git a/types/adone/test/index.ts b/types/adone/test/index.ts
index efb8fc8fd7..ac012b9535 100644
--- a/types/adone/test/index.ts
+++ b/types/adone/test/index.ts
@@ -1,14 +1,23 @@
 namespace AdoneRootTests {
-    { const a: symbol = adone.null; }
+    let num: number;
+    let sym: symbol;
+    let str: string;
+    let numarr: number[];
+    let obj: object;
+    let bool: boolean;
+
+    sym = adone.null;
     adone.noop();
-    { const a: number = adone.identity(2); }
-    { const a: string = adone.identity("2"); }
-    { const a: number[] = adone.identity([1, 2]); }
-    { adone.truly() === true; }
-    { adone.falsely() === false; }
-    { const a: string = adone.ok; }
-    { const a: string = adone.bad; }
-    { const a: string[] = adone.exts; }
+
+    num = adone.identity(2);
+    str = adone.identity("3");
+    numarr = adone.identity([1, 2]);
+
+    adone.truly() === true;
+    adone.falsely() === false;
+
+    str = adone.ok;
+    str = adone.bad;
     adone.log();
     adone.logFatal();
     adone.logError();
@@ -16,8 +25,8 @@ namespace AdoneRootTests {
     adone.logInfo();
     adone.logDebug();
     adone.logTrace();
-    { const a: object = adone.o(); }
-    { const a: object = adone.o({}); }
+    obj = adone.o();
+    obj = adone.o({});
     { const a: typeof Date = adone.Date; }
     { const a: typeof process.hrtime = adone.hrtime; }
     { const a: typeof global.setTimeout = adone.setTimeout; }
@@ -26,6 +35,7 @@ namespace AdoneRootTests {
     { const a: typeof clearInterval = adone.clearInterval; }
     { const a: typeof global.setImmediate = adone.setImmediate; }
     { const a: typeof clearImmediate = adone.clearImmediate; }
+
     adone.lazify({});
     adone.lazify({}, {});
     adone.lazify({}, {}, () => { });
@@ -33,40 +43,15 @@ namespace AdoneRootTests {
     adone.lazify({}, {}, () => { }, { configurable: true });
     adone.lazify({}, {}, () => { }, { writable: false });
     adone.lazify({}, {}, () => { }, { mapper: (key: string, obj: any) => null });
+
     adone.tag.set({}, "123");
-    { const a: boolean = adone.tag.has({}, "123"); }
+    bool = adone.tag.has({}, "123");
     adone.tag.define("12");
     adone.tag.define("123", "456");
-    { const a: symbol = adone.tag.SUBSYSTEM; }
-    { const a: symbol = adone.tag.APPLICATION; }
-    { const a: symbol = adone.tag.TRANSFORM; }
-    { const a: symbol = adone.tag.CORE_STREAM; }
-    { const a: symbol = adone.tag.LOGGER; }
-    { const a: symbol = adone.tag.LONG; }
-    { const a: symbol = adone.tag.BIGNUMBER; }
-    { const a: symbol = adone.tag.EXBUFFER; }
-    { const a: symbol = adone.tag.EXDATE; }
-    { const a: symbol = adone.tag.CONFIGURATION; }
-    { const a: symbol = adone.tag.GENESIS_NETRON; }
-    { const a: symbol = adone.tag.GENESIS_PEER; }
-    { const a: symbol = adone.tag.NETRON; }
-    { const a: symbol = adone.tag.NETRON_PEER; }
-    { const a: symbol = adone.tag.NETRON_ADAPTER; }
-    { const a: symbol = adone.tag.NETRON_DEFINITION; }
-    { const a: symbol = adone.tag.NETRON_DEFINITIONS; }
-    { const a: symbol = adone.tag.NETRON_REFERENCE; }
-    { const a: symbol = adone.tag.NETRON_INTERFACE; }
-    { const a: symbol = adone.tag.NETRON_STUB; }
-    { const a: symbol = adone.tag.NETRON_REMOTESTUB; }
-    { const a: symbol = adone.tag.NETRON_STREAM; }
-    { const a: symbol = adone.tag.FAST_STREAM; }
-    { const a: symbol = adone.tag.FAST_FS_STREAM; }
-    { const a: symbol = adone.tag.FAST_FS_MAP_STREAM; }
-    { const a: object = adone.bind("library"); } // hmm
-    { const a: string = adone.getAssetAbsolutePath("asset"); }
+    str = adone.getAssetAbsolutePath("asset");
     { const a: Buffer | string = adone.loadAsset("asset"); }
-    { const a: object = adone.require("path"); }
-    { const a: object = adone.package; }
+    obj = adone.require("path");
+    obj = adone.package;
     { const a: typeof adone.assertion.assert = adone.assert; }
     { const a: typeof adone.assertion.expect = adone.expect; }
 }

From 322268a3436ea0cd8ed210ce60a8fb7f4058b457 Mon Sep 17 00:00:00 2001
From: Meir017 <meirblachman@gmail.com>
Date: Sat, 24 Feb 2018 23:35:48 +0200
Subject: [PATCH 235/388] [Puppeteer] added missing member on LaunchOptions

added `appMode`
---
 types/puppeteer/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index a325a871be..0cce35fc95 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1203,6 +1203,8 @@ export interface Target {
 }
 
 export interface LaunchOptions {
+  /** Whether to open chrome in appMode. Defaults to false. */
+  appMode?: boolean;
   /** Whether to ignore HTTPS errors during navigation. Defaults to false. */
   ignoreHTTPSErrors?: boolean;
   /** Do not use `puppeteer.defaultArgs()` for launching Chromium. Defaults to false. */

From 4f21eb991dba5d242909fa1a668d0c48d29e6d4b Mon Sep 17 00:00:00 2001
From: Asuka Ito <itoasuka@gmail.com>
Date: Sat, 24 Feb 2018 23:45:34 +0900
Subject: [PATCH 236/388] fix: karma-webpack's Incorrect option name

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

diff --git a/types/karma-webpack/index.d.ts b/types/karma-webpack/index.d.ts
index 988e510b56..73e65a39f5 100644
--- a/types/karma-webpack/index.d.ts
+++ b/types/karma-webpack/index.d.ts
@@ -36,6 +36,6 @@ declare module 'karma' {
 
     interface ConfigOptions {
         webpack: Webpack.Configuration;
-        webpackMiddlewareOptions: KarmaWebpackMiddlewareOptions;
+        webpackMiddleware: KarmaWebpackMiddlewareOptions;
     }
 }
diff --git a/types/karma-webpack/karma-webpack-tests.ts b/types/karma-webpack/karma-webpack-tests.ts
index b04b02f9db..75110b7540 100644
--- a/types/karma-webpack/karma-webpack-tests.ts
+++ b/types/karma-webpack/karma-webpack-tests.ts
@@ -8,7 +8,7 @@ export default function(config: karma.Config): void {
         frameworks: ['jasmine'],
         preprocessors: {'src/index.spec.ts': ['webpack', 'sourcemap']},
         webpack: {entry: 'test.js'},
-        webpackMiddlewareOptions: {noInfo: true},
+        webpackMiddleware: {noInfo: true},
         reporters: ['spec']
     });
 }

From b2fdd818dad44bc340118867f0131a5d21f165d1 Mon Sep 17 00:00:00 2001
From: veeramarni <marni.srikanth@gmail.com>
Date: Sat, 24 Feb 2018 20:12:24 -0500
Subject: [PATCH 237/388] NavbarFormProps to have pullLeft property

There is a missing property `pullLeft` for NavbarForm
---
 types/react-bootstrap/lib/Navbar.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-bootstrap/lib/Navbar.d.ts b/types/react-bootstrap/lib/Navbar.d.ts
index 5849c0392e..03a4d24a2d 100644
--- a/types/react-bootstrap/lib/Navbar.d.ts
+++ b/types/react-bootstrap/lib/Navbar.d.ts
@@ -53,5 +53,6 @@ declare class NavbarText extends React.Component<NavbarTextProps> { }
 interface NavbarFormProps extends React.HTMLProps<NavbarForm> {
   componentClass?: React.ReactType;
   pullRight?: boolean;
+  pullLeft?: boolean;
 }
 declare class NavbarForm extends React.Component<NavbarFormProps> { }

From 9550c81046aef251d46c1b9b7570676cdbf732b9 Mon Sep 17 00:00:00 2001
From: azu <azuciao@gmail.com>
Date: Sun, 25 Feb 2018 14:27:56 +0900
Subject: [PATCH 238/388] Add type assertion

---
 types/structured-source/structured-source-tests.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/structured-source/structured-source-tests.ts b/types/structured-source/structured-source-tests.ts
index 498cd7ddf2..cda6e99af2 100644
--- a/types/structured-source/structured-source-tests.ts
+++ b/types/structured-source/structured-source-tests.ts
@@ -2,13 +2,13 @@ import StructuredSource = require('structured-source');
 
 const src = new StructuredSource('aaa\u2028aaaa\u2029aaaaa\n');
 
-// positionToIndex({ line: number, column: number) -> number
+// $ExpectType: number
 src.positionToIndex({ line: 1, column: 2 });
-// indexToPosition(number) -> { line: number, column: number }
+// $ExpectType: { line: number, column: number }
 src.indexToPosition(2);
-// rangeToLocation([ number, number ]) -> { start: { line: number, column: number}, end: { line: number, column: number } }
+// $ExpectType: { start: { line: number, column: number}, end: { line: number, column: number } }
 src.rangeToLocation([0, 2]);
-// locationToRange({ start: { line: number, column: number}, end: { line: number, column: number } }) -> [ number, number ]
+// $ExpectType: [ number, number ]
 src.locationToRange({
     start: { line: 1, column: 0 },
     end: { line: 1, column: 2 }

From 3ab2bbfc12fac8cd7d531c4e7c399f72820a17e9 Mon Sep 17 00:00:00 2001
From: Yordis Prieto Lazo <yordis.prieto@gmail.com>
Date: Sat, 24 Feb 2018 23:59:27 -0800
Subject: [PATCH 239/388] export HelmetProps

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

diff --git a/types/react-helmet/index.d.ts b/types/react-helmet/index.d.ts
index 4a2a9e46c8..57ac67f2a7 100644
--- a/types/react-helmet/index.d.ts
+++ b/types/react-helmet/index.d.ts
@@ -6,7 +6,7 @@
 
 import * as React from "react";
 
-interface HelmetProps {
+export interface HelmetProps {
     base?: any;
     bodyAttributes?: Object;
     defaultTitle?: string;

From e154334d1bc829ed4035110a5490642be4f0de11 Mon Sep 17 00:00:00 2001
From: shrey <shrey-jain@hotmail.com>
Date: Sun, 25 Feb 2018 13:15:06 -0500
Subject: [PATCH 240/388] typings for postProcessResponse and wrapIdentifier
 config options

---
 types/knex/index.d.ts    |  3 +++
 types/knex/knex-tests.ts | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index f98091cb13..eecfde8774 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -5,6 +5,7 @@
 //                 Pablo Rodríguez <https://github.com/MeLlamoPablo>
 //                 Matt R. Wilson <https://github.com/mastermatt>
 //                 Satana Charuwichitratana <https://github.com/micksatana>
+//                 Shrey Jain <https://github.com/shreyjain1994>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -524,6 +525,8 @@ declare namespace Knex {
             MySqlConnectionConfig | MsSqlConnectionConfig | Sqlite3ConnectionConfig | SocketConnectionConfig;
         pool?: PoolConfig;
         migrations?: MigratorConfig;
+        postProcessResponse?: (result: any, queryContext: any) => any;
+        wrapIdentifier?: (value: string, origImpl: (value: string) => string, queryContext: any) => string;
         seeds?: SeedsConfig;
         acquireConnectionTimeout?: number;
         useNullAsDefault?: boolean;
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index c76f0d404f..3e8e798212 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -126,6 +126,22 @@ var knex = Knex({
     searchPath: ['public', 'private'],
 });
 
+// postProcessResponse
+var knex = Knex({
+  client: 'pg',
+  postProcessResponse: function(result, queryContext){
+    return result;
+  }
+});
+
+// wrapIdentifier
+var knex = Knex({
+  client: 'pg',
+  wrapIdentifier: function(value, origImpl, queryContext){
+    return origImpl(value + 'foo');
+  }
+});
+
 // useNullAsDefault
 var knex = Knex({
   client: 'sqlite',

From cad74e1634acbaef129eb42664876889799321a6 Mon Sep 17 00:00:00 2001
From: Martin Tracey <matracey@outlook.ie>
Date: Sun, 25 Feb 2018 19:39:30 +0000
Subject: [PATCH 241/388] canvas-confetti: created type definition for v0.0.2

---
 .../canvas-confetti/canvas-confetti-tests.ts  | 45 ++++++++++
 types/canvas-confetti/index.d.ts              | 86 +++++++++++++++++++
 types/canvas-confetti/tsconfig.json           | 23 +++++
 types/canvas-confetti/tslint.json             |  1 +
 4 files changed, 155 insertions(+)
 create mode 100644 types/canvas-confetti/canvas-confetti-tests.ts
 create mode 100644 types/canvas-confetti/index.d.ts
 create mode 100644 types/canvas-confetti/tsconfig.json
 create mode 100644 types/canvas-confetti/tslint.json

diff --git a/types/canvas-confetti/canvas-confetti-tests.ts b/types/canvas-confetti/canvas-confetti-tests.ts
new file mode 100644
index 0000000000..d29e57fbdb
--- /dev/null
+++ b/types/canvas-confetti/canvas-confetti-tests.ts
@@ -0,0 +1,45 @@
+import confetti = require("canvas-confetti");
+
+confetti.Promise = null;
+
+confetti();
+
+confetti({
+    particleCount: 150
+});
+
+confetti({
+    spread: 180
+});
+
+confetti({
+    particleCount: 100,
+    startVelocity: 30,
+    spread: 360,
+    origin: {
+        x: Math.random(),
+        // since they fall down, start a bit higher than random
+        y: Math.random() - 0.2
+    }
+});
+
+confetti({
+    particleCount: 100,
+    spread: 70,
+    origin: {
+        y: 0.6
+    }
+});
+
+function r(min: number, max: number) {
+    return Math.random() * (max - min) + min;
+}
+
+confetti({
+    angle: r(55, 125),
+    spread: r(50, 70),
+    particleCount: r(50, 100),
+    origin: {
+        y: 0.6
+    }
+});
diff --git a/types/canvas-confetti/index.d.ts b/types/canvas-confetti/index.d.ts
new file mode 100644
index 0000000000..3dddc6d750
--- /dev/null
+++ b/types/canvas-confetti/index.d.ts
@@ -0,0 +1,86 @@
+// Type definitions for canvas-confetti 0.0
+// Project: https://github.com/catdad/canvas-confetti#readme
+// Definitions by: Martin Tracey <https://github.com/matracey>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * `confetti` takes a single optional object. When `window.Promise` is available, it will return a Promise to let you know when it is done. When promises are not available (like in IE), it will return
+ * `null`. You can polyfill promises using any of the popular polyfills. You can also provide a custom promise implementation to `confetti` through:
+ *
+ * `const MyPromise = require('some-promise-lib');
+ *  const confetti = require('canvas-confetti');
+ *  confetti.Promise = MyPromise;`
+ *
+ * If you call `confetti` multiple times before it is done, it
+ * will return the same promise every time. Internally, the same canvas element will be reused, continuing the existing animation with the new confetti added. The promise returned by each call to
+ * `confetti` will resolve once all animations are done.
+ *
+ */
+declare function confetti(options?: confetti.Options): Promise<null> | null;
+
+declare namespace confetti {
+    /**
+     * You can polyfill promises using any of the popular polyfills. You can also provide a promise implementation to `confetti` through this property.
+     */
+    let Promise: any;
+
+    interface Options {
+        /**
+         * The number of confetti to launch. More is always fun... but be cool, there's a lot of math involved.
+         * @default 50
+         */
+        particleCount?: number;
+        /**
+         * The angle in which to launch the confetti, in degrees. 90 is straight up.
+         * @default 90
+         */
+        angle?: number;
+        /**
+         * How far off center the confetti can go, in degrees. 45 means the confetti will launch at the defined angle plus or minus 22.5 degrees.
+         * @default 45
+         */
+        spread?: number;
+        /**
+         * How fast the confetti will start going, in pixels.
+         * @default 45
+         */
+        startVelocity?: number;
+        /**
+         * How quickly the confetti will lose speed. Keep this number between 0 and 1, otherwise the confetti will gain speed. Better yet, just never change it.
+         * @default 0.9
+         */
+        decay?: number;
+        /**
+         * How many times the confetti will move. This is abstract... but play with it if the confetti disappear too quickly for you.
+         * @default 200
+         */
+        ticks?: number;
+        /**
+         * Where to start firing confetti from. Feel free to launch off-screen if you'd like.
+         */
+        origin?: Origin;
+        /**
+         * An array of color strings, in the HEX format... you know, like #bada55.
+         */
+        colors?: string[];
+        /**
+         * The confetti should be on top, after all. But if you have a crazy high page, you can set it even higher.
+         * @default 100
+         */
+        zIndex?: number;
+    }
+    interface Origin {
+        /**
+         * The x position on the page, with 0 being the left edge and 1 being the right edge.
+         * @default 0.5
+         */
+        x?: number;
+        /**
+         * The y position on the page, with 0 being the left edge and 1 being the right edge.
+         * @default 0.5
+         */
+        y?: number;
+    }
+}
+
+export = confetti;
diff --git a/types/canvas-confetti/tsconfig.json b/types/canvas-confetti/tsconfig.json
new file mode 100644
index 0000000000..33c159b3e3
--- /dev/null
+++ b/types/canvas-confetti/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",
+        "canvas-confetti-tests.ts"
+    ]
+}
diff --git a/types/canvas-confetti/tslint.json b/types/canvas-confetti/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/canvas-confetti/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 32071c40b8e3494554aacf7181a563d4fb85977c Mon Sep 17 00:00:00 2001
From: Tim Wang <tim@thenetcircle.com>
Date: Mon, 26 Feb 2018 13:54:38 +0800
Subject: [PATCH 242/388] Refactor react-navigation types based on 1.2.0 flow
 type

---
 types/react-navigation/index.d.ts             | 244 +++++++++++++-----
 .../react-navigation-tests.tsx                |  36 ++-
 2 files changed, 201 insertions(+), 79 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index edf5cbc915..53349d4be8 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for react-navigation 1.0
-// Project: https://github.com/react-community/react-navigation
+// Type definitions for react-navigation 1.2
+// Project: https://github.com/react-navigation/react-navigation
 // Definitions by: Huhuanming <https://github.com/huhuanming>
 //                 mhcgrq <https://github.com/mhcgrq>
 //                 fangpenlin <https://github.com/fangpenlin>
@@ -10,16 +10,18 @@
 //                 charlesfamu <https://github.com/charlesfamu>
 //                 Tim Wang <https://github.com/timwangdev>
 //                 Qibang Sun <https://github.com/bang88>
+//                 Sergei Butko: <https://github.com/svbutko>
+//                 Veit Lehmann: <https://github.com/levito>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /**
  * BEGIN FLOW TYPEDEFINITION.JS PORT
- * Reference: https://github.com/react-community/react-navigation/tree/52a2846e77119148320bcea83b8982a8bc6acce3
+ * Reference: https://github.com/react-navigation/react-navigation/tree/a37473c5e4833f48796ee6c7c9cb4a8ac49d9c06
  *
  * NOTE: Please update the commit/link above when updating to a new Flow
- * TypeDefinition.js reference, so we can conveniently just look at diffs on
- * TypeDefinition.js between this latest reference point and the one you are
+ * react-navigation/flow/react-navigation.js reference, so we can conveniently just look at diffs on
+ * react-navigation/flow/react-navigation.js between this latest reference point and the one you are
  * using when making new updates.
  */
 
@@ -71,9 +73,9 @@ export interface NavigationState {
   routes: any[];
 }
 
-export type NavigationRoute<Params> = NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
+export type NavigationRoute = NavigationLeafRoute | NavigationStateRoute;
 
-export interface NavigationLeafRoute<Params> {
+export interface NavigationLeafRoute {
   /**
    * React's key used by some navigators. No need to specify these manually,
    * they will be defined by the router.
@@ -92,16 +94,13 @@ export interface NavigationLeafRoute<Params> {
    * Params passed to this route when navigating to it,
    * e.g. `{ car_id: 123 }` in a route that displays a car.
    */
-  params: Params;
+  params?: NavigationParams;
 }
 
-export interface NavigationStateRoute<NavigationLeafRouteParams> extends NavigationLeafRoute<NavigationLeafRouteParams> {
-  index: number;
-  routes: Array<NavigationRoute<any>>;
-}
+export type NavigationStateRoute = NavigationLeafRoute & NavigationState;
 
-export type NavigationScreenOptionsGetter<Options, Action> = (
-  navigation: NavigationScreenProp<NavigationRoute<any>, Action>,
+export type NavigationScreenOptionsGetter<Options> = (
+  navigation: NavigationScreenProp<NavigationRoute>,
   screenProps?: { [key: string]: any }
 ) => Options;
 
@@ -141,20 +140,20 @@ export interface NavigationRouter<State, Action, Options> {
    *
    *  {routeName: 'Foo', key: '123'}
    */
-  getScreenOptions: NavigationScreenOptionsGetter<Options, Action>;
+  getScreenOptions: NavigationScreenOptionsGetter<Options>;
 }
 
 export type NavigationScreenOption<T> =
   T
   | ((
-    navigation: NavigationScreenProp<NavigationRoute<any>, NavigationAction>,
+    navigation: NavigationScreenProp<NavigationRoute>,
     config: T
   ) => T);
 
 export interface NavigationScreenDetails<T> {
   options: T;
-  state: NavigationRoute<any>;
-  navigation: NavigationScreenProp<NavigationRoute<any>, NavigationAction>;
+  state: NavigationRoute;
+  navigation: NavigationScreenProp<NavigationRoute>;
 }
 
 export interface NavigationScreenOptions {
@@ -162,7 +161,7 @@ export interface NavigationScreenOptions {
 }
 
 export interface NavigationScreenConfigProps {
-  navigation: NavigationScreenProp<NavigationRoute<any>, NavigationAction>;
+  navigation: NavigationScreenProp<NavigationRoute>;
   screenProps: { [key: string]: any };
 }
 
@@ -170,10 +169,7 @@ export type NavigationScreenConfig<Options> =
   Options
   | (NavigationScreenConfigProps &
     ((navigationOptionsContainer: {
-      navigationOptions: NavigationScreenProp<
-        NavigationRoute<any>,
-        NavigationAction
-      >,
+      navigationOptions: NavigationScreenProp<NavigationRoute>,
     }) => Options));
 
 export type NavigationComponent =
@@ -262,6 +258,7 @@ export interface NavigationStackViewConfig {
 
 export type NavigationStackScreenOptions = NavigationScreenOptions & {
   header?: (React.ReactElement<any> | ((headerProps: HeaderProps) => React.ReactElement<any>)) | null;
+  headerTransparent?: boolean;
   headerTitle?: string | React.ReactElement<any>;
   headerTitleStyle?: StyleProp<TextStyle>;
   headerTintColor?: string;
@@ -272,10 +269,13 @@ export type NavigationStackScreenOptions = NavigationScreenOptions & {
   headerPressColorAndroid?: string;
   headerRight?: React.ReactElement<any>;
   headerStyle?: StyleProp<ViewStyle>;
+  headerBackground?: React.ReactNode | React.ComponentType;
   gesturesEnabled?: boolean;
+  gestureResponseDistance?: { vertical?: number; horizontal?: number };
 };
 
 export interface NavigationStackRouterConfig {
+  headerTransitionPreset?: 'fade-in-place' | 'uikit';
   initialRouteName?: string;
   initialRouteParams?: NavigationParams;
   paths?: NavigationPathsConfig;
@@ -299,18 +299,16 @@ export type NavigationAction =
   | NavigationStackAction
   | NavigationTabAction;
 
-export type NavigationRouteConfig<T> = T & {
+export type NavigationRouteConfig = NavigationComponent | ({
   navigationOptions?: NavigationScreenConfig<any>,
   path?: string,
-};
+} & NavigationScreenRouteConfig);
 
-export type NavigationScreenRouteConfig =
-  {
-      screen: NavigationComponent,
-    }
-  | {
-      getScreen: () => NavigationComponent,
-    };
+export type NavigationScreenRouteConfig = NavigationComponent | {
+    screen: NavigationComponent,
+} | {
+    getScreen: () => NavigationComponent,
+};
 
 export interface NavigationPathsConfig {
   [routeName: string]: string;
@@ -325,7 +323,12 @@ export interface NavigationTabRouterConfig {
   // Does the back button cause the router to switch to the initial tab
   backBehavior?: 'none' | 'initialRoute'; // defaults `initialRoute`
 }
-
+export interface TabScene {
+    route: NavigationRoute;
+    focused: boolean;
+    index: number;
+    tintColor?: string;
+}
 export interface NavigationTabScreenOptions extends NavigationScreenOptions {
   tabBarIcon?:
     React.ReactElement<any>
@@ -339,6 +342,11 @@ export interface NavigationTabScreenOptions extends NavigationScreenOptions {
       any
     > | string | null));
   tabBarVisible?: boolean;
+  tabBarTestIDProps?: { testID?: string, accessibilityLabel?: string };
+  tabBarOnPress?: (options: {
+    scene: TabScene,
+    jumpToIndex: (index: number) => void
+  }) => void;
 }
 
 export interface NavigationDrawerScreenOptions extends NavigationScreenOptions {
@@ -348,26 +356,49 @@ export interface NavigationDrawerScreenOptions extends NavigationScreenOptions {
       any
     > | null));
   drawerLabel?:
-    React.ReactElement<any>
+    string
+    | React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
       any
     > | null));
 }
 
 export interface NavigationRouteConfigMap {
-  [routeName: string]: NavigationRouteConfig<any>;
+  [routeName: string]: NavigationRouteConfig;
 }
 
-export type NavigationDispatch<A> = (action: A) => boolean;
+export type NavigationDispatch = (action: NavigationAction) => boolean;
 
-export interface NavigationProp<S, A> {
+export interface NavigationProp<S> {
   state: S;
-  dispatch: NavigationDispatch<A>;
+  dispatch: NavigationDispatch;
 }
 
-export interface NavigationScreenProp<S, A> {
+export type EventType =
+| 'willFocus'
+| 'didFocus'
+| 'willBlur'
+| 'didBlur'
+| 'action';
+
+export interface NavigationEventPayload {
+    type: EventType;
+    action: NavigationAction;
+    state: NavigationState;
+    lastState: NavigationState;
+}
+
+export type NavigationEventCallback = (
+    payload: NavigationEventPayload
+) => void;
+
+export interface NavigationEventSubscription {
+    remove: () => void;
+}
+
+export interface NavigationScreenProp<S> {
   state: S;
-  dispatch: NavigationDispatch<A>;
+  dispatch: NavigationDispatch;
   goBack: (routeKey?: (string | null)) => boolean;
   navigate: (
     routeName: string,
@@ -375,10 +406,26 @@ export interface NavigationScreenProp<S, A> {
     action?: NavigationAction
   ) => boolean;
   setParams: (newParams: NavigationParams) => boolean;
+  addListener: (
+    eventName: string,
+    callback: NavigationEventCallback
+  ) => NavigationEventSubscription;
+  push: (
+    routeName: string,
+    params?: NavigationParams,
+    action?: NavigationNavigateAction
+  ) => boolean;
+  replace: (
+    routeName: string,
+    params?: NavigationParams,
+    action?: NavigationNavigateAction
+  ) => boolean;
+  pop: (n?: number, params?: { immediate?: boolean }) => boolean;
+  popToTop: (params?: { immediate?: boolean }) => boolean;
 }
 
-export interface NavigationNavigatorProps<T> {
-  navigation?: NavigationProp<T, NavigationAction>;
+export interface NavigationNavigatorProps<S = {}> {
+  navigation?: NavigationProp<S>;
   screenProps?: { [key: string]: any };
   navigationOptions?: any;
 }
@@ -402,7 +449,7 @@ export interface NavigationScene {
   isActive: boolean;
   isStale: boolean;
   key: string;
-  route: NavigationRoute<any>;
+  route: NavigationRoute;
 }
 
 export interface NavigationTransitionProps {
@@ -410,7 +457,7 @@ export interface NavigationTransitionProps {
   layout: NavigationLayout;
 
   // The destination navigation state of the transition
-  navigation: NavigationScreenProp<NavigationState, NavigationAction>;
+  navigation: NavigationScreenProp<NavigationState>;
 
   // The progressive index of the transitioner's navigation state.
   position: AnimatedValue;
@@ -498,7 +545,9 @@ export type NavigatorType =
 | 'react-navigation/DRAWER';
 
 // From addNavigatorHelpers.js
-export function addNavigationHelpers<S>(navigation: NavigationProp<S, NavigationAction>): NavigationScreenProp<S, NavigationAction>;
+export function addNavigationHelpers<S = {}>(
+    navigation: NavigationProp<S>
+): NavigationScreenProp<S>;
 
 // From createNavigationContainer.js
 export interface NavigationContainerProps {
@@ -531,15 +580,16 @@ export function StackNavigator(
 ): NavigationContainer;
 
 // DrawerItems
-export const DrawerItems: React.ComponentClass<any>;
+export const DrawerItems: React.ComponentType;
 
 /**
  * Drawer Navigator
  */
 export interface DrawerViewConfig {
+  drawerBackgroundColor?: string;
   drawerWidth?: number;
   drawerPosition?: 'left' | 'right';
-  contentComponent?: (props: any) => React.ReactElement<any> | React.ComponentClass<any>;
+  contentComponent?: React.ComponentType;
   contentOptions?: any;
   style?: StyleProp<ViewStyle>;
 }
@@ -566,10 +616,11 @@ export function DrawerNavigator(
 
 // From views/TabView/TabView.js
 export interface TabViewConfig {
-  tabBarComponent?: React.ComponentClass<any>;
+  tabBarComponent?: React.ComponentType;
   tabBarPosition?: 'top' | 'bottom';
   tabBarOptions?: {
     activeTintColor?: string,
+    allowFontScaling?: boolean,
     activeBackgroundColor?: string,
     inactiveTintColor?: string,
     inactiveBackgroundColor?: string,
@@ -592,7 +643,11 @@ export interface TabViewConfig {
 }
 
 // From navigators/TabNavigator.js
-export interface TabNavigatorConfig extends NavigationTabRouterConfig, TabViewConfig { }
+export interface TabNavigatorConfig extends NavigationTabRouterConfig, TabViewConfig {
+  lazy?: boolean;
+  removeClippedSubviews?: boolean;
+  initialLayout?: { height: number, width: number };
+}
 
 // From navigators/TabNavigator.js
 export function TabNavigator(
@@ -600,13 +655,74 @@ export function TabNavigator(
   drawConfig?: TabNavigatorConfig,
 ): NavigationContainer;
 
-export const TabBarTop: React.ComponentClass<any>;
-export const TabBarBottom: React.ComponentClass<any>;
+export interface TabBarTopProps {
+    activeTintColor: string;
+    inactiveTintColor: string;
+    showIcon: boolean;
+    showLabel: boolean;
+    upperCaseLabel: boolean;
+    allowFontScaling: boolean;
+    position: AnimatedValue;
+    tabBarPosition: string;
+    navigation: NavigationScreenProp<NavigationState>;
+    jumpToIndex: (index: number) => void;
+    getLabel: (scene: TabScene) => (React.ReactNode | string);
+    getOnPress: (
+      previousScene: NavigationRoute,
+      scene: TabScene
+    ) => (args: {
+      previousScene: NavigationRoute,
+      scene: TabScene,
+      jumpToIndex: (index: number) => void,
+    }) => void;
+    renderIcon: (scene: TabScene) => React.ReactElement<any>;
+    labelStyle?: TextStyle;
+    iconStyle?: ViewStyle;
+}
+
+export interface TabBarBottomProps {
+    activeTintColor: string;
+    activeBackgroundColor: string;
+    adaptive?: boolean;
+    inactiveTintColor: string;
+    inactiveBackgroundColor: string;
+    showLabel?: boolean;
+    allowFontScaling: boolean;
+    position: AnimatedValue;
+    navigation: NavigationScreenProp<NavigationState>;
+    jumpToIndex: (index: number) => void;
+    getLabel: (scene: TabScene) => (React.ReactNode | string);
+    getOnPress: (
+      previousScene: NavigationRoute,
+      scene: TabScene
+    ) => (args: {
+      previousScene: NavigationRoute,
+      scene: TabScene,
+      jumpToIndex: (index: number) => void,
+    }) => void;
+    getTestIDProps: (scene: TabScene) => (scene: TabScene) => any;
+    renderIcon: (scene: TabScene) => React.ReactNode;
+    style?: ViewStyle;
+    animateStyle?: ViewStyle;
+    labelStyle?: TextStyle;
+    tabStyle?: ViewStyle;
+    showIcon?: boolean;
+}
+
+export const TabBarTop: React.ComponentType<TabBarTopProps>;
+export const TabBarBottom: React.ComponentType<TabBarBottomProps>;
 
 /**
  * NavigationActions
  */
 export namespace NavigationActions {
+  const BACK: 'Navigation/BACK';
+  const INIT: 'Navigation/INIT';
+  const NAVIGATE: 'Navigation/NAVIGATE';
+  const RESET: 'Navigation/RESET';
+  const SET_PARAMS: 'Navigation/SET_PARAMS';
+  const URI: 'Navigation/URI';
+
   function init(options?: NavigationInitActionPayload): NavigationInitAction;
   function navigate(options: NavigationNavigateActionPayload): NavigationNavigateAction;
   function reset(options: NavigationResetActionPayload): NavigationResetAction;
@@ -623,7 +739,7 @@ export interface TransitionerProps {
     transitionProps: NavigationTransitionProps,
     prevTransitionProps?: NavigationTransitionProps
   ) => NavigationTransitionSpec;
-  navigation: NavigationScreenProp<NavigationState, NavigationAction>;
+  navigation: NavigationScreenProp<NavigationState>;
   onTransitionEnd?: () => void;
   onTransitionStart?: () => void;
   render: (
@@ -668,7 +784,7 @@ export function StackRouter(
 /**
  * Create Navigator
  *
- * @see https://github.com/react-community/react-navigation/blob/master/src/navigators/createNavigator.js
+ * @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>,
@@ -683,11 +799,11 @@ export function createNavigator<C, S, A, Options>(
  * This allows to use e.g. the StackNavigator and TabNavigator as root-level
  * components.
  *
- * @see https://github.com/react-community/react-navigation/blob/master/src/createNavigationContainer.js
+ * @see https://github.com/react-navigation/react-navigation/blob/master/src/createNavigationContainer.js
  */
 export function createNavigationContainer(
   Component: NavigationNavigator<any, any, any, any>
-): React.Component<any, any>;
+): NavigationContainer;
 /**
  * END MANUAL DEFINITIONS OUTSIDE OF TYPEDEFINITION.JS
  */
@@ -696,8 +812,8 @@ export function createNavigationContainer(
  * BEGIN CUSTOM CONVENIENCE INTERFACES
  */
 
-export interface NavigationScreenProps<Params> {
-  navigation: NavigationScreenProp<NavigationRoute<Params>, NavigationAction>;
+export interface NavigationScreenProps {
+  navigation: NavigationScreenProp<NavigationRoute>;
   screenProps?: { [key: string]: any };
   navigationOptions?: NavigationScreenConfig<any>;
 }
@@ -727,3 +843,15 @@ export const HeaderBackButton: React.ComponentClass<HeaderBackButtonProps>;
  * Header Component
  */
 export const Header: React.ComponentClass<HeaderProps>;
+
+export interface NavigationInjectedProps {
+    navigation: NavigationScreenProp<NavigationState>;
+}
+
+export function withNavigation<T = {}>(
+    Component: React.ComponentType<T & NavigationInjectedProps>
+): React.ComponentType<T>;
+
+export function withNavigationFocus<T = {}>(
+    Component: React.ComponentType<T & NavigationInjectedProps>
+): React.ComponentType<T>;
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index e8573bac89..2ac8e1617c 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -29,6 +29,7 @@ import {
     addNavigationHelpers,
     HeaderBackButton,
     Header,
+    NavigationParams,
 } from 'react-navigation';
 
 // Constants
@@ -40,21 +41,17 @@ 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<StartScreenNavigationParams>> {
+class StartScreen extends React.Component<NavigationScreenProps> {
     render() {
         // Implicit type checks.
-        const navigationStateParams: StartScreenNavigationParams = this.props.navigation.state.params;
-        const id = this.props.navigation.state.params.id;
-        const s = this.props.navigation.state.params.s;
+        const navigationStateParams = 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;
 
         return (
             <View>
@@ -63,25 +60,22 @@ class StartScreen extends React.Component<NavigationScreenProps<StartScreenNavig
         );
     }
     private navigateToNextScreen = (): void => {
-        const params: NextScreenNavigationParams = {
-            id: this.props.navigation.state.params.id,
-            name: this.props.navigation.state.params.s,
+        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(ROUTE_NAME_NEXT_SCREEN, params);
     }
 }
 
 const ROUTE_NAME_NEXT_SCREEN = "NextScreen";
-interface NextScreenNavigationParams {
-    id: number;
-    name: string;
-}
-class NextScreen extends React.Component<NavigationScreenProps<NextScreenNavigationParams>> {
+
+class NextScreen extends React.Component<NavigationScreenProps> {
     render() {
         // Implicit type checks.
-        const navigationStateParams: NextScreenNavigationParams = this.props.navigation.state.params;
-        const id = this.props.navigation.state.params.id;
-        const name = this.props.navigation.state.params.name;
+        const navigationStateParams = 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;
 
         return (
             <View />
@@ -92,7 +86,7 @@ class NextScreen extends React.Component<NavigationScreenProps<NextScreenNavigat
 const navigationOptions = {
     headerBackTitle: null,
 };
-const initialRouteParams: StartScreenNavigationParams = {
+const initialRouteParams: NavigationParams = {
     id: 1,
     s: "Start",
 };
@@ -189,7 +183,7 @@ function renderBasicStackNavigator(): JSX.Element {
 }
 
 interface CustomTransitionerProps {
-    navigation: NavigationScreenProp<any, NavigationAction>;
+    navigation: NavigationScreenProp<any>;
 }
 /**
  * @desc Custom transitioner component. Follows react-navigation/src/views/CardStackTransitioner.js.

From f1e2710d7671bc2d9b2da5269780cc7881a5a518 Mon Sep 17 00:00:00 2001
From: Tim Wang <timwangdev@users.noreply.github.com>
Date: Mon, 26 Feb 2018 14:18:31 +0800
Subject: [PATCH 243/388] Fix CI

---
 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 112aa02964..a7eaad092b 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -61,7 +61,7 @@ class StartScreen extends React.Component<NavigationScreenProps> {
             </View>
         );
     }
-    private navigateToNextScreen = (): void => {
+    private readonly navigateToNextScreen = (): 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,

From 9ef92bafb5ad1b7d0096e9129c6f5a82a0c97ada Mon Sep 17 00:00:00 2001
From: Tim Wang <timwangdev@users.noreply.github.com>
Date: Mon, 26 Feb 2018 14:29:37 +0800
Subject: [PATCH 244/388] Replace React.ComponentType to React.ReactType

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 53349d4be8..ba9eb44152 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -269,7 +269,7 @@ export type NavigationStackScreenOptions = NavigationScreenOptions & {
   headerPressColorAndroid?: string;
   headerRight?: React.ReactElement<any>;
   headerStyle?: StyleProp<ViewStyle>;
-  headerBackground?: React.ReactNode | React.ComponentType;
+  headerBackground?: React.ReactNode | React.ReactType;
   gesturesEnabled?: boolean;
   gestureResponseDistance?: { vertical?: number; horizontal?: number };
 };
@@ -580,7 +580,7 @@ export function StackNavigator(
 ): NavigationContainer;
 
 // DrawerItems
-export const DrawerItems: React.ComponentType;
+export const DrawerItems: React.ReactType;
 
 /**
  * Drawer Navigator
@@ -589,7 +589,7 @@ export interface DrawerViewConfig {
   drawerBackgroundColor?: string;
   drawerWidth?: number;
   drawerPosition?: 'left' | 'right';
-  contentComponent?: React.ComponentType;
+  contentComponent?: React.ReactType;
   contentOptions?: any;
   style?: StyleProp<ViewStyle>;
 }
@@ -616,7 +616,7 @@ export function DrawerNavigator(
 
 // From views/TabView/TabView.js
 export interface TabViewConfig {
-  tabBarComponent?: React.ComponentType;
+  tabBarComponent?: React.ReactType;
   tabBarPosition?: 'top' | 'bottom';
   tabBarOptions?: {
     activeTintColor?: string,

From 07f5f260a9843c4cdf2cc27a1de9e5b15b999ab2 Mon Sep 17 00:00:00 2001
From: Tim Wang <timwangdev@users.noreply.github.com>
Date: Mon, 26 Feb 2018 14:34:40 +0800
Subject: [PATCH 245/388] Fix format and outdated comment

---
 types/react-navigation/index.d.ts | 126 ++++++++++++++----------------
 1 file changed, 57 insertions(+), 69 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index ba9eb44152..3a4b079000 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -16,7 +16,6 @@
 // TypeScript Version: 2.6
 
 /**
- * BEGIN FLOW TYPEDEFINITION.JS PORT
  * Reference: https://github.com/react-navigation/react-navigation/tree/a37473c5e4833f48796ee6c7c9cb4a8ac49d9c06
  *
  * NOTE: Please update the commit/link above when updating to a new Flow
@@ -382,18 +381,18 @@ export type EventType =
 | 'action';
 
 export interface NavigationEventPayload {
-    type: EventType;
-    action: NavigationAction;
-    state: NavigationState;
-    lastState: NavigationState;
+  type: EventType;
+  action: NavigationAction;
+  state: NavigationState;
+  lastState: NavigationState;
 }
 
 export type NavigationEventCallback = (
-    payload: NavigationEventPayload
+  payload: NavigationEventPayload
 ) => void;
 
 export interface NavigationEventSubscription {
-    remove: () => void;
+  remove: () => void;
 }
 
 export interface NavigationScreenProp<S> {
@@ -530,26 +529,15 @@ export interface LayoutEvent {
   };
 }
 
-/**
- * END FLOW TYPEDEFINITION.JS PORT
- */
-
-/**
- * BEGIN MANUAL DEFINITIONS OUTSIDE OF TYPEDEFINITION.JS
- */
-
-// From navigators/NavigatorTypes.js
 export type NavigatorType =
 | 'react-navigation/STACK'
 | 'react-navigation/TABS'
 | 'react-navigation/DRAWER';
 
-// From addNavigatorHelpers.js
 export function addNavigationHelpers<S = {}>(
     navigation: NavigationProp<S>
 ): NavigationScreenProp<S>;
 
-// From createNavigationContainer.js
 export interface NavigationContainerProps {
   uriPrefix?: string | RegExp;
   onNavigationStateChange?: (
@@ -656,57 +644,57 @@ export function TabNavigator(
 ): NavigationContainer;
 
 export interface TabBarTopProps {
-    activeTintColor: string;
-    inactiveTintColor: string;
-    showIcon: boolean;
-    showLabel: boolean;
-    upperCaseLabel: boolean;
-    allowFontScaling: boolean;
-    position: AnimatedValue;
-    tabBarPosition: string;
-    navigation: NavigationScreenProp<NavigationState>;
-    jumpToIndex: (index: number) => void;
-    getLabel: (scene: TabScene) => (React.ReactNode | string);
-    getOnPress: (
-      previousScene: NavigationRoute,
-      scene: TabScene
-    ) => (args: {
-      previousScene: NavigationRoute,
-      scene: TabScene,
-      jumpToIndex: (index: number) => void,
-    }) => void;
-    renderIcon: (scene: TabScene) => React.ReactElement<any>;
-    labelStyle?: TextStyle;
-    iconStyle?: ViewStyle;
+  activeTintColor: string;
+  inactiveTintColor: string;
+  showIcon: boolean;
+  showLabel: boolean;
+  upperCaseLabel: boolean;
+  allowFontScaling: boolean;
+  position: AnimatedValue;
+  tabBarPosition: string;
+  navigation: NavigationScreenProp<NavigationState>;
+  jumpToIndex: (index: number) => void;
+  getLabel: (scene: TabScene) => (React.ReactNode | string);
+  getOnPress: (
+    previousScene: NavigationRoute,
+    scene: TabScene
+  ) => (args: {
+    previousScene: NavigationRoute,
+    scene: TabScene,
+    jumpToIndex: (index: number) => void,
+  }) => void;
+  renderIcon: (scene: TabScene) => React.ReactElement<any>;
+  labelStyle?: TextStyle;
+  iconStyle?: ViewStyle;
 }
 
 export interface TabBarBottomProps {
-    activeTintColor: string;
-    activeBackgroundColor: string;
-    adaptive?: boolean;
-    inactiveTintColor: string;
-    inactiveBackgroundColor: string;
-    showLabel?: boolean;
-    allowFontScaling: boolean;
-    position: AnimatedValue;
-    navigation: NavigationScreenProp<NavigationState>;
-    jumpToIndex: (index: number) => void;
-    getLabel: (scene: TabScene) => (React.ReactNode | string);
-    getOnPress: (
-      previousScene: NavigationRoute,
-      scene: TabScene
-    ) => (args: {
-      previousScene: NavigationRoute,
-      scene: TabScene,
-      jumpToIndex: (index: number) => void,
-    }) => void;
-    getTestIDProps: (scene: TabScene) => (scene: TabScene) => any;
-    renderIcon: (scene: TabScene) => React.ReactNode;
-    style?: ViewStyle;
-    animateStyle?: ViewStyle;
-    labelStyle?: TextStyle;
-    tabStyle?: ViewStyle;
-    showIcon?: boolean;
+  activeTintColor: string;
+  activeBackgroundColor: string;
+  adaptive?: boolean;
+  inactiveTintColor: string;
+  inactiveBackgroundColor: string;
+  showLabel?: boolean;
+  allowFontScaling: boolean;
+  position: AnimatedValue;
+  navigation: NavigationScreenProp<NavigationState>;
+  jumpToIndex: (index: number) => void;
+  getLabel: (scene: TabScene) => (React.ReactNode | string);
+  getOnPress: (
+    previousScene: NavigationRoute,
+    scene: TabScene
+  ) => (args: {
+    previousScene: NavigationRoute,
+    scene: TabScene,
+    jumpToIndex: (index: number) => void,
+  }) => void;
+  getTestIDProps: (scene: TabScene) => (scene: TabScene) => any;
+  renderIcon: (scene: TabScene) => React.ReactNode;
+  style?: ViewStyle;
+  animateStyle?: ViewStyle;
+  labelStyle?: TextStyle;
+  tabStyle?: ViewStyle;
+  showIcon?: boolean;
 }
 
 export const TabBarTop: React.ComponentType<TabBarTopProps>;
@@ -845,13 +833,13 @@ export const HeaderBackButton: React.ComponentClass<HeaderBackButtonProps>;
 export const Header: React.ComponentClass<HeaderProps>;
 
 export interface NavigationInjectedProps {
-    navigation: NavigationScreenProp<NavigationState>;
+  navigation: NavigationScreenProp<NavigationState>;
 }
 
 export function withNavigation<T = {}>(
-    Component: React.ComponentType<T & NavigationInjectedProps>
+  Component: React.ComponentType<T & NavigationInjectedProps>
 ): React.ComponentType<T>;
 
 export function withNavigationFocus<T = {}>(
-    Component: React.ComponentType<T & NavigationInjectedProps>
+  Component: React.ComponentType<T & NavigationInjectedProps>
 ): React.ComponentType<T>;

From 3b02fd54e1d8ca7b0f586bd302bb6dc0a4e0777b Mon Sep 17 00:00:00 2001
From: Janeene Beeforth <gh@dawnmist.net>
Date: Mon, 26 Feb 2018 16:59:52 +1100
Subject: [PATCH 246/388] Fix error in CustomFilter definitions & support
 expandAll options.

---
 types/react-bootstrap-table/index.d.ts        | 49 ++++++++++++-----
 .../react-bootstrap-table-tests.tsx           | 53 ++++++++++++++++---
 2 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/types/react-bootstrap-table/index.d.ts b/types/react-bootstrap-table/index.d.ts
index c6f5b7654e..1ad6b3be73 100644
--- a/types/react-bootstrap-table/index.d.ts
+++ b/types/react-bootstrap-table/index.d.ts
@@ -840,6 +840,10 @@ export interface Options<TRow extends object = any> {
 	 * Background color on expanded rows (css color value).
 	 */
 	expandRowBgColor?: string;
+	/**
+	 * Expand all rows
+	 */
+	expandAll?: boolean;
 	/**
 	 * Tell react-bootstrap-table how to trigger expanding by clicking on 'row' or 'column' level.
 	 * If the value is 'column', by default all the columns are expandable. If you want to specify some columns as
@@ -1513,11 +1517,6 @@ export interface Editable<TRow extends object, K extends keyof TRow> {
 	attrs?: EditableAttrs;
 }
 
-export type SetFilterCallback = (targetValue: any) => boolean;
-export interface ApplyFilterParameter {
-	callback: SetFilterCallback;
-}
-
 /**
  * Text filter type.
  */
@@ -1709,10 +1708,25 @@ export interface DateFilter {
 	};
 }
 
+/**
+ * Custom Filter Parameters
+ */
+export interface CustomFilterParameters<Params extends object = any> {
+	callback(cell: any, params: Params): boolean;
+	callbackParameters: Params;
+}
+
+/**
+ * Custom filter element type.
+ */
+export class CustomFilterElement extends Component<any> {
+	cleanFiltered: () => void;
+}
+
 /**
  * Custom filter type.
  */
-export interface CustomFilter {
+export interface CustomFilter<FParams extends object = any, FElement extends CustomFilterElement = any> {
 	/**
 	 * Type must be 'CustomFilter'
 	 */
@@ -1721,13 +1735,13 @@ export interface CustomFilter {
 	 * Function to generate the filter component
 	 */
 	getElement(
-		filterHandler: (parameters?: ApplyFilterParameter) => void,
-		customFilterParameters: object
-	): ReactElement<any>;
+		filterHandler: (value?: CustomFilterParameters<FParams>, type?: 'CustomFilter') => void,
+		customFilterParameters: CustomFilterParameters<FParams>
+	): ReactElement<FElement>;
 	/**
 	 * Custom filter parameters to be passed to the generator function
 	 */
-	customFilterParameters: object;
+	customFilterParameters: CustomFilterParameters<FParams>;
 }
 
 /**
@@ -1818,8 +1832,8 @@ export type FilterValue =
 /**
  * Filter object that can be passed to BootstrapTableFilter.handleFilterData function.
  */
-export interface FilterData {
-	[dataField: string]: FilterValue;
+export interface FilterData<CustomFilterValue extends object = any> {
+	[dataField: string]: FilterValue | CustomFilterValue;
 }
 
 /**
@@ -1880,6 +1894,13 @@ export interface ExpandColumnComponentProps {
 	isExpanded: boolean;
 }
 
+/**
+ * Input properties for the expandedColumnHeaderComponent function.
+ */
+export interface ExpandedColumnHeaderProps {
+	anyExpand: boolean;
+}
+
 /**
  * Customize the options for expand row feature.
  */
@@ -1901,6 +1922,10 @@ export interface ExpandColumnOptions {
 	 * should be shown first. Default is true, false will move the expand indicator column after selection column.
 	 */
 	expandColumnBeforeSelectColumn?: boolean;
+	/**
+	 * a callback function to customise the header column
+	 */
+	expandedColumnHeaderComponent?(props: ExpandedColumnHeaderProps): string | ReactElement<any>;
 }
 
 /**
diff --git a/types/react-bootstrap-table/react-bootstrap-table-tests.tsx b/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
index edf2111b78..39422f2152 100644
--- a/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
+++ b/types/react-bootstrap-table/react-bootstrap-table-tests.tsx
@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { render } from 'react-dom';
 import {
-  ApplyFilterParameter,
   BootstrapTable,
   ButtonGroupProps,
   CellEdit,
   ColumnDescription,
+  CustomFilter,
   CustomSelectProps,
   DeleteButton,
   EditableAttrs,
@@ -15,6 +15,7 @@ import {
   ExportCSVButton,
   Filter,
   FilterData,
+  FilterType,
   FooterData,
   InsertButton,
   InsertModalColumnDescription,
@@ -32,7 +33,8 @@ import {
   SizePerPageDropDown,
   SortOrder,
   TableHeaderColumn,
-  ToolBarProps
+  ToolBarProps,
+  CustomFilterParameters
 } from 'react-bootstrap-table';
 
 interface Product {
@@ -135,15 +137,21 @@ class TextFilterWithCondition extends React.Component {
   }
 }
 
-function getCustomFilter(filterHandler: (parameters?: ApplyFilterParameter) => void, customFilterParameters: any) {
+interface CustomFilterParams {
+  textOK: string;
+  textNOK: string;
+}
+function getCustomFilter(filterHandler: (parameters?: CustomFilterParameters<CustomFilterParams>, type?: 'CustomFilter') => void, customFilterParameters: CustomFilterParameters<CustomFilterParams>) {
   return (
     <div />
   );
 }
 
-class CustomFilter extends React.Component {
+function customFilterCallback(cell: any, callbackParameters: CustomFilterParams) { return true; }
+
+class CustomFilterTable extends React.Component {
   render() {
-    const filter: Filter = { type: 'CustomFilter', getElement: getCustomFilter, customFilterParameters: { textOK: 'yes', textNOK: 'no' } };
+    const filter: Filter = { type: 'CustomFilter', getElement: getCustomFilter, customFilterParameters: { callback: customFilterCallback, callbackParameters: { textOK: 'yes', textNOK: 'no' }} };
     return (
       <BootstrapTable data={products}>
         <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
@@ -154,9 +162,38 @@ class CustomFilter extends React.Component {
   }
 }
 
-class RemoteProps extends React.Component {
+class RemotePropsDefault extends React.Component {
   render() {
-    const filter: Filter = { type: 'CustomFilter', getElement: getCustomFilter, customFilterParameters: { textOK: 'yes', textNOK: 'no' } };
+    const filter: CustomFilter = { type: 'CustomFilter', getElement: getCustomFilter, customFilterParameters: { callback: customFilterCallback, callbackParameters: { textOK: 'yes', textNOK: 'no' }} };
+    return (
+      <BootstrapTable
+        data={products}
+        remote={(remoteObj) => {
+          remoteObj.cellEdit = true;
+          return remoteObj;
+        }}
+        options={{
+          onCellEdit: (row: any, fieldName: string, value: any) => { console.info(row); return value; }
+        }}
+      >
+        <TableHeaderColumn dataField='id' isKey>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='isInStock' filter={filter}>Product Is In Stock</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}
+
+class RemotePropsSpecified extends React.Component {
+  render() {
+    const filter: CustomFilter<CustomFilterParams> = {
+      type: 'CustomFilter',
+      getElement: getCustomFilter,
+      customFilterParameters: {
+        callback: customFilterCallback,
+        callbackParameters: { textOK: 'yes', textNOK: 'no' }
+      }
+    };
     return (
       <BootstrapTable
         data={products}
@@ -178,7 +215,7 @@ class RemoteProps extends React.Component {
 
 class RemoteBool extends React.Component {
   render() {
-    const filter: Filter = { type: 'CustomFilter', getElement: getCustomFilter, customFilterParameters: { textOK: 'yes', textNOK: 'no' } };
+    const filter: Filter = { type: 'CustomFilter', getElement: getCustomFilter, customFilterParameters: {callback: customFilterCallback, callbackParameters: { textOK: 'yes', textNOK: 'no' } }};
     return (
       <BootstrapTable
         data={products}

From 820f42b0ff9b8f6736ae3d764f51085727390826 Mon Sep 17 00:00:00 2001
From: Tim Wang <timwangdev@users.noreply.github.com>
Date: Mon, 26 Feb 2018 15:49:42 +0800
Subject: [PATCH 247/388] Fix addNavigationHelpers type

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 3a4b079000..b9c3fd53f8 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -535,7 +535,14 @@ export type NavigatorType =
 | 'react-navigation/DRAWER';
 
 export function addNavigationHelpers<S = {}>(
-    navigation: NavigationProp<S>
+  navigation: {
+    state: S;
+    dispatch: (action: NavigationAction) => any;
+    addListener?: (
+      eventName: string,
+      callback: NavigationEventCallback
+    ) => NavigationEventSubscription;
+  }
 ): NavigationScreenProp<S>;
 
 export interface NavigationContainerProps {

From d8eb310220768f843720813ed821f04eedd3e4f9 Mon Sep 17 00:00:00 2001
From: Mathias Lorenzen <mll@ipaper.io>
Date: Mon, 26 Feb 2018 08:53:58 +0100
Subject: [PATCH 248/388] more fixes.

---
 types/knockout/index.d.ts | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 570f61d80b..54255c1c76 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -409,9 +409,18 @@ interface KnockoutTasks {
 }
 
 /////////////////////////////////
+type KnockoutObservableTypeParameter<T> = {
+    [P in keyof T]: KnockoutObservable<T[P]>|T[P];
+};
 type KnockoutObservableType<T> = {
     [P in keyof T]: KnockoutObservable<T[P]>;
 };
+type KnockoutObservableTypeRecursive<T> = {
+    [P in keyof T]: KnockoutObservable<T[P]>|KnockoutObservableTypeRecursive<T[P]>;
+};
+type KnockoutObservableTypeParameterRecursive<T> = {
+    [P in keyof T]: KnockoutObservable<T[P]>|T[P]|KnockoutObservableTypeRecursive<T[P]>;
+};
 
 interface KnockoutStatic {
     utils: KnockoutUtils;
@@ -443,11 +452,19 @@ interface KnockoutStatic {
     contextFor(node: any): any;
     isSubscribable(instance: any): instance is KnockoutSubscribable<any>;
     toJSON(viewModel: any, replacer?: Function, space?: any): string;
-    toJS<T>(viewModel: KnockoutObservableArray<T>|KnockoutObservableType<T>[]|KnockoutObservableArray<KnockoutObservableType<T>>|T[]): T[];
-    toJS<T>(viewModel: KnockoutObservable<T>|KnockoutObservableType<T>|KnockoutObservable<KnockoutObservableType<T>>|T): T;
-    isObservable<T>(instance: KnockoutObservable<T>|T): instance is KnockoutObservable<T>;
-    isWriteableObservable<T>(instance: KnockoutObservable<T>|T): instance is KnockoutObservable<T>;
-    isComputed<T>(instance: KnockoutObservable<T>|T): instance is KnockoutComputed<T>;
+
+    toJS<T>(viewModel: KnockoutObservableArray<T>|KnockoutObservableTypeParameterRecursive<T>[]|KnockoutObservableArray<KnockoutObservableTypeParameterRecursive<T>>|T[]): T[];
+    toJS<T>(viewModel: KnockoutObservable<T>|KnockoutObservableTypeParameterRecursive<T>|KnockoutObservable<KnockoutObservableTypeParameterRecursive<T>>): T;
+
+    isObservable(instance: any): instance is KnockoutObservable<any>;
+    isObservable<T>(instance: KnockoutObservable<T>): instance is KnockoutObservable<T>;
+
+    isWriteableObservable(instance: any): instance is KnockoutObservable<any>;
+    isWriteableObservable<T>(instance: KnockoutObservable<T>): instance is KnockoutObservable<T>;
+
+    isComputed(instance: any): instance is KnockoutComputed<any>;
+    isComputed<T>(instance: KnockoutObservable<T> | T): instance is KnockoutComputed<T>;
+
     dataFor(node: any): any;
     removeNode(node: Node): void;
     cleanNode(node: Node): Node;

From e7e644ccbcf03496df592982870a4e6dc44b98c3 Mon Sep 17 00:00:00 2001
From: Netanel Draiman <Nexxado@users.noreply.github.com>
Date: Mon, 26 Feb 2018 10:06:07 +0200
Subject: [PATCH 249/388] [video.js] Added missing methods to Player interface

Added the following missing methods to video.js's Player interface:

```
controls(bool?: boolean): boolean;
        muted(muted?: boolean): boolean;
        preload(value?: boolean): string;
        autoplay(value?: boolean): string;
        loop(value?: boolean): string;
```
---
 types/video.js/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/video.js/index.d.ts b/types/video.js/index.d.ts
index cde81fbe46..eaf49a1833 100644
--- a/types/video.js/index.d.ts
+++ b/types/video.js/index.d.ts
@@ -71,5 +71,10 @@ declare namespace videojs {
 		removeRemoteTextTrack(track: HTMLTrackElement): void;
 		poster(val?: string): string | Player;
 		playbackRate(rate?: number): number;
+		controls(bool?: boolean): boolean;
+        muted(muted?: boolean): boolean;
+        preload(value?: boolean): string;
+        autoplay(value?: boolean): string;
+        loop(value?: boolean): string;
 	}
 }

From 4739cf80e488687d8dc0d2f638f7b25602689b31 Mon Sep 17 00:00:00 2001
From: Tim Wang <timwangdev@users.noreply.github.com>
Date: Mon, 26 Feb 2018 16:53:56 +0800
Subject: [PATCH 250/388] Make getStateForAction lastState optional

---
 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 b9c3fd53f8..7cc0dc3d63 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -109,7 +109,7 @@ export interface NavigationRouter<State, Action, Options> {
    * 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 | null)) => (State | null);
+  getStateForAction: (action: Action, lastState?: State) => (State | null);
 
   /**
    * Maps a URI-like string to an action. This can be mapped to a state

From 61168b2479e69e6c4c14f2fba967fe0bc996ee23 Mon Sep 17 00:00:00 2001
From: Mathias Lorenzen <mll@ipaper.io>
Date: Mon, 26 Feb 2018 12:03:05 +0100
Subject: [PATCH 251/388] added new tests.

---
 types/knockout/index.d.ts    |  9 ++++-----
 types/knockout/test/index.ts | 13 +++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 54255c1c76..6d1dcbab59 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -416,10 +416,10 @@ type KnockoutObservableType<T> = {
     [P in keyof T]: KnockoutObservable<T[P]>;
 };
 type KnockoutObservableTypeRecursive<T> = {
-    [P in keyof T]: KnockoutObservable<T[P]>|KnockoutObservableTypeRecursive<T[P]>;
+    [P in keyof T]: KnockoutObservable<KnockoutObservableSubTypeRecursive<T[P]>|T[P]>;
 };
-type KnockoutObservableTypeParameterRecursive<T> = {
-    [P in keyof T]: KnockoutObservable<T[P]>|T[P]|KnockoutObservableTypeRecursive<T[P]>;
+type KnockoutObservableSubTypeRecursive<T> = {
+    [P in keyof T]: KnockoutObservable<T[P]>;
 };
 
 interface KnockoutStatic {
@@ -453,8 +453,7 @@ interface KnockoutStatic {
     isSubscribable(instance: any): instance is KnockoutSubscribable<any>;
     toJSON(viewModel: any, replacer?: Function, space?: any): string;
 
-    toJS<T>(viewModel: KnockoutObservableArray<T>|KnockoutObservableTypeParameterRecursive<T>[]|KnockoutObservableArray<KnockoutObservableTypeParameterRecursive<T>>|T[]): T[];
-    toJS<T>(viewModel: KnockoutObservable<T>|KnockoutObservableTypeParameterRecursive<T>|KnockoutObservable<KnockoutObservableTypeParameterRecursive<T>>): T;
+    toJS(viewModel: any): any;
 
     isObservable(instance: any): instance is KnockoutObservable<any>;
     isObservable<T>(instance: KnockoutObservable<T>): instance is KnockoutObservable<T>;
diff --git a/types/knockout/test/index.ts b/types/knockout/test/index.ts
index 36db7657ed..bc62702e0d 100644
--- a/types/knockout/test/index.ts
+++ b/types/knockout/test/index.ts
@@ -99,6 +99,19 @@ class GetterViewModel {
     public range: KnockoutObservable<any>;
 }
 
+function testToJs() {
+    var objKo = {
+        prop: ko.observable("prop"),
+        subKo: ko.observable({
+            prop: ko.observable("prop")
+        })
+    };
+
+    var objJs = ko.toJS(objKo);
+    objJs.prop; // $ExpectType any
+    objJs.subKo.prop; // $ExpectType any
+}
+
 function testGetter() {
     var model = new GetterViewModel();
 

From ac6f6b3e1f8f9abc2fcc8006d194f1b83e299206 Mon Sep 17 00:00:00 2001
From: Mathias Lorenzen <mll@ipaper.io>
Date: Mon, 26 Feb 2018 13:26:44 +0100
Subject: [PATCH 252/388] undo stuff.

---
 types/knockout/index.d.ts | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 6d1dcbab59..dc5cc833c1 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -409,19 +409,6 @@ interface KnockoutTasks {
 }
 
 /////////////////////////////////
-type KnockoutObservableTypeParameter<T> = {
-    [P in keyof T]: KnockoutObservable<T[P]>|T[P];
-};
-type KnockoutObservableType<T> = {
-    [P in keyof T]: KnockoutObservable<T[P]>;
-};
-type KnockoutObservableTypeRecursive<T> = {
-    [P in keyof T]: KnockoutObservable<KnockoutObservableSubTypeRecursive<T[P]>|T[P]>;
-};
-type KnockoutObservableSubTypeRecursive<T> = {
-    [P in keyof T]: KnockoutObservable<T[P]>;
-};
-
 interface KnockoutStatic {
     utils: KnockoutUtils;
     memoization: KnockoutMemoization;

From 0e479f508b14e21281cf2f427cb4e240fa009631 Mon Sep 17 00:00:00 2001
From: Silas Rech <silas.rech@protonmail.com>
Date: Mon, 26 Feb 2018 15:58:48 +0100
Subject: [PATCH 253/388] Update inert types to 5.1 (#23864)

---
 types/h2o2/tsconfig.json                |   3 +
 types/hapi-auth-jwt2/tsconfig.json      |   5 +-
 types/hapi-decorators/tsconfig.json     |   5 +-
 types/hapi/v16/tsconfig.json            |   3 +
 types/inert/index.d.ts                  | 121 ++++++++++----
 types/inert/inert-tests.ts              | 202 +++++++++++-------------
 types/inert/tsconfig.json               |   5 +-
 types/inert/tslint.json                 |  80 +---------
 types/inert/v4/index.d.ts               | 116 ++++++++++++++
 types/inert/v4/inert-tests.ts           | 130 +++++++++++++++
 types/inert/v4/tsconfig.json            |  34 ++++
 types/inert/v4/tslint.json              |  79 +++++++++
 types/swagger-express-mw/tsconfig.json  |   5 +-
 types/swagger-hapi/tsconfig.json        |   5 +-
 types/swagger-node-runner/tsconfig.json |   5 +-
 types/swagger-restify-mw/tsconfig.json  |   5 +-
 types/swagger-sails-hook/tsconfig.json  |   5 +-
 types/vision/v4/tsconfig.json           |   3 +
 18 files changed, 574 insertions(+), 237 deletions(-)
 create mode 100644 types/inert/v4/index.d.ts
 create mode 100644 types/inert/v4/inert-tests.ts
 create mode 100644 types/inert/v4/tsconfig.json
 create mode 100644 types/inert/v4/tslint.json

diff --git a/types/h2o2/tsconfig.json b/types/h2o2/tsconfig.json
index 9d5b689ee1..eb41a55289 100644
--- a/types/h2o2/tsconfig.json
+++ b/types/h2o2/tsconfig.json
@@ -19,6 +19,9 @@
             ],
             "hapi": [
                 "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
             ]
         },
         "noEmit": true,
diff --git a/types/hapi-auth-jwt2/tsconfig.json b/types/hapi-auth-jwt2/tsconfig.json
index 1f8cc10075..ada8a3f94d 100644
--- a/types/hapi-auth-jwt2/tsconfig.json
+++ b/types/hapi-auth-jwt2/tsconfig.json
@@ -19,6 +19,9 @@
             ],
             "hapi": [
                 "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
             ]
         },
         "noEmit": true,
@@ -28,4 +31,4 @@
         "index.d.ts",
         "hapi-auth-jwt2-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/hapi-decorators/tsconfig.json b/types/hapi-decorators/tsconfig.json
index 44437f4b9e..a018c33c53 100644
--- a/types/hapi-decorators/tsconfig.json
+++ b/types/hapi-decorators/tsconfig.json
@@ -21,6 +21,9 @@
             ],
             "hapi": [
                 "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
             ]
         },
         "noEmit": true,
@@ -30,4 +33,4 @@
         "index.d.ts",
         "hapi-decorators-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/hapi/v16/tsconfig.json b/types/hapi/v16/tsconfig.json
index d3d30f97dc..517d678910 100644
--- a/types/hapi/v16/tsconfig.json
+++ b/types/hapi/v16/tsconfig.json
@@ -19,6 +19,9 @@
             ],
             "hapi": [
                 "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
             ]
         },
         "noEmit": true,
diff --git a/types/inert/index.d.ts b/types/inert/index.d.ts
index e74d1a4ce9..d8c1d90422 100644
--- a/types/inert/index.d.ts
+++ b/types/inert/index.d.ts
@@ -1,16 +1,28 @@
-// Type definitions for inert 4.2
+// Type definitions for inert 5.1
 // Project: https://github.com/hapijs/inert/
-// Definitions by: Steve Ognibene <https://github.com/nycdotnet>, AJP <https://github.com/AJamesPhillips>
+// Definitions by: Steve Ognibene <https://github.com/nycdotnet>
+//                 Alexander James Phillips <https://github.com/AJamesPhillips>
+//                 Silas Rech <https://github.com/lenovouser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-import * as hapi from 'hapi';
+import {
+    Plugin,
+    Request,
+} from 'hapi';
 
 declare namespace inert {
-    export interface ReplyFileHandlerOptions {
-        /** confine - serve file relative to this directory and returns 403 Forbidden if the path resolves outside the confine directory. Defaults to true which uses the relativeTo route option as the confine. Set to false to disable this security feature. */
+    type RequestHandler<T> = (request: Request) => T;
+
+    interface ReplyFileHandlerOptions {
+        /**
+         * confine - serve file relative to this directory and returns 403 Forbidden if the path resolves outside the confine directory.
+         * Defaults to true which uses the relativeTo route option as the confine. Set to false to disable this security feature.
+         */
         confine?: boolean;
-        /** filename - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path */
+        /**
+         * filename - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path
+         */
         filename?: string;
         /**
          * mode - specifies whether to include the 'Content-Disposition' header with the response. Available values:
@@ -19,9 +31,13 @@ declare namespace inert {
          *  *'inline'
          */
         mode?: false | 'attachment' | 'inline';
-        /** lookupCompressed - if true, looks for for a pre-compressed version of the file with the same filename with an extension, depending on the accepted encoding. Defaults to false. */
+        /**
+         * lookupCompressed - if true, looks for for a pre-compressed version of the file with the same filename with an extension, depending on the accepted encoding. Defaults to false.
+         */
         lookupCompressed?: boolean;
-        /** lookupMap - an object which maps content encoding to expected file name extension. Defaults to `{ gzip: '.gz' }. */
+        /**
+         * lookupMap - an object which maps content encoding to expected file name extension. Defaults to `{ gzip: '.gz' }.
+         */
         lookupMap?: {[index: string]: string};
         /**
          * etagMethod - specifies the method used to calculate the ETag header response. Available values:
@@ -30,33 +46,56 @@ declare namespace inert {
          *  * false - Disable ETag computation.
          */
         etagMethod?: 'hash' | 'simple' | false;
-        /** start - offset in file to reading from, defaults to 0. */
+        /**
+         * start - offset in file to reading from, defaults to 0.
+         */
         start?: number;
-        /** end - offset in file to stop reading from. If not set, will read to end of file. */
+        /**
+         * end - offset in file to stop reading from. If not set, will read to end of file.
+         */
         end?: number;
     }
 
-    export interface FileHandlerRouteObject extends ReplyFileHandlerOptions {
-        /** path - a path string or function as described above (required). */
-        path: string | hapi.RequestHandler<string>;
+    interface FileHandlerRouteObject extends ReplyFileHandlerOptions {
+        /**
+         * path - a path string or function as described above (required).
+         */
+        path: string | RequestHandler<string>;
     }
 
-    export interface DirectoryHandlerRouteObject {
-        /** path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
-         *  * a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
-         *  * an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
-         *  * a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
+    interface DirectoryHandlerRouteObject {
+        /**
+         * path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
+         * * a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
+         * * an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
+         * * a function with the signature function(request) which returns the path string or an array of path strings.
+         *   If the function returns an error, the error is passed back to the client in the response.
+         */
+        path: string | string[] | RequestHandler<string | string[] | Error>;
+        /**
+         * index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory.
+         * The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'.
+         * Any falsy value disables index file lookup. Defaults to true.
          */
-        path: string | string[] | hapi.RequestHandler<string | string[] | Error>;
-        /** index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true. */
         index?: boolean | string | string[];
-        /** listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false. */
+        /**
+         * listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
+         */
         listing?: boolean;
-        /** showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false. */
+        /**
+         * showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
+         */
         showHidden?: boolean;
-        /** redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false. */
+        /**
+         * redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash.
+         * Useful for ensuring relative links inside the response are resolved correctly.
+         * Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
+         */
         redirectToSlash?: boolean;
-        /** lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false. */
+        /**
+         * lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed
+         * version of the file to serve if the request supports content encoding. Defaults to false.
+         */
         lookupCompressed?: boolean;
         /**
          * etagMethod - specifies the method used to calculate the ETag header response. Available values:
@@ -65,7 +104,9 @@ declare namespace inert {
          *  * false - Disable ETag computation.
          */
         etagMethod?: 'hash' | 'simple' | false;
-        /** defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension. */
+        /**
+         * defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.
+         */
         defaultExtension?: string;
     }
 
@@ -81,8 +122,12 @@ declare namespace inert {
     }
 }
 
+declare const inert: Plugin<inert.OptionalRegistrationOptions>;
+
+export = inert;
+
 declare module 'hapi' {
-    interface RouteHandlerPlugins {
+    interface RouteOptions {
         /**
          * The file handler
          *
@@ -92,25 +137,33 @@ declare module 'hapi' {
          *  * an object with one or more of the following options @see IFileHandler
          * @see {@link https://github.com/hapijs/inert#the-file-handler}
          */
-        file?: string | RequestHandler<string> | inert.FileHandlerRouteObject;
+        file?: string | inert.RequestHandler<string> | inert.FileHandlerRouteObject;
         /**
          * The directory handler
          *
-         * Generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
+         * Generates a directory endpoint for serving static content from a directory.
+         * Routes using the directory handler must include a path parameter at the end of the path string
+         * (e.g. /path/to/somewhere/{param} where the parameter name does not matter).
+         * The path parameter can use any of the parameter options (e.g. {param} for one level files only,
+         * {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level).
+         * If additional path parameters are present, they are ignored for the purpose of selecting the file system resource.
+         * The directory handler is an object with the following options:
          * @see {@link https://github.com/hapijs/inert#the-directory-handler}
          */
         directory?: inert.DirectoryHandlerRouteObject;
+        files?: {
+            /**
+             * Set the relative path
+             */
+            relativeTo: string;
+        };
     }
 
-    interface Base_Reply {
+    interface ResponseToolkit {
         /**
          * Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.
          * @see {@link https://github.com/hapijs/inert#replyfilepath-options}
          */
-        file: (path: string, options?: inert.ReplyFileHandlerOptions) => Response;
+        file(path: string, options?: inert.ReplyFileHandlerOptions): ResponseObject;
     }
 }
-
-declare var inert: hapi.PluginFunction<inert.OptionalRegistrationOptions>;
-
-export = inert;
diff --git a/types/inert/inert-tests.ts b/types/inert/inert-tests.ts
index 9062e13f6b..b772a38259 100644
--- a/types/inert/inert-tests.ts
+++ b/types/inert/inert-tests.ts
@@ -1,130 +1,106 @@
-// Copied from: https://github.com/hapijs/inert#examples
+import {
+    Server,
+    Lifecycle,
+} from 'hapi';
 
-import Path = require('path');
-import Hapi = require('hapi');
-import Inert = require('inert');
+import * as path from 'path';
+import * as inert from 'inert';
 
-const server = new Hapi.Server({
-    connections: {
-        routes: {
-            files: {
-                relativeTo: Path.join(__dirname, 'public')
+const server = new Server({
+    port: 3000,
+    routes: {
+        files: {
+            relativeTo: path.join(__dirname, 'public')
+        }
+    }
+});
+
+const provision = async () => {
+    await server.register(inert);
+
+    await server.register({
+        plugin: inert,
+        options: { etagsCacheMaxSize: 400 },
+    });
+
+    await server.register({
+        plugin: inert,
+        once: true,
+    });
+
+    server.route({
+        method: 'GET',
+        path: '/{param*}',
+        handler: {
+            directory: {
+                path: '.',
+                redirectToSlash: true,
+                index: true
             }
         }
-    }
-});
-server.connection({ port: 3000 });
+    });
 
-server.register(Inert, () => {});
-
-// added in addition to code from docs
-const options: Inert.OptionalRegistrationOptions = {etagsCacheMaxSize: 400};
-server.register({
-    register: Inert,
-    options,
-}, (err) => {});
-
-// added in addition to code from docs
-server.register({
-    register: Inert,
-    once: true,
-}, (err) => {});
-
-server.route({
-    method: 'GET',
-    path: '/{param*}',
-    handler: {
-        directory: {
-            path: '.',
-            redirectToSlash: true,
-            index: true
+    // https://github.com/hapijs/inert#serving-a-single-file
+    server.route({
+        method: 'GET',
+        path: '/{path*}',
+        handler: {
+            file: 'page.html'
         }
-    }
-});
+    });
 
-server.start((err) => {
+    // https://github.com/hapijs/inert#customized-file-response
+    server.route({
+        method: 'GET',
+        path: '/file',
+        handler(request, reply) {
+            let path = 'plain.txt';
+            if (request.headers['x-magic'] === 'sekret') {
+                path = 'awesome.png';
+            }
 
-    if (err) {
-        throw err;
-    }
+            return reply.file(path).vary('x-magic');
+        }
+    });
 
-    console.log('Server running at:', server.info!.uri);
-});
-
-// https://github.com/hapijs/inert#serving-a-single-file
-
-server.route({
-    method: 'GET',
-    path: '/{path*}',
-    handler: {
-        file: 'page.html'
-    }
-});
-
-// https://github.com/hapijs/inert#customized-file-response
-
-server.route({
-    method: 'GET',
-    path: '/file',
-    handler: function (request, reply) {
-
-        let path = 'plain.txt';
-        if (request.headers['x-magic'] === 'sekret') {
-            path = 'awesome.png';
+    const handler: Lifecycle.Method = (request, h) => {
+        const response = request.response;
+        if (response instanceof Error && response.output.statusCode === 404) {
+            return h.file('404.html').code(404);
         }
 
-        return reply.file(path).vary('x-magic');
-    }
-});
+        return h.continue;
+    };
 
-const handler: Hapi.ServerExtRequestHandler = function (request, reply) {
+    server.ext('onPostHandler', handler);
 
-    const response = request.response!;
-    if (response.isBoom &&
-        response.output!.statusCode === 404) {
+    const file: inert.FileHandlerRouteObject = {
+        path: '',
+        confine: true,
+    };
 
-        return reply.file('404.html').code(404);
-    }
+    const directory: inert.DirectoryHandlerRouteObject = {
+        path: '',
+        listing: true
+    };
 
-    return reply.continue();
-}
-
-server.ext('onPostHandler', handler);
-
-// additional code added in addition to doc example code
-
-var file: Inert.FileHandlerRouteObject = {
-    path: '',
-    confine: true,
-};
-var directory: Inert.DirectoryHandlerRouteObject = {
-    path: '',
-    listing: true
-};
-
-file = {
-    path: '',
-    confine: true,
-};
-
-server.route({
-    path: '',
-    method: 'GET',
-    handler: {
-        file,
-        directory: {
-            path: function(){
-                if(Math.random() > 0.5) {
-                    return '';
-                }
-                else if(Math.random() > 0) {
-                    return [''];
-                }
-                return new Error('');
+    server.route({
+        path: '',
+        method: 'GET',
+        handler: {
+            file,
+            directory: {
+                path() {
+                    if (Math.random() > 0.5) {
+                        return '';
+                    } else if (Math.random() > 0) {
+                        return [''];
+                    }
+                    return new Error('');
+                },
+                BAD_listing: true,
             },
-            BAD_listing: true,  // TODO change typings to make this error
         },
-    },
-    config: { files: { relativeTo: __dirname } }
-})
-
+        options: { files: { relativeTo: __dirname } }
+    });
+};
diff --git a/types/inert/tsconfig.json b/types/inert/tsconfig.json
index c96c356741..238aa1a3eb 100644
--- a/types/inert/tsconfig.json
+++ b/types/inert/tsconfig.json
@@ -16,9 +16,6 @@
         "paths": {
             "boom": [
                 "boom/v4"
-            ],
-            "hapi": [
-                "hapi/v16"
             ]
         },
         "noEmit": true,
@@ -28,4 +25,4 @@
         "index.d.ts",
         "inert-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/inert/tslint.json b/types/inert/tslint.json
index a41bf5d19a..3db14f85ea 100644
--- a/types/inert/tslint.json
+++ b/types/inert/tslint.json
@@ -1,79 +1 @@
-{
-    "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/inert/v4/index.d.ts b/types/inert/v4/index.d.ts
new file mode 100644
index 0000000000..e74d1a4ce9
--- /dev/null
+++ b/types/inert/v4/index.d.ts
@@ -0,0 +1,116 @@
+// Type definitions for inert 4.2
+// Project: https://github.com/hapijs/inert/
+// Definitions by: Steve Ognibene <https://github.com/nycdotnet>, AJP <https://github.com/AJamesPhillips>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import * as hapi from 'hapi';
+
+declare namespace inert {
+    export interface ReplyFileHandlerOptions {
+        /** confine - serve file relative to this directory and returns 403 Forbidden if the path resolves outside the confine directory. Defaults to true which uses the relativeTo route option as the confine. Set to false to disable this security feature. */
+        confine?: boolean;
+        /** filename - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path */
+        filename?: string;
+        /**
+         * mode - specifies whether to include the 'Content-Disposition' header with the response. Available values:
+         *  * false - header is not included. This is the default value.
+         *  * 'attachment'
+         *  *'inline'
+         */
+        mode?: false | 'attachment' | 'inline';
+        /** lookupCompressed - if true, looks for for a pre-compressed version of the file with the same filename with an extension, depending on the accepted encoding. Defaults to false. */
+        lookupCompressed?: boolean;
+        /** lookupMap - an object which maps content encoding to expected file name extension. Defaults to `{ gzip: '.gz' }. */
+        lookupMap?: {[index: string]: string};
+        /**
+         * etagMethod - specifies the method used to calculate the ETag header response. Available values:
+         *  * 'hash' - SHA1 sum of the file contents, suitable for distributed deployments. Default value.
+         *  * 'simple' - Hex encoded size and modification date, suitable when files are stored on a single server.
+         *  * false - Disable ETag computation.
+         */
+        etagMethod?: 'hash' | 'simple' | false;
+        /** start - offset in file to reading from, defaults to 0. */
+        start?: number;
+        /** end - offset in file to stop reading from. If not set, will read to end of file. */
+        end?: number;
+    }
+
+    export interface FileHandlerRouteObject extends ReplyFileHandlerOptions {
+        /** path - a path string or function as described above (required). */
+        path: string | hapi.RequestHandler<string>;
+    }
+
+    export interface DirectoryHandlerRouteObject {
+        /** path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
+         *  * a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
+         *  * an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
+         *  * a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
+         */
+        path: string | string[] | hapi.RequestHandler<string | string[] | Error>;
+        /** index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true. */
+        index?: boolean | string | string[];
+        /** listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false. */
+        listing?: boolean;
+        /** showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false. */
+        showHidden?: boolean;
+        /** redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false. */
+        redirectToSlash?: boolean;
+        /** lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false. */
+        lookupCompressed?: boolean;
+        /**
+         * etagMethod - specifies the method used to calculate the ETag header response. Available values:
+         *  * 'hash' - SHA1 sum of the file contents, suitable for distributed deployments. Default value.
+         *  * 'simple' - Hex encoded size and modification date, suitable when files are stored on a single server.
+         *  * false - Disable ETag computation.
+         */
+        etagMethod?: 'hash' | 'simple' | false;
+        /** defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension. */
+        defaultExtension?: string;
+    }
+
+    /**
+     * inert accepts the following registration options
+     * @see {@link https://github.com/hapijs/inert#registration-options}
+     */
+    interface OptionalRegistrationOptions {
+        /**
+         * sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.
+         */
+        etagsCacheMaxSize?: number;
+    }
+}
+
+declare module 'hapi' {
+    interface RouteHandlerPlugins {
+        /**
+         * The file handler
+         *
+         * Generates a static file endpoint for serving a single file. file can be set to:
+         *  * a relative or absolute file path string (relative paths are resolved based on the route files configuration).
+         *  * a function with the signature function(request) which returns the relative or absolute file path.
+         *  * an object with one or more of the following options @see IFileHandler
+         * @see {@link https://github.com/hapijs/inert#the-file-handler}
+         */
+        file?: string | RequestHandler<string> | inert.FileHandlerRouteObject;
+        /**
+         * The directory handler
+         *
+         * Generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
+         * @see {@link https://github.com/hapijs/inert#the-directory-handler}
+         */
+        directory?: inert.DirectoryHandlerRouteObject;
+    }
+
+    interface Base_Reply {
+        /**
+         * Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.
+         * @see {@link https://github.com/hapijs/inert#replyfilepath-options}
+         */
+        file: (path: string, options?: inert.ReplyFileHandlerOptions) => Response;
+    }
+}
+
+declare var inert: hapi.PluginFunction<inert.OptionalRegistrationOptions>;
+
+export = inert;
diff --git a/types/inert/v4/inert-tests.ts b/types/inert/v4/inert-tests.ts
new file mode 100644
index 0000000000..9062e13f6b
--- /dev/null
+++ b/types/inert/v4/inert-tests.ts
@@ -0,0 +1,130 @@
+// Copied from: https://github.com/hapijs/inert#examples
+
+import Path = require('path');
+import Hapi = require('hapi');
+import Inert = require('inert');
+
+const server = new Hapi.Server({
+    connections: {
+        routes: {
+            files: {
+                relativeTo: Path.join(__dirname, 'public')
+            }
+        }
+    }
+});
+server.connection({ port: 3000 });
+
+server.register(Inert, () => {});
+
+// added in addition to code from docs
+const options: Inert.OptionalRegistrationOptions = {etagsCacheMaxSize: 400};
+server.register({
+    register: Inert,
+    options,
+}, (err) => {});
+
+// added in addition to code from docs
+server.register({
+    register: Inert,
+    once: true,
+}, (err) => {});
+
+server.route({
+    method: 'GET',
+    path: '/{param*}',
+    handler: {
+        directory: {
+            path: '.',
+            redirectToSlash: true,
+            index: true
+        }
+    }
+});
+
+server.start((err) => {
+
+    if (err) {
+        throw err;
+    }
+
+    console.log('Server running at:', server.info!.uri);
+});
+
+// https://github.com/hapijs/inert#serving-a-single-file
+
+server.route({
+    method: 'GET',
+    path: '/{path*}',
+    handler: {
+        file: 'page.html'
+    }
+});
+
+// https://github.com/hapijs/inert#customized-file-response
+
+server.route({
+    method: 'GET',
+    path: '/file',
+    handler: function (request, reply) {
+
+        let path = 'plain.txt';
+        if (request.headers['x-magic'] === 'sekret') {
+            path = 'awesome.png';
+        }
+
+        return reply.file(path).vary('x-magic');
+    }
+});
+
+const handler: Hapi.ServerExtRequestHandler = function (request, reply) {
+
+    const response = request.response!;
+    if (response.isBoom &&
+        response.output!.statusCode === 404) {
+
+        return reply.file('404.html').code(404);
+    }
+
+    return reply.continue();
+}
+
+server.ext('onPostHandler', handler);
+
+// additional code added in addition to doc example code
+
+var file: Inert.FileHandlerRouteObject = {
+    path: '',
+    confine: true,
+};
+var directory: Inert.DirectoryHandlerRouteObject = {
+    path: '',
+    listing: true
+};
+
+file = {
+    path: '',
+    confine: true,
+};
+
+server.route({
+    path: '',
+    method: 'GET',
+    handler: {
+        file,
+        directory: {
+            path: function(){
+                if(Math.random() > 0.5) {
+                    return '';
+                }
+                else if(Math.random() > 0) {
+                    return [''];
+                }
+                return new Error('');
+            },
+            BAD_listing: true,  // TODO change typings to make this error
+        },
+    },
+    config: { files: { relativeTo: __dirname } }
+})
+
diff --git a/types/inert/v4/tsconfig.json b/types/inert/v4/tsconfig.json
new file mode 100644
index 0000000000..fd468493b4
--- /dev/null
+++ b/types/inert/v4/tsconfig.json
@@ -0,0 +1,34 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "boom": [
+                "boom/v4"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "inert-tests.ts"
+    ]
+}
diff --git a/types/inert/v4/tslint.json b/types/inert/v4/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/inert/v4/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/swagger-express-mw/tsconfig.json b/types/swagger-express-mw/tsconfig.json
index 1d597728f7..c1db9f10a4 100644
--- a/types/swagger-express-mw/tsconfig.json
+++ b/types/swagger-express-mw/tsconfig.json
@@ -19,6 +19,9 @@
             ],
             "hapi": [
                 "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
             ]
         },
         "noEmit": true,
@@ -28,4 +31,4 @@
         "index.d.ts",
         "swagger-express-mw-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swagger-hapi/tsconfig.json b/types/swagger-hapi/tsconfig.json
index 410688bcf1..df8e735e23 100644
--- a/types/swagger-hapi/tsconfig.json
+++ b/types/swagger-hapi/tsconfig.json
@@ -19,6 +19,9 @@
             ],
             "hapi": [
                 "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
             ]
         },
         "noEmit": true,
@@ -28,4 +31,4 @@
         "index.d.ts",
         "swagger-hapi-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swagger-node-runner/tsconfig.json b/types/swagger-node-runner/tsconfig.json
index e559433107..d8bb8c8f52 100644
--- a/types/swagger-node-runner/tsconfig.json
+++ b/types/swagger-node-runner/tsconfig.json
@@ -19,6 +19,9 @@
             ],
             "hapi": [
                 "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
             ]
         },
         "noEmit": true,
@@ -28,4 +31,4 @@
         "index.d.ts",
         "swagger-node-runner-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swagger-restify-mw/tsconfig.json b/types/swagger-restify-mw/tsconfig.json
index 8c5f09a930..ec732988fc 100644
--- a/types/swagger-restify-mw/tsconfig.json
+++ b/types/swagger-restify-mw/tsconfig.json
@@ -19,6 +19,9 @@
             ],
             "hapi": [
                 "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
             ]
         },
         "noEmit": true,
@@ -28,4 +31,4 @@
         "index.d.ts",
         "swagger-restify-mw-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swagger-sails-hook/tsconfig.json b/types/swagger-sails-hook/tsconfig.json
index 508453b078..98768dd651 100644
--- a/types/swagger-sails-hook/tsconfig.json
+++ b/types/swagger-sails-hook/tsconfig.json
@@ -19,6 +19,9 @@
             ],
             "hapi": [
                 "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
             ]
         },
         "noEmit": true,
@@ -28,4 +31,4 @@
         "index.d.ts",
         "swagger-sails-hook-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/vision/v4/tsconfig.json b/types/vision/v4/tsconfig.json
index bee5c542c4..2ab1f666a0 100644
--- a/types/vision/v4/tsconfig.json
+++ b/types/vision/v4/tsconfig.json
@@ -20,6 +20,9 @@
             "hapi": [
                 "hapi/v16"
             ],
+            "inert": [
+                "inert/v4"
+            ],
             "vision": [
                 "vision/v4"
             ]

From cc4dd221339073fe2babad043b6f2837fe4cecfd Mon Sep 17 00:00:00 2001
From: Grant Timmerman <granttimmerman@gmail.com>
Date: Mon, 26 Feb 2018 07:19:22 -0800
Subject: [PATCH 254/388] Add Google Apps Script Slides (#23657)

* Add Apps Script Google Slides

* Update CODEOWNERS

* Update CODEOWNERS
---
 .github/CODEOWNERS                            |    2 +-
 .../google-apps-script.slides.d.ts            | 1423 +++++++++++++++++
 types/google-apps-script/index.d.ts           |    1 +
 3 files changed, 1425 insertions(+), 1 deletion(-)
 create mode 100644 types/google-apps-script/google-apps-script.slides.d.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a03915a264..be7e9011fd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1214,7 +1214,7 @@
 /types/gm/                                      @ChaosinaCan @maartenvanvliet
 /types/go/                                      @NorthwoodsSoftware
 /types/google-adwords-scripts/                  @jafaircl
-/types/google-apps-script/                      @motemen
+/types/google-apps-script/                      @motemen @grant
 /types/google-apps-script-oauth2/               @dhayab
 /types/google-cloud__datastore/                 @beaulac
 /types/google-cloud__pubsub/                    @pheromonez
diff --git a/types/google-apps-script/google-apps-script.slides.d.ts b/types/google-apps-script/google-apps-script.slides.d.ts
new file mode 100644
index 0000000000..494663f002
--- /dev/null
+++ b/types/google-apps-script/google-apps-script.slides.d.ts
@@ -0,0 +1,1423 @@
+// Type definitions for Google Apps Script 2018-02-14
+// Project: https://developers.google.com/apps-script/
+// Definitions by: motemen <https://github.com/motemen/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="google-apps-script.types.d.ts" />
+/// <reference path="google-apps-script.base.d.ts" />
+/// <reference path="google-apps-script.spreadsheet.d.ts" />
+
+declare namespace GoogleAppsScript {
+  export module Slides {
+    /**
+     * A 3x3 matrix used to transform source coordinates (x1, y1) into destination coordinates (x2, y2)
+     *  according to matrix multiplication:
+     *
+     *      [ x2 ]   [ scaleX shearX translateX ] [ x1 ]
+     *      [ y2 ] = [ shearY scaleY translateY ] [ y1 ]
+     *      [ 1  ]   [   0      0        1      ] [ 1  ]
+     *
+     * After transformation,
+     *
+     *      x2 = scaleX * x1 + shearX * y1 + translateX
+     *      y2 = scaleY * y1 + shearY * x1 + translateY
+     */
+    export interface AffineTransform {
+      getScaleX(): Number;
+      getScaleY(): Number;
+      getShearX(): Number;
+      getShearY(): Number;
+      getTranslateX(): Number;
+      getTranslateY(): Number;
+      toBuilder(): AffineTransformBuilder;
+    }
+
+    /**
+     * A builder for AffineTransform objects. Defaults to the identity transform.
+     *
+     * Call AffineTransformBuilder#build() to get the AffineTransform object.
+     *
+     *      var transform =
+     *          SlidesApp.newAffineTransformBuilder().setScaleX(2.0).setShearY(1.1).build();
+     *
+     *      The resulting transform matrix is
+     *        [ 2.0   0.0   0.0 ]
+     *        [ 1.1   1.0   0.0 ]
+     *        [  0     0     1  ]
+     */
+    export interface AffineTransformBuilder {
+      build(): AffineTransform;
+      setScaleX(scaleX: Number): AffineTransformBuilder;
+      setScaleY(scaleY: Number): AffineTransformBuilder;
+      setShearX(shearX: Number): AffineTransformBuilder;
+      setShearY(shearY: Number): AffineTransformBuilder;
+      setTranslateX(translateX: Number): AffineTransformBuilder;
+      setTranslateY(translateY: Number): AffineTransformBuilder;
+    }
+
+    /**
+     * The alignment position to apply.
+     */
+    export enum AlignmentPosition { CENTER, HORIZONTAL_CENTER, VERTICAL_CENTER }
+
+    /**
+     * The kinds of start and end forms with which linear geometry can be rendered.
+     *
+     * Some values are based on the "ST_LineEndType" simple type described in section 20.1.10.33 of
+     *  of "Office Open XML File Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
+     *  edition.
+     */
+    export enum ArrowStyle { UNSUPPORTED, NONE, STEALTH_ARROW, FILL_ARROW, FILL_CIRCLE, FILL_SQUARE, FILL_DIAMOND, OPEN_ARROW, OPEN_CIRCLE, OPEN_SQUARE, OPEN_DIAMOND }
+
+    /**
+     * An element of text that is dynamically replaced with content that can change over time, such as a
+     *  slide number.
+     */
+    export interface AutoText {
+      getAutoTextType(): AutoTextType;
+      getIndex(): Integer;
+      getRange(): TextRange;
+    }
+
+    /**
+     * The types of auto text.
+     */
+    export enum AutoTextType { UNSUPPORTED, SLIDE_NUMBER }
+
+    /**
+     * Describes the border around an element.
+     */
+    export interface Border {
+      getDashStyle(): DashStyle;
+      getLineFill(): LineFill;
+      getWeight(): Number;
+      isVisible(): boolean;
+      setDashStyle(style: DashStyle): Border;
+      setTransparent(): Border;
+      setWeight(points: Number): Border;
+    }
+
+    /**
+     * The table cell merge states.
+     */
+    export enum CellMergeState { NORMAL, HEAD, MERGED }
+
+    /**
+     * An opaque color
+     */
+    export interface Color {
+      asRgbColor(): RgbColor;
+      asThemeColor(): ThemeColor;
+      getColorType(): ColorType;
+    }
+
+    /**
+     * A color scheme defines a mapping from members of ThemeColorType to the actual colors used
+     *  to render them.
+     */
+    export interface ColorScheme {
+      getConcreteColor(theme: ThemeColorType): Color;
+      getThemeColors(): ThemeColorType[];
+    }
+
+    /**
+     * The types of Colors
+     */
+    export enum ColorType { UNSUPPORTED, RGB, THEME }
+
+    /**
+     * The content alignments for a Shape or TableCell. The supported alignments
+     *  correspond to predefined text anchoring types from the ECMA-376 standard.
+     *
+     * More information on those alignments can be found in the description of
+     *  the ST_TextAnchoringType simple type in section 20.1.10.59 of "Office Open XML File
+     *  Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
+     *  edition.
+     */
+    export enum ContentAlignment { UNSUPPORTED, TOP, MIDDLE, BOTTOM }
+
+    /**
+     * The kinds of dashes with which linear geometry can be rendered. These values are based on the
+     *  "ST_PresetLineDashVal" simple type described in section 20.1.10.48 of "Office Open XML File
+     *  Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
+     *  edition.
+     */
+    export enum DashStyle { UNSUPPORTED, SOLID, DOT, DASH, DASH_DOT, LONG_DASH, LONG_DASH_DOT }
+
+    /**
+     * Describes the page element's background
+     */
+    export interface Fill {
+      getSolidFill(): SolidFill;
+      getType(): FillType;
+      isVisible(): boolean;
+      setSolidFill(color: Color): void;
+      setSolidFill(color: Color, alpha: Number): void;
+      setSolidFill(red: Integer, green: Integer, blue: Integer): void;
+      setSolidFill(red: Integer, green: Integer, blue: Integer, alpha: Number): void;
+      setSolidFill(hexString: string): void;
+      setSolidFill(hexString: string, alpha: Number): void;
+      setSolidFill(color: ThemeColorType): void;
+      setSolidFill(color: ThemeColorType, alpha: Number): void;
+      setTransparent(): void;
+    }
+
+    /**
+     * The kinds of fill.
+     */
+    export enum FillType { UNSUPPORTED, NONE, SOLID }
+
+    /**
+     * A collection of PageElements joined as a single unit.
+     */
+    export interface Group {
+      alignOnPage(alignmentPosition: AlignmentPosition): Group;
+      duplicate(): PageElement;
+      getChildren(): PageElement[];
+      getDescription(): string;
+      getHeight(): Number;
+      getInherentHeight(): Number;
+      getInherentWidth(): Number;
+      getLeft(): Number;
+      getObjectId(): string;
+      getPageElementType(): PageElementType;
+      getParentGroup(): Group;
+      getParentPage(): Page;
+      getRotation(): Number;
+      getTitle(): string;
+      getTop(): Number;
+      getTransform(): AffineTransform;
+      getWidth(): Number;
+      preconcatenateTransform(transform: AffineTransform): Group;
+      remove(): void;
+      scaleHeight(ratio: Number): Group;
+      scaleWidth(ratio: Number): Group;
+      select(): void;
+      select(replace: boolean): void;
+      setHeight(height: Number): Group;
+      setLeft(left: Number): Group;
+      setRotation(angle: Number): Group;
+      setTop(top: Number): Group;
+      setTransform(transform: AffineTransform): Group;
+      setWidth(width: Number): Group;
+      ungroup(): void;
+    }
+
+    /**
+     * A PageElement representing an image.
+     */
+    export interface Image {
+      alignOnPage(alignmentPosition: AlignmentPosition): Image;
+      duplicate(): PageElement;
+      getBorder(): Border;
+      getContentUrl(): string;
+      getDescription(): string;
+      getHeight(): Number;
+      getInherentHeight(): Number;
+      getInherentWidth(): Number;
+      getLeft(): Number;
+      getLink(): Link;
+      getObjectId(): string;
+      getPageElementType(): PageElementType;
+      getParentGroup(): Group;
+      getParentPage(): Page;
+      getRotation(): Number;
+      getSourceUrl(): string;
+      getTitle(): string;
+      getTop(): Number;
+      getTransform(): AffineTransform;
+      getWidth(): Number;
+      preconcatenateTransform(transform: AffineTransform): Image;
+      remove(): void;
+      removeLink(): void;
+      replace(blobSource: Base.BlobSource): Image;
+      replace(blobSource: Base.BlobSource, crop: boolean): Image;
+      replace(imageUrl: string): Image;
+      replace(imageUrl: string, crop: boolean): Image;
+      scaleHeight(ratio: Number): Image;
+      scaleWidth(ratio: Number): Image;
+      select(): void;
+      select(replace: boolean): void;
+      setHeight(height: Number): Image;
+      setLeft(left: Number): Image;
+      setLinkSlide(slideIndex: Integer): Link;
+      setLinkSlide(slide: Slide): Link;
+      setLinkSlide(slidePosition: SlidePosition): Link;
+      setLinkUrl(url: string): Link;
+      setRotation(angle: Number): Image;
+      setTop(top: Number): Image;
+      setTransform(transform: AffineTransform): Image;
+      setWidth(width: Number): Image;
+    }
+
+    /**
+     * A layout in a presentation.
+     *
+     * Each layout serves as a template for slides that inherit from it, determining how content on
+     *  those slides is arranged and styled.
+     */
+    export interface Layout {
+      getBackground(): PageBackground;
+      getColorScheme(): ColorScheme;
+      getGroups(): Group[];
+      getImages(): Image[];
+      getLayoutName(): string;
+      getLines(): Line[];
+      getMaster(): Master;
+      getObjectId(): string;
+      getPageElements(): PageElement[];
+      getPageType(): PageType;
+      getPlaceholder(placeholderType: PlaceholderType): PageElement;
+      getPlaceholder(placeholderType: PlaceholderType, placeholderIndex: Integer): PageElement;
+      getPlaceholders(): PageElement[];
+      getShapes(): Shape[];
+      getSheetsCharts(): SheetsChart[];
+      getTables(): Table[];
+      getVideos(): Video[];
+      getWordArts(): WordArt[];
+      group(pageElements: PageElement[]): Group;
+      insertGroup(group: Group): Group;
+      insertImage(blobSource: Base.BlobSource): Image;
+      insertImage(blobSource: Base.BlobSource, left: Number, top: Number, width: Number, height: Number): Image;
+      insertImage(image: Image): Image;
+      insertImage(imageUrl: string): Image;
+      insertImage(imageUrl: string, left: Number, top: Number, width: Number, height: Number): Image;
+      insertLine(line: Line): Line;
+      insertLine(lineCategory: LineCategory, startLeft: Number, startTop: Number, endLeft: Number, endTop: Number): Line;
+      insertPageElement(pageElement: PageElement): PageElement;
+      insertShape(shape: Shape): Shape;
+      insertShape(shapeType: ShapeType): Shape;
+      insertShape(shapeType: ShapeType, left: Number, top: Number, width: Number, height: Number): Shape;
+      insertSheetsChart(sourceChart: Spreadsheet.EmbeddedChart): SheetsChart;
+      insertSheetsChart(sourceChart: Spreadsheet.EmbeddedChart, left: Number, top: Number, width: Number, height: Number): SheetsChart;
+      insertSheetsChart(sheetsChart: SheetsChart): SheetsChart;
+      insertSheetsChartAsImage(sourceChart: Spreadsheet.EmbeddedChart): Image;
+      insertSheetsChartAsImage(sourceChart: Spreadsheet.EmbeddedChart, left: Number, top: Number, width: Number, height: Number): Image;
+      insertTable(numRows: Integer, numColumns: Integer): Table;
+      insertTable(numRows: Integer, numColumns: Integer, left: Number, top: Number, width: Number, height: Number): Table;
+      insertTable(table: Table): Table;
+      insertVideo(videoUrl: string): Video;
+      insertVideo(videoUrl: string, left: Number, top: Number, width: Number, height: Number): Video;
+      insertVideo(video: Video): Video;
+      insertWordArt(wordArt: WordArt): WordArt;
+      remove(): void;
+      replaceAllText(findText: string, replaceText: string): Integer;
+      replaceAllText(findText: string, replaceText: string, matchCase: boolean): Integer;
+      selectAsCurrentPage(): void;
+    }
+
+    /**
+     * A PageElement representing a line.
+     */
+    export interface Line {
+      alignOnPage(alignmentPosition: AlignmentPosition): Line;
+      duplicate(): PageElement;
+      getDashStyle(): DashStyle;
+      getDescription(): string;
+      getEnd(): Point;
+      getEndArrow(): ArrowStyle;
+      getHeight(): Number;
+      getInherentHeight(): Number;
+      getInherentWidth(): Number;
+      getLeft(): Number;
+      getLineFill(): LineFill;
+      getLineType(): LineType;
+      getLink(): Link;
+      getObjectId(): string;
+      getPageElementType(): PageElementType;
+      getParentGroup(): Group;
+      getParentPage(): Page;
+      getRotation(): Number;
+      getStart(): Point;
+      getStartArrow(): ArrowStyle;
+      getTitle(): string;
+      getTop(): Number;
+      getTransform(): AffineTransform;
+      getWeight(): Number;
+      getWidth(): Number;
+      preconcatenateTransform(transform: AffineTransform): Line;
+      remove(): void;
+      removeLink(): void;
+      scaleHeight(ratio: Number): Line;
+      scaleWidth(ratio: Number): Line;
+      select(): void;
+      select(replace: boolean): void;
+      setDashStyle(style: DashStyle): Line;
+      setEnd(left: Number, top: Number): Line;
+      setEnd(point: Point): Line;
+      setEndArrow(style: ArrowStyle): Line;
+      setHeight(height: Number): Line;
+      setLeft(left: Number): Line;
+      setLinkSlide(slideIndex: Integer): Link;
+      setLinkSlide(slide: Slide): Link;
+      setLinkSlide(slidePosition: SlidePosition): Link;
+      setLinkUrl(url: string): Link;
+      setRotation(angle: Number): Line;
+      setStart(left: Number, top: Number): Line;
+      setStart(point: Point): Line;
+      setStartArrow(style: ArrowStyle): Line;
+      setTop(top: Number): Line;
+      setTransform(transform: AffineTransform): Line;
+      setWeight(points: Number): Line;
+      setWidth(width: Number): Line;
+    }
+
+    /**
+     * The line category.
+     *
+     * The exact LineType created is determined based on the category and how it's routed to
+     *  connect to other page elements.
+     */
+    export enum LineCategory { STRAIGHT, BENT, CURVED }
+
+    /**
+     * Describes the fill of a line or outline
+     */
+    export interface LineFill {
+      getFillType(): LineFillType;
+      getSolidFill(): SolidFill;
+      setSolidFill(color: Color): void;
+      setSolidFill(color: Color, alpha: Number): void;
+      setSolidFill(red: Integer, green: Integer, blue: Integer): void;
+      setSolidFill(red: Integer, green: Integer, blue: Integer, alpha: Number): void;
+      setSolidFill(hexString: string): void;
+      setSolidFill(hexString: string, alpha: Number): void;
+      setSolidFill(color: ThemeColorType): void;
+      setSolidFill(color: ThemeColorType, alpha: Number): void;
+    }
+
+    /**
+     * The kinds of line fill.
+     */
+    export enum LineFillType { UNSUPPORTED, NONE, SOLID }
+
+    /**
+     * The line types.
+     *
+     * Derived from a subset of the values of the "ST_ShapeType" simple type in section 20.1.10.55 of
+     *  "Office Open XML File Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
+     *  edition.
+     */
+    export enum LineType { UNSUPPORTED, STRAIGHT_CONNECTOR_1, BENT_CONNECTOR_2, BENT_CONNECTOR_3, BENT_CONNECTOR_4, BENT_CONNECTOR_5, CURVED_CONNECTOR_2, CURVED_CONNECTOR_3, CURVED_CONNECTOR_4, CURVED_CONNECTOR_5 }
+
+    /**
+     * A hypertext link.
+     */
+    export interface Link {
+      getLinkType(): LinkType;
+      getLinkedSlide(): Slide;
+      getSlideId(): string;
+      getSlideIndex(): Integer;
+      getSlidePosition(): SlidePosition;
+      getUrl(): string;
+    }
+
+    /**
+     * The types of a Link.
+     */
+    export enum LinkType { UNSUPPORTED, URL, SLIDE_POSITION, SLIDE_ID, SLIDE_INDEX }
+
+    /**
+     * A list in the text.
+     */
+    export interface List {
+      getListId(): string;
+      getListParagraphs(): Paragraph[];
+    }
+
+    /**
+     * Preset patterns of glyphs for lists in text.
+     *
+     * These presets use these glyphs:
+     *
+     * ARROW: An arrow, ➔, corresponding to a Unicode U+2794 code point
+     *
+     * ARROW3D: An arrow with 3D shading, ➢, corresponding to a Unicode U+27a2 code point
+     *
+     * CHECKBOX: A hollow square, ❏, corresponding to a Unicode U+274f code point
+     *
+     * CIRCLE: A hollow circle, ○, corresponding to a Unicode U+25cb code point
+     *
+     * DIAMOND: A solid diamond, ◆, corresponding to a Unicode U+25c6 code point
+     *
+     * `DIAMONDX: A diamond with an 'x', ❖, corresponding to a Unicode U+2756 code point
+     *
+     * HOLLOWDIAMOND: A hollow diamond, ◇, corresponding to a Unicode U+25c7 code point
+     *
+     * DISC: A solid circle, ●, corresponding to a Unicode U+25cf code point
+     *
+     * SQUARE: A solid square, ■, corresponding to a Unicode U+25a0 code point
+     *
+     * STAR: A star, ★, corresponding to a Unicode U+2605 code point
+     *
+     * ALPHA: A lowercase letter, like 'a', 'b', or 'c'.
+     *
+     * UPPERALPHA: An uppercase letter, like 'A', 'B', or 'C'.
+     *
+     * DIGIT: A number, like '1', '2', or '3'.
+     *
+     * ZERODIGIT: A number where single digit numbers are prefixed with a zero, like '01', '02',
+     *        or '03'. Numbers with more than one digit are not prefixed a zero.
+     *
+     * ROMAN: A lowercase roman numeral, like 'i', 'ii', or 'iii'.
+     *
+     * UPPERROMAN: A uppercase roman numeral, like 'I', 'II', or 'III'.
+     *
+     * LEFTTRIANGLE: A triangle pointing left, ◄, corresponding to a Unicode U+25c4 code
+     *        point
+     */
+    export enum ListPreset { DISC_CIRCLE_SQUARE, DIAMONDX_ARROW3D_SQUARE, CHECKBOX, ARROW_DIAMOND_DISC, STAR_CIRCLE_SQUARE, ARROW3D_CIRCLE_SQUARE, LEFTTRIANGLE_DIAMOND_DISC, DIAMONDX_HOLLOWDIAMOND_SQUARE, DIAMOND_CIRCLE_SQUARE, DIGIT_ALPHA_ROMAN, DIGIT_ALPHA_ROMAN_PARENS, DIGIT_NESTED, UPPERALPHA_ALPHA_ROMAN, UPPERROMAN_UPPERALPHA_DIGIT, ZERODIGIT_ALPHA_ROMAN }
+
+    /**
+     * The list styling for a range of text.
+     */
+    export interface ListStyle {
+      applyListPreset(listPreset: ListPreset): ListStyle;
+      getGlyph(): string;
+      getList(): List;
+      getNestingLevel(): Integer;
+      isInList(): boolean;
+      removeFromList(): ListStyle;
+    }
+
+    /**
+     * A master in a presentation.
+     *
+     * Masters contains all common page elements and the common properties for a set of layouts. They
+     *  serve three purposes:
+     *
+     * Placeholder shapes on a master contain the default text styles and shape properties of all
+     *        placeholder shapes on pages that use that master.
+     *
+     * The properties of a master page define the common page properties inherited by its layouts.
+     *
+     * Any other shapes on the master slide appear on all slides using that master, regardless of
+     *        their layout.
+     */
+    export interface Master {
+      getBackground(): PageBackground;
+      getColorScheme(): ColorScheme;
+      getGroups(): Group[];
+      getImages(): Image[];
+      getLayouts(): Layout[];
+      getLines(): Line[];
+      getObjectId(): string;
+      getPageElements(): PageElement[];
+      getPageType(): PageType;
+      getPlaceholder(placeholderType: PlaceholderType): PageElement;
+      getPlaceholder(placeholderType: PlaceholderType, placeholderIndex: Integer): PageElement;
+      getPlaceholders(): PageElement[];
+      getShapes(): Shape[];
+      getSheetsCharts(): SheetsChart[];
+      getTables(): Table[];
+      getVideos(): Video[];
+      getWordArts(): WordArt[];
+      group(pageElements: PageElement[]): Group;
+      insertGroup(group: Group): Group;
+      insertImage(blobSource: Base.BlobSource): Image;
+      insertImage(blobSource: Base.BlobSource, left: Number, top: Number, width: Number, height: Number): Image;
+      insertImage(image: Image): Image;
+      insertImage(imageUrl: string): Image;
+      insertImage(imageUrl: string, left: Number, top: Number, width: Number, height: Number): Image;
+      insertLine(line: Line): Line;
+      insertLine(lineCategory: LineCategory, startLeft: Number, startTop: Number, endLeft: Number, endTop: Number): Line;
+      insertPageElement(pageElement: PageElement): PageElement;
+      insertShape(shape: Shape): Shape;
+      insertShape(shapeType: ShapeType): Shape;
+      insertShape(shapeType: ShapeType, left: Number, top: Number, width: Number, height: Number): Shape;
+      insertSheetsChart(sourceChart: Spreadsheet.EmbeddedChart): SheetsChart;
+      insertSheetsChart(sourceChart: Spreadsheet.EmbeddedChart, left: Number, top: Number, width: Number, height: Number): SheetsChart;
+      insertSheetsChart(sheetsChart: SheetsChart): SheetsChart;
+      insertSheetsChartAsImage(sourceChart: Spreadsheet.EmbeddedChart): Image;
+      insertSheetsChartAsImage(sourceChart: Spreadsheet.EmbeddedChart, left: Number, top: Number, width: Number, height: Number): Image;
+      insertTable(numRows: Integer, numColumns: Integer): Table;
+      insertTable(numRows: Integer, numColumns: Integer, left: Number, top: Number, width: Number, height: Number): Table;
+      insertTable(table: Table): Table;
+      insertVideo(videoUrl: string): Video;
+      insertVideo(videoUrl: string, left: Number, top: Number, width: Number, height: Number): Video;
+      insertVideo(video: Video): Video;
+      insertWordArt(wordArt: WordArt): WordArt;
+      remove(): void;
+      replaceAllText(findText: string, replaceText: string): Integer;
+      replaceAllText(findText: string, replaceText: string, matchCase: boolean): Integer;
+      selectAsCurrentPage(): void;
+    }
+
+    /**
+     * A notes master in a presentation.
+     *
+     * Notes masters define the default text styles and page elements for all notes pages. Notes
+     *  masters are read-only.
+     */
+    export interface NotesMaster {
+      getGroups(): Group[];
+      getImages(): Image[];
+      getLines(): Line[];
+      getObjectId(): string;
+      getPageElements(): PageElement[];
+      getPlaceholder(placeholderType: PlaceholderType): PageElement;
+      getPlaceholder(placeholderType: PlaceholderType, placeholderIndex: Integer): PageElement;
+      getPlaceholders(): PageElement[];
+      getShapes(): Shape[];
+      getSheetsCharts(): SheetsChart[];
+      getTables(): Table[];
+      getVideos(): Video[];
+      getWordArts(): WordArt[];
+    }
+
+    /**
+     * A notes page in a presentation.
+     *
+     * These pages contain the content for presentation handouts, including a a shape that contains
+     *  the slide's speaker notes. Each slide has one corresponding notes page. Only the text in the
+     *  speaker notes shape can be modified.
+     */
+    export interface NotesPage {
+      getGroups(): Group[];
+      getImages(): Image[];
+      getLines(): Line[];
+      getObjectId(): string;
+      getPageElements(): PageElement[];
+      getPlaceholder(placeholderType: PlaceholderType): PageElement;
+      getPlaceholder(placeholderType: PlaceholderType, placeholderIndex: Integer): PageElement;
+      getPlaceholders(): PageElement[];
+      getShapes(): Shape[];
+      getSheetsCharts(): SheetsChart[];
+      getSpeakerNotesShape(): Shape;
+      getTables(): Table[];
+      getVideos(): Video[];
+      getWordArts(): WordArt[];
+      replaceAllText(findText: string, replaceText: string): Integer;
+      replaceAllText(findText: string, replaceText: string, matchCase: boolean): Integer;
+    }
+
+    /**
+     * A page in a presentation.
+     */
+    export interface Page {
+      asLayout(): Layout;
+      asMaster(): Master;
+      asSlide(): Slide;
+      getBackground(): PageBackground;
+      getColorScheme(): ColorScheme;
+      getGroups(): Group[];
+      getImages(): Image[];
+      getLines(): Line[];
+      getObjectId(): string;
+      getPageElements(): PageElement[];
+      getPageType(): PageType;
+      getPlaceholder(placeholderType: PlaceholderType): PageElement;
+      getPlaceholder(placeholderType: PlaceholderType, placeholderIndex: Integer): PageElement;
+      getPlaceholders(): PageElement[];
+      getShapes(): Shape[];
+      getSheetsCharts(): SheetsChart[];
+      getTables(): Table[];
+      getVideos(): Video[];
+      getWordArts(): WordArt[];
+      group(pageElements: PageElement[]): Group;
+      insertGroup(group: Group): Group;
+      insertImage(blobSource: Base.BlobSource): Image;
+      insertImage(blobSource: Base.BlobSource, left: Number, top: Number, width: Number, height: Number): Image;
+      insertImage(image: Image): Image;
+      insertImage(imageUrl: string): Image;
+      insertImage(imageUrl: string, left: Number, top: Number, width: Number, height: Number): Image;
+      insertLine(line: Line): Line;
+      insertLine(lineCategory: LineCategory, startLeft: Number, startTop: Number, endLeft: Number, endTop: Number): Line;
+      insertPageElement(pageElement: PageElement): PageElement;
+      insertShape(shape: Shape): Shape;
+      insertShape(shapeType: ShapeType): Shape;
+      insertShape(shapeType: ShapeType, left: Number, top: Number, width: Number, height: Number): Shape;
+      insertSheetsChart(sourceChart: Spreadsheet.EmbeddedChart): SheetsChart;
+      insertSheetsChart(sourceChart: Spreadsheet.EmbeddedChart, left: Number, top: Number, width: Number, height: Number): SheetsChart;
+      insertSheetsChart(sheetsChart: SheetsChart): SheetsChart;
+      insertSheetsChartAsImage(sourceChart: Spreadsheet.EmbeddedChart): Image;
+      insertSheetsChartAsImage(sourceChart: Spreadsheet.EmbeddedChart, left: Number, top: Number, width: Number, height: Number): Image;
+      insertTable(numRows: Integer, numColumns: Integer): Table;
+      insertTable(numRows: Integer, numColumns: Integer, left: Number, top: Number, width: Number, height: Number): Table;
+      insertTable(table: Table): Table;
+      insertVideo(videoUrl: string): Video;
+      insertVideo(videoUrl: string, left: Number, top: Number, width: Number, height: Number): Video;
+      insertVideo(video: Video): Video;
+      insertWordArt(wordArt: WordArt): WordArt;
+      remove(): void;
+      replaceAllText(findText: string, replaceText: string): Integer;
+      replaceAllText(findText: string, replaceText: string, matchCase: boolean): Integer;
+      selectAsCurrentPage(): void;
+    }
+
+    /**
+     * Describes the page's background
+     */
+    export interface PageBackground {
+      getPictureFill(): PictureFill;
+      getSolidFill(): SolidFill;
+      getType(): PageBackgroundType;
+      isVisible(): boolean;
+      setPictureFill(blobSource: Base.BlobSource): void;
+      setPictureFill(imageUrl: string): void;
+      setSolidFill(color: Color): void;
+      setSolidFill(color: Color, alpha: Number): void;
+      setSolidFill(red: Integer, green: Integer, blue: Integer): void;
+      setSolidFill(red: Integer, green: Integer, blue: Integer, alpha: Number): void;
+      setSolidFill(hexString: string): void;
+      setSolidFill(hexString: string, alpha: Number): void;
+      setSolidFill(color: ThemeColorType): void;
+      setSolidFill(color: ThemeColorType, alpha: Number): void;
+      setTransparent(): void;
+    }
+
+    /**
+     * The kinds of page backgrounds.
+     */
+    export enum PageBackgroundType { UNSUPPORTED, NONE, SOLID, PICTURE }
+
+    /**
+     * A visual element rendered on a page.
+     */
+    export interface PageElement {
+      alignOnPage(alignmentPosition: AlignmentPosition): PageElement;
+      asGroup(): Group;
+      asImage(): Image;
+      asLine(): Line;
+      asShape(): Shape;
+      asSheetsChart(): SheetsChart;
+      asTable(): Table;
+      asVideo(): Video;
+      asWordArt(): WordArt;
+      duplicate(): PageElement;
+      getDescription(): string;
+      getHeight(): Number;
+      getInherentHeight(): Number;
+      getInherentWidth(): Number;
+      getLeft(): Number;
+      getObjectId(): string;
+      getPageElementType(): PageElementType;
+      getParentGroup(): Group;
+      getParentPage(): Page;
+      getRotation(): Number;
+      getTitle(): string;
+      getTop(): Number;
+      getTransform(): AffineTransform;
+      getWidth(): Number;
+      preconcatenateTransform(transform: AffineTransform): PageElement;
+      remove(): void;
+      scaleHeight(ratio: Number): PageElement;
+      scaleWidth(ratio: Number): PageElement;
+      select(): void;
+      select(replace: boolean): void;
+      setHeight(height: Number): PageElement;
+      setLeft(left: Number): PageElement;
+      setRotation(angle: Number): PageElement;
+      setTop(top: Number): PageElement;
+      setTransform(transform: AffineTransform): PageElement;
+      setWidth(width: Number): PageElement;
+    }
+
+    /**
+     * A collection of one or more PageElement instances.
+     */
+    export interface PageElementRange {
+      getPageElements(): PageElement[];
+    }
+
+    /**
+     * The page element type.
+     */
+    export enum PageElementType { UNSUPPORTED, SHAPE, IMAGE, VIDEO, TABLE, GROUP, LINE, WORD_ART, SHEETS_CHART }
+
+    /**
+     * A collection of one or more Page instances.
+     */
+    export interface PageRange {
+      getPages(): Page[];
+    }
+
+    /**
+     * The page types.
+     */
+    export enum PageType { UNSUPPORTED, SLIDE, LAYOUT, MASTER }
+
+    /**
+     * A segment of text terminated by a newline character.
+     */
+    export interface Paragraph {
+      getIndex(): Integer;
+      getRange(): TextRange;
+    }
+
+    /**
+     * The types of text alignment for a paragraph.
+     */
+    export enum ParagraphAlignment { UNSUPPORTED, START, CENTER, END, JUSTIFIED }
+
+    /**
+     * The styles of text that apply to entire paragraphs.
+     *
+     * Read methods in this class return null if the corresponding TextRange spans
+     *  multiple paragraphs, and those paragraphs have different values for the read method being called.
+     *  To avoid this, query for paragraph styles using the TextRange returned by the Paragraph.getRange() method.
+     */
+    export interface ParagraphStyle {
+      getIndentEnd(): Number;
+      getIndentFirstLine(): Number;
+      getIndentStart(): Number;
+      getLineSpacing(): Number;
+      getParagraphAlignment(): ParagraphAlignment;
+      getSpaceAbove(): Number;
+      getSpaceBelow(): Number;
+      getSpacingMode(): SpacingMode;
+      getTextDirection(): TextDirection;
+      setIndentEnd(indent: Number): ParagraphStyle;
+      setIndentFirstLine(indent: Number): ParagraphStyle;
+      setIndentStart(indent: Number): ParagraphStyle;
+      setLineSpacing(spacing: Number): ParagraphStyle;
+      setParagraphAlignment(alignment: ParagraphAlignment): ParagraphStyle;
+      setSpaceAbove(space: Number): ParagraphStyle;
+      setSpaceBelow(space: Number): ParagraphStyle;
+      setSpacingMode(mode: SpacingMode): ParagraphStyle;
+      setTextDirection(direction: TextDirection): ParagraphStyle;
+    }
+
+    /**
+     * A fill that renders an image that's stretched to the dimensions of its container.
+     */
+    export interface PictureFill {
+      getContentUrl(): string;
+      getSourceUrl(): string;
+    }
+
+    /**
+     * The placeholder types. Many of these placeholder types correspond to placeholder IDs from the
+     *  ECMA-376 standard. More information on those shapes can be found in the description of the
+     *  "ST_PlaceholderType" type in section 19.7.10 of "Office Open XML File Formats - Fundamentals and
+     *  Markup Language Reference", part 1 of ECMA-376 5th
+     *  edition.
+     */
+    export enum PlaceholderType { UNSUPPORTED, NONE, BODY, CHART, CLIP_ART, CENTERED_TITLE, DIAGRAM, DATE_AND_TIME, FOOTER, HEADER, MEDIA, OBJECT, PICTURE, SLIDE_NUMBER, SUBTITLE, TABLE, TITLE, SLIDE_IMAGE }
+
+    /**
+     * A point representing a location.
+     */
+    export interface Point {
+      getX(): Number;
+      getY(): Number;
+    }
+
+    /**
+     * Predefined layouts. These are commonly found layouts in presentations. However, there is no
+     *  guarantee that these layouts are present in the current master as they could have been deleted or
+     *  not part of the used theme. Additionally, the placeholders on each layout may have been changed.
+     */
+    export enum PredefinedLayout { UNSUPPORTED, BLANK, CAPTION_ONLY, TITLE, TITLE_AND_BODY, TITLE_AND_TWO_COLUMNS, TITLE_ONLY, SECTION_HEADER, SECTION_TITLE_AND_DESCRIPTION, ONE_COLUMN_TEXT, MAIN_POINT, BIG_NUMBER }
+
+    /**
+     * A presentation.
+     */
+    export interface Presentation {
+      addEditor(emailAddress: string): Presentation;
+      addEditor(user: Base.User): Presentation;
+      addEditors(emailAddresses: String[]): Presentation;
+      addViewer(emailAddress: string): Presentation;
+      addViewer(user: Base.User): Presentation;
+      addViewers(emailAddresses: String[]): Presentation;
+      appendSlide(): Slide;
+      appendSlide(layout: Layout): Slide;
+      appendSlide(predefinedLayout: PredefinedLayout): Slide;
+      appendSlide(slide: Slide): Slide;
+      getEditors(): Base.User[];
+      getId(): string;
+      getLayouts(): Layout[];
+      getMasters(): Master[];
+      getName(): string;
+      getNotesMaster(): NotesMaster;
+      getNotesPageHeight(): Number;
+      getNotesPageWidth(): Number;
+      getPageHeight(): Number;
+      getPageWidth(): Number;
+      getSelection(): Selection;
+      getSlides(): Slide[];
+      getUrl(): string;
+      getViewers(): Base.User[];
+      insertSlide(insertionIndex: Integer): Slide;
+      insertSlide(insertionIndex: Integer, layout: Layout): Slide;
+      insertSlide(insertionIndex: Integer, predefinedLayout: PredefinedLayout): Slide;
+      insertSlide(insertionIndex: Integer, slide: Slide): Slide;
+      removeEditor(emailAddress: string): Presentation;
+      removeEditor(user: Base.User): Presentation;
+      removeViewer(emailAddress: string): Presentation;
+      removeViewer(user: Base.User): Presentation;
+      replaceAllText(findText: string, replaceText: string): Integer;
+      replaceAllText(findText: string, replaceText: string, matchCase: boolean): Integer;
+      saveAndClose(): void;
+      setName(name: string): void;
+    }
+
+    /**
+     * A color defined by red, green, blue color channels.
+     */
+    export interface RgbColor {
+      asHexString(): string;
+      getBlue(): Integer;
+      getColorType(): ColorType;
+      getGreen(): Integer;
+      getRed(): Integer;
+    }
+
+    /**
+     * The user's selection in the active presentation.
+     *
+     *      var selection = SlidesApp.getActivePresentation().getSelection();
+     *      var currentPage = selection.getCurrentPage();
+     *      var selectionType = selection.getSelectionType();
+     *      }
+     */
+    export interface Selection {
+      getCurrentPage(): Page;
+      getPageElementRange(): PageElementRange;
+      getPageRange(): PageRange;
+      getSelectionType(): SelectionType;
+      getTableCellRange(): TableCellRange;
+      getTextRange(): TextRange;
+    }
+
+    /**
+     * Type of Selection.
+     *
+     * The SelectionType represents the most specific type of one or more objects that are
+     *  selected. As an example if one or more TableCell instances are selected in a Table, the selection type is SelectionType.TABLE_CELL. The TableCellRange can be
+     *  retrieved by using the Selection.getTableCellRange. The Table can be retrieved by
+     *  using the Selection.getPageElementRange and the Page can be retrieved from the
+     *  Selection.getCurrentPage.
+     */
+    export enum SelectionType { UNSUPPORTED, NONE, TEXT, TABLE_CELL, PAGE, PAGE_ELEMENT, CURRENT_PAGE }
+
+    /**
+     * A PageElement representing a generic shape that does not have a more specific
+     *  classification. Includes text boxes, rectangles, and other predefined shapes.
+     */
+    export interface Shape {
+      alignOnPage(alignmentPosition: AlignmentPosition): Shape;
+      duplicate(): PageElement;
+      getBorder(): Border;
+      getContentAlignment(): ContentAlignment;
+      getDescription(): string;
+      getFill(): Fill;
+      getHeight(): Number;
+      getInherentHeight(): Number;
+      getInherentWidth(): Number;
+      getLeft(): Number;
+      getLink(): Link;
+      getObjectId(): string;
+      getPageElementType(): PageElementType;
+      getParentGroup(): Group;
+      getParentPage(): Page;
+      getParentPlaceholder(): PageElement;
+      getPlaceholderIndex(): Integer;
+      getPlaceholderType(): PlaceholderType;
+      getRotation(): Number;
+      getShapeType(): ShapeType;
+      getText(): TextRange;
+      getTitle(): string;
+      getTop(): Number;
+      getTransform(): AffineTransform;
+      getWidth(): Number;
+      preconcatenateTransform(transform: AffineTransform): Shape;
+      remove(): void;
+      removeLink(): void;
+      replaceWithImage(blobSource: Base.BlobSource): Image;
+      replaceWithImage(blobSource: Base.BlobSource, crop: boolean): Image;
+      replaceWithImage(imageUrl: string): Image;
+      replaceWithImage(imageUrl: string, crop: boolean): Image;
+      replaceWithSheetsChart(sourceChart: Spreadsheet.EmbeddedChart): SheetsChart;
+      replaceWithSheetsChartAsImage(sourceChart: Spreadsheet.EmbeddedChart): Image;
+      scaleHeight(ratio: Number): Shape;
+      scaleWidth(ratio: Number): Shape;
+      select(): void;
+      select(replace: boolean): void;
+      setContentAlignment(contentAlignment: ContentAlignment): Shape;
+      setHeight(height: Number): Shape;
+      setLeft(left: Number): Shape;
+      setLinkSlide(slideIndex: Integer): Link;
+      setLinkSlide(slide: Slide): Link;
+      setLinkSlide(slidePosition: SlidePosition): Link;
+      setLinkUrl(url: string): Link;
+      setRotation(angle: Number): Shape;
+      setTop(top: Number): Shape;
+      setTransform(transform: AffineTransform): Shape;
+      setWidth(width: Number): Shape;
+    }
+
+    /**
+     * The shape types. Many of these shapes correspond to predefined shapes from the ECMA-376 standard.
+     *  More information on those shapes can be found in the description of the "ST_ShapeType" simple
+     *  type in section 20.1.10.55 of "Office Open XML File Formats - Fundamentals and Markup Language
+     *  Reference", part 1 of ECMA-376 4th
+     *  edition.
+     */
+    export enum ShapeType { UNSUPPORTED, TEXT_BOX, RECTANGLE, ROUND_RECTANGLE, ELLIPSE, ARC, BENT_ARROW, BENT_UP_ARROW, BEVEL, BLOCK_ARC, BRACE_PAIR, BRACKET_PAIR, CAN, CHEVRON, CHORD, CLOUD, CORNER, CUBE, CURVED_DOWN_ARROW, CURVED_LEFT_ARROW, CURVED_RIGHT_ARROW, CURVED_UP_ARROW, DECAGON, DIAGONAL_STRIPE, DIAMOND, DODECAGON, DONUT, DOUBLE_WAVE, DOWN_ARROW, DOWN_ARROW_CALLOUT, FOLDED_CORNER, FRAME, HALF_FRAME, HEART, HEPTAGON, HEXAGON, HOME_PLATE, HORIZONTAL_SCROLL, IRREGULAR_SEAL_1, IRREGULAR_SEAL_2, LEFT_ARROW, LEFT_ARROW_CALLOUT, LEFT_BRACE, LEFT_BRACKET, LEFT_RIGHT_ARROW, LEFT_RIGHT_ARROW_CALLOUT, LEFT_RIGHT_UP_ARROW, LEFT_UP_ARROW, LIGHTNING_BOLT, MATH_DIVIDE, MATH_EQUAL, MATH_MINUS, MATH_MULTIPLY, MATH_NOT_EQUAL, MATH_PLUS, MOON, NO_SMOKING, NOTCHED_RIGHT_ARROW, OCTAGON, PARALLELOGRAM, PENTAGON, PIE, PLAQUE, PLUS, QUAD_ARROW, QUAD_ARROW_CALLOUT, RIBBON, RIBBON_2, RIGHT_ARROW, RIGHT_ARROW_CALLOUT, RIGHT_BRACE, RIGHT_BRACKET, ROUND_1_RECTANGLE, ROUND_2_DIAGONAL_RECTANGLE, ROUND_2_SAME_RECTANGLE, RIGHT_TRIANGLE, SMILEY_FACE, SNIP_1_RECTANGLE, SNIP_2_DIAGONAL_RECTANGLE, SNIP_2_SAME_RECTANGLE, SNIP_ROUND_RECTANGLE, STAR_10, STAR_12, STAR_16, STAR_24, STAR_32, STAR_4, STAR_5, STAR_6, STAR_7, STAR_8, STRIPED_RIGHT_ARROW, SUN, TRAPEZOID, TRIANGLE, UP_ARROW, UP_ARROW_CALLOUT, UP_DOWN_ARROW, UTURN_ARROW, VERTICAL_SCROLL, WAVE, WEDGE_ELLIPSE_CALLOUT, WEDGE_RECTANGLE_CALLOUT, WEDGE_ROUND_RECTANGLE_CALLOUT, FLOW_CHART_ALTERNATE_PROCESS, FLOW_CHART_COLLATE, FLOW_CHART_CONNECTOR, FLOW_CHART_DECISION, FLOW_CHART_DELAY, FLOW_CHART_DISPLAY, FLOW_CHART_DOCUMENT, FLOW_CHART_EXTRACT, FLOW_CHART_INPUT_OUTPUT, FLOW_CHART_INTERNAL_STORAGE, FLOW_CHART_MAGNETIC_DISK, FLOW_CHART_MAGNETIC_DRUM, FLOW_CHART_MAGNETIC_TAPE, FLOW_CHART_MANUAL_INPUT, FLOW_CHART_MANUAL_OPERATION, FLOW_CHART_MERGE, FLOW_CHART_MULTIDOCUMENT, FLOW_CHART_OFFLINE_STORAGE, FLOW_CHART_OFFPAGE_CONNECTOR, FLOW_CHART_ONLINE_STORAGE, FLOW_CHART_OR, FLOW_CHART_PREDEFINED_PROCESS, FLOW_CHART_PREPARATION, FLOW_CHART_PROCESS, FLOW_CHART_PUNCHED_CARD, FLOW_CHART_PUNCHED_TAPE, FLOW_CHART_SORT, FLOW_CHART_SUMMING_JUNCTION, FLOW_CHART_TERMINATOR, ARROW_EAST, ARROW_NORTH_EAST, ARROW_NORTH, SPEECH, STARBURST, TEARDROP, ELLIPSE_RIBBON, ELLIPSE_RIBBON_2, CLOUD_CALLOUT, CUSTOM }
+
+    /**
+     * A PageElement representing a linked chart embedded from Google Sheets.
+     */
+    export interface SheetsChart {
+      alignOnPage(alignmentPosition: AlignmentPosition): SheetsChart;
+      asImage(): Image;
+      duplicate(): PageElement;
+      getChartId(): Integer;
+      getDescription(): string;
+      getEmbedType(): SheetsChartEmbedType;
+      getHeight(): Number;
+      getInherentHeight(): Number;
+      getInherentWidth(): Number;
+      getLeft(): Number;
+      getLink(): Link;
+      getObjectId(): string;
+      getPageElementType(): PageElementType;
+      getParentGroup(): Group;
+      getParentPage(): Page;
+      getRotation(): Number;
+      getSpreadsheetId(): string;
+      getTitle(): string;
+      getTop(): Number;
+      getTransform(): AffineTransform;
+      getWidth(): Number;
+      preconcatenateTransform(transform: AffineTransform): SheetsChart;
+      refresh(): void;
+      remove(): void;
+      removeLink(): void;
+      scaleHeight(ratio: Number): SheetsChart;
+      scaleWidth(ratio: Number): SheetsChart;
+      select(): void;
+      select(replace: boolean): void;
+      setHeight(height: Number): SheetsChart;
+      setLeft(left: Number): SheetsChart;
+      setLinkSlide(slideIndex: Integer): Link;
+      setLinkSlide(slide: Slide): Link;
+      setLinkSlide(slidePosition: SlidePosition): Link;
+      setLinkUrl(url: string): Link;
+      setRotation(angle: Number): SheetsChart;
+      setTop(top: Number): SheetsChart;
+      setTransform(transform: AffineTransform): SheetsChart;
+      setWidth(width: Number): SheetsChart;
+    }
+
+    /**
+     * The Sheets chart's embed type.
+     */
+    export enum SheetsChartEmbedType { UNSUPPORTED, IMAGE }
+
+    /**
+     * A slide in a presentation.
+     *
+     * These pages contain the content you are presenting to your audience. Most slides are based on
+     *  a master and a layout. You can specify which layout to use for each slide when it is created.
+     */
+    export interface Slide {
+      duplicate(): Slide;
+      getBackground(): PageBackground;
+      getColorScheme(): ColorScheme;
+      getGroups(): Group[];
+      getImages(): Image[];
+      getLayout(): Layout;
+      getLines(): Line[];
+      getNotesPage(): NotesPage;
+      getObjectId(): string;
+      getPageElements(): PageElement[];
+      getPageType(): PageType;
+      getPlaceholder(placeholderType: PlaceholderType): PageElement;
+      getPlaceholder(placeholderType: PlaceholderType, placeholderIndex: Integer): PageElement;
+      getPlaceholders(): PageElement[];
+      getShapes(): Shape[];
+      getSheetsCharts(): SheetsChart[];
+      getTables(): Table[];
+      getVideos(): Video[];
+      getWordArts(): WordArt[];
+      group(pageElements: PageElement[]): Group;
+      insertGroup(group: Group): Group;
+      insertImage(blobSource: Base.BlobSource): Image;
+      insertImage(blobSource: Base.BlobSource, left: Number, top: Number, width: Number, height: Number): Image;
+      insertImage(image: Image): Image;
+      insertImage(imageUrl: string): Image;
+      insertImage(imageUrl: string, left: Number, top: Number, width: Number, height: Number): Image;
+      insertLine(line: Line): Line;
+      insertLine(lineCategory: LineCategory, startLeft: Number, startTop: Number, endLeft: Number, endTop: Number): Line;
+      insertPageElement(pageElement: PageElement): PageElement;
+      insertShape(shape: Shape): Shape;
+      insertShape(shapeType: ShapeType): Shape;
+      insertShape(shapeType: ShapeType, left: Number, top: Number, width: Number, height: Number): Shape;
+      insertSheetsChart(sourceChart: Spreadsheet.EmbeddedChart): SheetsChart;
+      insertSheetsChart(sourceChart: Spreadsheet.EmbeddedChart, left: Number, top: Number, width: Number, height: Number): SheetsChart;
+      insertSheetsChart(sheetsChart: SheetsChart): SheetsChart;
+      insertSheetsChartAsImage(sourceChart: Spreadsheet.EmbeddedChart): Image;
+      insertSheetsChartAsImage(sourceChart: Spreadsheet.EmbeddedChart, left: Number, top: Number, width: Number, height: Number): Image;
+      insertTable(numRows: Integer, numColumns: Integer): Table;
+      insertTable(numRows: Integer, numColumns: Integer, left: Number, top: Number, width: Number, height: Number): Table;
+      insertTable(table: Table): Table;
+      insertVideo(videoUrl: string): Video;
+      insertVideo(videoUrl: string, left: Number, top: Number, width: Number, height: Number): Video;
+      insertVideo(video: Video): Video;
+      insertWordArt(wordArt: WordArt): WordArt;
+      move(index: Integer): void;
+      remove(): void;
+      replaceAllText(findText: string, replaceText: string): Integer;
+      replaceAllText(findText: string, replaceText: string, matchCase: boolean): Integer;
+      selectAsCurrentPage(): void;
+    }
+
+    /**
+     * The relative position of a Slide.
+     */
+    export enum SlidePosition { NEXT_SLIDE, PREVIOUS_SLIDE, FIRST_SLIDE, LAST_SLIDE }
+
+    /**
+     * Creates and opens Presentations that can be edited.
+     *
+     *      // Open a presentation by ID.
+     *      var preso = SlidesApp.openById('PRESENTATION_ID_GOES_HERE');
+     *
+     *      // Create and open a presentation.
+     *      preso = SlidesApp.create('Presentation Name');
+     */
+    export interface SlidesApp {
+      AlignmentPosition: typeof AlignmentPosition;
+      ArrowStyle: typeof ArrowStyle;
+      AutoTextType: typeof AutoTextType;
+      CellMergeState: typeof CellMergeState;
+      ColorType: typeof ColorType;
+      ContentAlignment: typeof ContentAlignment;
+      DashStyle: typeof DashStyle;
+      FillType: typeof FillType;
+      LineCategory: typeof LineCategory;
+      LineFillType: typeof LineFillType;
+      LineType: typeof LineType;
+      LinkType: typeof LinkType;
+      ListPreset: typeof ListPreset;
+      PageBackgroundType: typeof PageBackgroundType;
+      PageElementType: typeof PageElementType;
+      PageType: typeof PageType;
+      ParagraphAlignment: typeof ParagraphAlignment;
+      PlaceholderType: typeof PlaceholderType;
+      PredefinedLayout: typeof PredefinedLayout;
+      SelectionType: typeof SelectionType;
+      ShapeType: typeof ShapeType;
+      SheetsChartEmbedType: typeof SheetsChartEmbedType;
+      SlidePosition: typeof SlidePosition;
+      SpacingMode: typeof SpacingMode;
+      TextBaselineOffset: typeof TextBaselineOffset;
+      TextDirection: typeof TextDirection;
+      ThemeColorType: typeof ThemeColorType;
+      VideoSourceType: typeof VideoSourceType;
+      create(name: string): Presentation;
+      getActivePresentation(): Presentation;
+      getUi(): Base.Ui;
+      newAffineTransformBuilder(): AffineTransformBuilder;
+      openById(id: string): Presentation;
+      openByUrl(url: string): Presentation;
+    }
+
+    /**
+     * A solid color fill.
+     *
+     * SolidFill objects are detached and immutable, so do not reflect changes made after
+     *  they have been created.
+     */
+    export interface SolidFill {
+      getAlpha(): Number;
+      getColor(): Color;
+    }
+
+    /**
+     * The different modes for paragraph spacing.
+     */
+    export enum SpacingMode { UNSUPPORTED, NEVER_COLLAPSE, COLLAPSE_LISTS }
+
+    /**
+     * A PageElement representing a table.
+     */
+    export interface Table {
+      alignOnPage(alignmentPosition: AlignmentPosition): Table;
+      appendColumn(): TableColumn;
+      appendRow(): TableRow;
+      duplicate(): PageElement;
+      getCell(rowIndex: Integer, columnIndex: Integer): TableCell;
+      getColumn(columnIndex: Integer): TableColumn;
+      getDescription(): string;
+      getHeight(): Number;
+      getInherentHeight(): Number;
+      getInherentWidth(): Number;
+      getLeft(): Number;
+      getNumColumns(): Integer;
+      getNumRows(): Integer;
+      getObjectId(): string;
+      getPageElementType(): PageElementType;
+      getParentGroup(): Group;
+      getParentPage(): Page;
+      getRotation(): Number;
+      getRow(rowIndex: Integer): TableRow;
+      getTitle(): string;
+      getTop(): Number;
+      getTransform(): AffineTransform;
+      getWidth(): Number;
+      insertColumn(index: Integer): TableColumn;
+      insertRow(index: Integer): TableRow;
+      preconcatenateTransform(transform: AffineTransform): Table;
+      remove(): void;
+      scaleHeight(ratio: Number): Table;
+      scaleWidth(ratio: Number): Table;
+      select(): void;
+      select(replace: boolean): void;
+      setHeight(height: Number): Table;
+      setLeft(left: Number): Table;
+      setRotation(angle: Number): Table;
+      setTop(top: Number): Table;
+      setTransform(transform: AffineTransform): Table;
+      setWidth(width: Number): Table;
+    }
+
+    /**
+     * A cell in a table.
+     */
+    export interface TableCell {
+      getColumnIndex(): Integer;
+      getColumnSpan(): Integer;
+      getContentAlignment(): ContentAlignment;
+      getFill(): Fill;
+      getHeadCell(): TableCell;
+      getMergeState(): CellMergeState;
+      getParentColumn(): TableColumn;
+      getParentRow(): TableRow;
+      getParentTable(): Table;
+      getRowIndex(): Integer;
+      getRowSpan(): Integer;
+      getText(): TextRange;
+      setContentAlignment(contentAlignment: ContentAlignment): TableCell;
+    }
+
+    /**
+     * A collection of one or more TableCell instances.
+     */
+    export interface TableCellRange {
+      getTableCells(): TableCell[];
+    }
+
+    /**
+     * A column in a table. A column consists of a list of table cells. A column is identified by the
+     *  column index.
+     */
+    export interface TableColumn {
+      getCell(cellIndex: Integer): TableCell;
+      getIndex(): Integer;
+      getNumCells(): Integer;
+      getParentTable(): Table;
+      getWidth(): Number;
+      remove(): void;
+    }
+
+    /**
+     * A row in a table. A row consists of a list of table cells. A row is identified by the row index.
+     */
+    export interface TableRow {
+      getCell(cellIndex: Integer): TableCell;
+      getIndex(): Integer;
+      getMinimumHeight(): Number;
+      getNumCells(): Integer;
+      getParentTable(): Table;
+      remove(): void;
+    }
+
+    /**
+     * The text vertical offset from its normal position.
+     */
+    export enum TextBaselineOffset { UNSUPPORTED, NONE, SUPERSCRIPT, SUBSCRIPT }
+
+    /**
+     * The directions text can flow in.
+     */
+    export enum TextDirection { UNSUPPORTED, LEFT_TO_RIGHT, RIGHT_TO_LEFT }
+
+    /**
+     * A segment of the text contents of a Shape or a TableCell.
+     */
+    export interface TextRange {
+      appendParagraph(text: string): Paragraph;
+      appendRange(textRange: TextRange): TextRange;
+      appendRange(textRange: TextRange, matchSourceFormatting: boolean): TextRange;
+      appendText(text: string): TextRange;
+      asRenderedString(): string;
+      asString(): string;
+      clear(): void;
+      clear(startOffset: Integer, endOffset: Integer): void;
+      find(pattern: string): TextRange[];
+      find(pattern: string, startOffset: Integer): TextRange[];
+      getAutoTexts(): AutoText[];
+      getEndIndex(): Integer;
+      getLength(): Integer;
+      getLinks(): TextRange[];
+      getListParagraphs(): Paragraph[];
+      getListStyle(): ListStyle;
+      getParagraphStyle(): ParagraphStyle;
+      getParagraphs(): Paragraph[];
+      getRange(startOffset: Integer, endOffset: Integer): TextRange;
+      getRuns(): TextRange[];
+      getStartIndex(): Integer;
+      getTextStyle(): TextStyle;
+      insertParagraph(startOffset: Integer, text: string): Paragraph;
+      insertRange(startOffset: Integer, textRange: TextRange): TextRange;
+      insertRange(startOffset: Integer, textRange: TextRange, matchSourceFormatting: boolean): TextRange;
+      insertText(startOffset: Integer, text: string): TextRange;
+      isEmpty(): boolean;
+      replaceAllText(findText: string, replaceText: string): Integer;
+      replaceAllText(findText: string, replaceText: string, matchCase: boolean): Integer;
+      select(): void;
+      setText(newText: string): TextRange;
+    }
+
+    /**
+     * The style of text.
+     *
+     * Read methods in this class return null if the corresponding TextRange spans
+     *  multiple text runs, and those runs have different values for the read method being called. To
+     *  avoid this, query for text styles using the TextRanges returned by the TextRange.getRuns() method.
+     */
+    export interface TextStyle {
+      getBackgroundColor(): Color;
+      getBaselineOffset(): TextBaselineOffset;
+      getFontFamily(): string;
+      getFontSize(): Number;
+      getFontWeight(): Integer;
+      getForegroundColor(): Color;
+      getLink(): Link;
+      hasLink(): boolean;
+      isBackgroundTransparent(): boolean;
+      isBold(): boolean;
+      isItalic(): boolean;
+      isSmallCaps(): boolean;
+      isStrikethrough(): boolean;
+      isUnderline(): boolean;
+      removeLink(): TextStyle;
+      setBackgroundColor(color: Color): TextStyle;
+      setBackgroundColor(red: Integer, green: Integer, blue: Integer): TextStyle;
+      setBackgroundColor(hexColor: string): TextStyle;
+      setBackgroundColor(color: ThemeColorType): TextStyle;
+      setBackgroundColorTransparent(): TextStyle;
+      setBaselineOffset(offset: TextBaselineOffset): TextStyle;
+      setBold(bold: boolean): TextStyle;
+      setFontFamily(fontFamily: string): TextStyle;
+      setFontFamilyAndWeight(fontFamily: string, fontWeight: Integer): TextStyle;
+      setFontSize(fontSize: Number): TextStyle;
+      setForegroundColor(foregroundColor: Color): TextStyle;
+      setForegroundColor(red: Integer, green: Integer, blue: Integer): TextStyle;
+      setForegroundColor(hexColor: string): TextStyle;
+      setForegroundColor(color: ThemeColorType): TextStyle;
+      setItalic(italic: boolean): TextStyle;
+      setLinkSlide(slideIndex: Integer): TextStyle;
+      setLinkSlide(slide: Slide): TextStyle;
+      setLinkSlide(slidePosition: SlidePosition): TextStyle;
+      setLinkUrl(url: string): TextStyle;
+      setSmallCaps(smallCaps: boolean): TextStyle;
+      setStrikethrough(strikethrough: boolean): TextStyle;
+      setUnderline(underline: boolean): TextStyle;
+    }
+
+    /**
+     * A color that refers to an entry in the page's ColorScheme.
+     */
+    export interface ThemeColor {
+      getColorType(): ColorType;
+      getThemeColorType(): ThemeColorType;
+    }
+
+    /**
+     * The name of an entry in the page's color scheme.
+     */
+    export enum ThemeColorType { UNSUPPORTED, DARK1, LIGHT1, DARK2, LIGHT2, ACCENT1, ACCENT2, ACCENT3, ACCENT4, ACCENT5, ACCENT6, HYPERLINK, FOLLOWED_HYPERLINK }
+
+    /**
+     * A PageElement representing a video.
+     */
+    export interface Video {
+      alignOnPage(alignmentPosition: AlignmentPosition): Video;
+      duplicate(): PageElement;
+      getBorder(): Border;
+      getDescription(): string;
+      getHeight(): Number;
+      getInherentHeight(): Number;
+      getInherentWidth(): Number;
+      getLeft(): Number;
+      getObjectId(): string;
+      getPageElementType(): PageElementType;
+      getParentGroup(): Group;
+      getParentPage(): Page;
+      getRotation(): Number;
+      getSource(): VideoSourceType;
+      getThumbnailUrl(): string;
+      getTitle(): string;
+      getTop(): Number;
+      getTransform(): AffineTransform;
+      getUrl(): string;
+      getVideoId(): string;
+      getWidth(): Number;
+      preconcatenateTransform(transform: AffineTransform): Video;
+      remove(): void;
+      scaleHeight(ratio: Number): Video;
+      scaleWidth(ratio: Number): Video;
+      select(): void;
+      select(replace: boolean): void;
+      setHeight(height: Number): Video;
+      setLeft(left: Number): Video;
+      setRotation(angle: Number): Video;
+      setTop(top: Number): Video;
+      setTransform(transform: AffineTransform): Video;
+      setWidth(width: Number): Video;
+    }
+
+    /**
+     * The video source types.
+     */
+    export enum VideoSourceType { UNSUPPORTED, YOUTUBE }
+
+    /**
+     * A PageElement representing word art.
+     */
+    export interface WordArt {
+      alignOnPage(alignmentPosition: AlignmentPosition): WordArt;
+      duplicate(): PageElement;
+      getDescription(): string;
+      getHeight(): Number;
+      getInherentHeight(): Number;
+      getInherentWidth(): Number;
+      getLeft(): Number;
+      getLink(): Link;
+      getObjectId(): string;
+      getPageElementType(): PageElementType;
+      getParentGroup(): Group;
+      getParentPage(): Page;
+      getRenderedText(): string;
+      getRotation(): Number;
+      getTitle(): string;
+      getTop(): Number;
+      getTransform(): AffineTransform;
+      getWidth(): Number;
+      preconcatenateTransform(transform: AffineTransform): WordArt;
+      remove(): void;
+      removeLink(): void;
+      scaleHeight(ratio: Number): WordArt;
+      scaleWidth(ratio: Number): WordArt;
+      select(): void;
+      select(replace: boolean): void;
+      setHeight(height: Number): WordArt;
+      setLeft(left: Number): WordArt;
+      setLinkSlide(slideIndex: Integer): Link;
+      setLinkSlide(slide: Slide): Link;
+      setLinkSlide(slidePosition: SlidePosition): Link;
+      setLinkUrl(url: string): Link;
+      setRotation(angle: Number): WordArt;
+      setTop(top: Number): WordArt;
+      setTransform(transform: AffineTransform): WordArt;
+      setWidth(width: Number): WordArt;
+    }
+
+  }
+}
+
+declare var SlidesApp: GoogleAppsScript.Slides.SlidesApp;
diff --git a/types/google-apps-script/index.d.ts b/types/google-apps-script/index.d.ts
index 0e4ca164a9..df2cca1363 100644
--- a/types/google-apps-script/index.d.ts
+++ b/types/google-apps-script/index.d.ts
@@ -26,6 +26,7 @@
 /// <reference path="google-apps-script.properties.d.ts"/>
 /// <reference path="google-apps-script.script.d.ts"/>
 /// <reference path="google-apps-script.sites.d.ts"/>
+/// <reference path="google-apps-script.slides.d.ts"/>
 /// <reference path="google-apps-script.spreadsheet.d.ts"/>
 /// <reference path="google-apps-script.types.d.ts"/>
 /// <reference path="google-apps-script.ui.d.ts"/>

From 2e531425dc21bb3a19e54232d3c7d8b5f150762d Mon Sep 17 00:00:00 2001
From: Vincent Biret <vincentbiret@hotmail.com>
Date: Mon, 26 Feb 2018 10:25:49 -0500
Subject: [PATCH 255/388] HelloJs: added display type, typed promise value
 return for login, typed return value GetAuthReponse (#23614)

* - added display type
- typed promise value return for login
- typed return value GetAuthReponse

* bumping version number for hellojs

* fixed module declaration for unit tests

* reverted last module declaration fixes

* removed namespace declaration to pass linting

* hellojs :put namespace declaration back and improved global var declaration

* hellojs: removed the global definition as per recomendation of Andy
---
 types/hellojs/hellojs-tests.ts |  4 ----
 types/hellojs/index.d.ts       | 38 +++++++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/types/hellojs/hellojs-tests.ts b/types/hellojs/hellojs-tests.ts
index e5b76d3ceb..4a4e068379 100644
--- a/types/hellojs/hellojs-tests.ts
+++ b/types/hellojs/hellojs-tests.ts
@@ -1,7 +1,3 @@
-import * as hello from 'hellojs';
-
-// Test code copied from Azure AD B2C sample app at
-// https://github.com/Azure-Samples/active-directory-b2c-javascript-hellojs-singlepageapp/tree/cd5982f09a7bff0a72b7b4e44c4b5190b09e20fa
 hello.init({
     serviceName: {
         name: 'Test',
diff --git a/types/hellojs/index.d.ts b/types/hellojs/index.d.ts
index 16b19afb4a..e8efdaf19c 100644
--- a/types/hellojs/index.d.ts
+++ b/types/hellojs/index.d.ts
@@ -1,11 +1,13 @@
-// Type definitions for hello.js 1.15
+// Type definitions for hello.js 1.16
 // Project: http://adodson.com/hello.js/
 // Definitions by: Pavel Zika <https://github.com/PavelPZ>
 //                 Mikko Vuorinen <https://github.com/vuorinem>
+//                 Vincent Biret <https://github.com/baywet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 export = hello;
+export as namespace hello;
 
 declare const hello: hello.HelloJSStatic;
 
@@ -53,9 +55,11 @@ declare namespace hello {
 
     type HelloJSTokenResponseType = "token" | "code";
 
+    type HelloJSDisplayType = "popup" | "page" | "none";
+
     interface HelloJSLoginOptions {
         redirect_uri?: string;
-        display?: string;
+        display?: HelloJSDisplayType;
         scope?: string;
         response_type?: HelloJSTokenResponseType;
         force?: boolean | null;
@@ -87,19 +91,39 @@ declare namespace hello {
 
     interface HelloJSEventArgument {
         network: string;
-        authResponse?: any;
+        authResponse?: HelloJSAuthResponse;
+    }
+
+    interface HelloJSLoginEventArguement {
+        network: string;
+        authResponse?: HelloJSAuthResponse;
+        error?: Error;
+    }
+
+    interface HelloJSAuthResponse {
+        access_token?: string;
+        token_type?: string;
+        expires_in?: number;
+        id_token?: string;
+        state?: string;
+        session_state?: string;
+        network?: string;
+        display?: HelloJSDisplayType;
+        redirect_uri?: string;
+        scope?: string;
+        expires?: number;
     }
 
     interface HelloJSStatic extends HelloJSEvent {
         init(serviceAppIds: { [id: string]: string; }, options?: HelloJSLoginOptions): void;
         init(servicesDef: { [id: string]: HelloJSServiceDef; }): void;
-        login(callback: () => void): PromiseLike<any>;
-        login(options?: HelloJSLoginOptions, callback?: () => void): PromiseLike<any>;
-        login(network?: string, options?: HelloJSLoginOptions, callback?: () => void): PromiseLike<any>;
+        login(callback: () => void): PromiseLike<HelloJSLoginEventArguement>;
+        login(options?: HelloJSLoginOptions, callback?: () => void): PromiseLike<HelloJSLoginEventArguement>;
+        login(network?: string, options?: HelloJSLoginOptions, callback?: () => void): PromiseLike<HelloJSLoginEventArguement>;
         logout(callback?: () => void): PromiseLike<any>;
         logout(options?: HelloJSLogoutOptions, callback?: () => void): PromiseLike<any>;
         logout(network?: string, options?: HelloJSLogoutOptions, callback?: () => void): PromiseLike<any>;
-        getAuthResponse(network?: string): any;
+        getAuthResponse(network?: string): HelloJSAuthResponse;
         settings: HelloJSLoginOptions;
         (network: string): HelloJSStatic;
         utils: HelloJSUtils;

From 03f38cebb05e8ddd2aa5f5e8e895bc872d43e840 Mon Sep 17 00:00:00 2001
From: Mathieu Larocque <mathieu.larocque@adgear.com>
Date: Mon, 26 Feb 2018 10:55:24 -0500
Subject: [PATCH 256/388] Make bsStyle nullable to avoid setting btn-default
 class

---
 types/react-bootstrap/lib/DropdownButton.d.ts | 2 +-
 types/react-bootstrap/lib/DropdownToggle.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-bootstrap/lib/DropdownButton.d.ts b/types/react-bootstrap/lib/DropdownButton.d.ts
index b1addd7ace..168bbd6de4 100644
--- a/types/react-bootstrap/lib/DropdownButton.d.ts
+++ b/types/react-bootstrap/lib/DropdownButton.d.ts
@@ -6,7 +6,7 @@ declare namespace DropdownButton {
     export interface DropdownButtonBaseProps extends DropdownBaseProps {
         block?: boolean;
         bsSize?: Sizes;
-        bsStyle?: string;
+        bsStyle?: string | null;
         navItem?: boolean;
         noCaret?: boolean;
         pullRight?: boolean;
diff --git a/types/react-bootstrap/lib/DropdownToggle.d.ts b/types/react-bootstrap/lib/DropdownToggle.d.ts
index d166c5ae25..f8537fe510 100644
--- a/types/react-bootstrap/lib/DropdownToggle.d.ts
+++ b/types/react-bootstrap/lib/DropdownToggle.d.ts
@@ -8,7 +8,7 @@ declare namespace DropdownToggle {
         title?: string;
         useAnchor?: boolean;
         bsClass?:string; // Added since v0.30.0
-        bsStyle?:string;
+        bsStyle?:string | null;
         bsSize?:string;
     }
 }

From fda3aeee066db68c0fedf8e4b8a30fc4b5466293 Mon Sep 17 00:00:00 2001
From: sgoll <1277035+sgoll@users.noreply.github.com>
Date: Mon, 26 Feb 2018 17:15:46 +0100
Subject: [PATCH 257/388] [ramda] Add type for string-based reverse (#23927)

* Add type for string-based reverse

* Add test for string-based reverse

* Use separate documentation for each overload
---
 types/ramda/index.d.ts     | 4 ++++
 types/ramda/ramda-tests.ts | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 108a12bf0e..205df9f569 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -1601,6 +1601,10 @@ declare namespace R {
          * Returns a new list with the same elements as the original list, just in the reverse order.
          */
         reverse<T>(list: ReadonlyArray<T>): T[];
+        /**
+         * Returns a new string with the characters in reverse order.
+         */
+        reverse(str: string): string;
 
         /**
          * Scan is similar to reduce, but returns a list of successively reduced values from the left.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index eacb4558e3..8aef1c65fc 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -977,6 +977,13 @@ type Pair = KeyValuePair<string, number>;
     R.reverse([]);         // => []
 };
 
+() => {
+    R.reverse('abc');      // => 'cba'
+    R.reverse('ab');       // => 'ba'
+    R.reverse('a');        // => 'a'
+    R.reverse('');         // => ''
+};
+
 () => {
     const numbers = [1, 2, 3, 4];
     R.scan(R.multiply, 1, numbers); // => [1, 1, 2, 6, 24]

From fb314c384208f1d1780ef3c43dc20fd31a2a19a5 Mon Sep 17 00:00:00 2001
From: peszek90 <36853408+peszek90@users.noreply.github.com>
Date: Mon, 26 Feb 2018 17:21:05 +0100
Subject: [PATCH 258/388] Add rotation to RegularShapeOptions (#23925)

Add rotation to RegularShapeOptions
---
 types/openlayers/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index b7073bcda2..8a711771fa 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -14392,6 +14392,7 @@ declare module olx {
             angle?: number;
             snapToPixel?: boolean;
             stroke?: ol.style.Stroke;
+            rotation?: number;
         }
 
 

From 3af269687caa7d34ad9482e7994eab626d7e676b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leo=20Vujani=C4=87?= <leonard.vujanic@gmail.com>
Date: Mon, 26 Feb 2018 17:29:02 +0100
Subject: [PATCH 259/388] Type definitions for parity-poe 0.3 (#23903)

* Added tslint and tsconfig

* Added type definitions for Parity POE 0.3

* Added tests for type definitions

* Removed unnecessarily reference 'node' which is already referenced in the type definition
---
 types/parity-poe/index.d.ts          | 33 ++++++++++++++
 types/parity-poe/parity-poe-tests.ts | 68 ++++++++++++++++++++++++++++
 types/parity-poe/tsconfig.json       | 23 ++++++++++
 types/parity-poe/tslint.json         |  1 +
 4 files changed, 125 insertions(+)
 create mode 100644 types/parity-poe/index.d.ts
 create mode 100644 types/parity-poe/parity-poe-tests.ts
 create mode 100644 types/parity-poe/tsconfig.json
 create mode 100644 types/parity-poe/tslint.json

diff --git a/types/parity-poe/index.d.ts b/types/parity-poe/index.d.ts
new file mode 100644
index 0000000000..46ccf3291a
--- /dev/null
+++ b/types/parity-poe/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for Parity POE 0.3
+// Project: https://github.com/paritytrading/node-parity-poe
+// Definitions by: Leo Vujanić <https://github.com/leovujanic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+/**
+ * Declares Parity POE message structure
+ * Full reference can be found here https://github.com/paritytrading/parity/blob/master/libraries/net/doc/POE.md
+ */
+export interface POEMessage {
+    messageType: string;
+    orderId?: string;
+    timestamp?: number;
+    canceledQuantity?: number;
+    reason?: string;
+    liquidityFlag?: string;
+    matchNumber?: number;
+    side?: string;
+    instrument?: string;
+    quantity?: number;
+    price?: number;
+}
+
+export function formatInbound(message: POEMessage): Buffer;
+
+export function parseInbound(buffer: Buffer): POEMessage;
+
+export function formatOutbound(message: POEMessage): Buffer;
+
+export function parseOutbound(buffer: Buffer): POEMessage;
diff --git a/types/parity-poe/parity-poe-tests.ts b/types/parity-poe/parity-poe-tests.ts
new file mode 100644
index 0000000000..c5b50d5189
--- /dev/null
+++ b/types/parity-poe/parity-poe-tests.ts
@@ -0,0 +1,68 @@
+import { formatInbound, parseInbound, formatOutbound, parseOutbound, POEMessage } from "parity-poe";
+
+const buffer = new Buffer("test");
+const message: POEMessage = {
+    messageType: 'A'
+};
+
+/**
+ * formatInbound tests
+ */
+
+// $ExpectType Buffer
+formatInbound(message);
+
+// Invalid type
+// $ExpectError
+formatInbound('');
+
+// $ExpectError
+formatInbound({});
+
+// Invalid sub type
+// $ExpectError
+formatInbound({
+    messageType: 1
+});
+
+/**
+ *  parseInbound tests
+ */
+
+// $ExpectType POEMessage
+parseInbound(buffer);
+
+// Invalid type
+// $ExpectError
+parseInbound('');
+
+/**
+ * formatOutbound tests
+ */
+
+// $ExpectType Buffer
+formatOutbound(message);
+
+// Invalid type
+// $ExpectError
+formatOutbound('');
+
+// $ExpectError
+formatOutbound({});
+
+// Invalid sub type
+// $ExpectError
+formatOutbound({
+    messageType: 1
+});
+
+/**
+ * parseOutbound tests
+ */
+
+// $ExpectType POEMessage
+parseOutbound(buffer);
+
+// Invalid type
+// $ExpectError
+parseOutbound('');
diff --git a/types/parity-poe/tsconfig.json b/types/parity-poe/tsconfig.json
new file mode 100644
index 0000000000..9dc0748761
--- /dev/null
+++ b/types/parity-poe/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",
+        "parity-poe-tests.ts"
+    ]
+}
diff --git a/types/parity-poe/tslint.json b/types/parity-poe/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parity-poe/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 67e122d7f6b3836d29324c0af11e35e87b2b2458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leo=20Vujani=C4=87?= <leonard.vujanic@gmail.com>
Date: Mon, 26 Feb 2018 17:29:35 +0100
Subject: [PATCH 260/388] Type definitions for parity-pmr 0.1 (#23902)

* Added type definitions for parity-pmr 0.1

* Removed unnecessarily reference 'node' which is already referenced in the type definition
---
 types/parity-pmr/index.d.ts          | 30 ++++++++++++++++++++++++++++
 types/parity-pmr/parity-pmr-tests.ts | 29 +++++++++++++++++++++++++++
 types/parity-pmr/tsconfig.json       | 23 +++++++++++++++++++++
 types/parity-pmr/tslint.json         |  1 +
 4 files changed, 83 insertions(+)
 create mode 100644 types/parity-pmr/index.d.ts
 create mode 100644 types/parity-pmr/parity-pmr-tests.ts
 create mode 100644 types/parity-pmr/tsconfig.json
 create mode 100644 types/parity-pmr/tslint.json

diff --git a/types/parity-pmr/index.d.ts b/types/parity-pmr/index.d.ts
new file mode 100644
index 0000000000..0e05da1d6e
--- /dev/null
+++ b/types/parity-pmr/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for parity-pmr 0.1
+// Project: https://github.com/paritytrading/node-parity-pmr#readme
+// Definitions by: Leo Vujanić <https://github.com/leovujanic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/**
+ * Declares Parity PMR message structure
+ * Full reference can be found here https://github.com/paritytrading/parity/blob/master/libraries/net/doc/PMR.md
+ */
+export interface PMRMessage {
+    messageType: string;
+    version?: number;
+    timestamp?: number;
+    username?: string;
+    orderNumber?: string;
+    side?: string;
+    instrument?: string;
+    quantity?: number;
+    price?: number;
+    canceledQuantity?: number;
+    matchNumber?: number;
+    restingOrderNumber?: number;
+    incomingOrderNumber?: number;
+}
+
+export function format(message: PMRMessage): Buffer;
+
+export function parse(buffer: Buffer): PMRMessage;
diff --git a/types/parity-pmr/parity-pmr-tests.ts b/types/parity-pmr/parity-pmr-tests.ts
new file mode 100644
index 0000000000..03bcc3534d
--- /dev/null
+++ b/types/parity-pmr/parity-pmr-tests.ts
@@ -0,0 +1,29 @@
+import { format, parse, PMRMessage } from "parity-pmr";
+
+const buffer = new Buffer("test");
+const message: PMRMessage = {
+    messageType: 'E'
+};
+
+// $ExpectType Buffer
+format(message);
+
+// Invalid type
+// $ExpectError
+format('');
+
+// $ExpectError
+format({});
+
+// Invalid sub type
+// $ExpectError
+format({
+    messageType: 1
+});
+
+// $ExpectType PMRMessage
+parse(buffer);
+
+// Invalid type
+// $ExpectError
+parse('');
diff --git a/types/parity-pmr/tsconfig.json b/types/parity-pmr/tsconfig.json
new file mode 100644
index 0000000000..e73825b582
--- /dev/null
+++ b/types/parity-pmr/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",
+        "parity-pmr-tests.ts"
+    ]
+}
diff --git a/types/parity-pmr/tslint.json b/types/parity-pmr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parity-pmr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9d85a0c77340da9fd815aa18fbfb7c89cc0870f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vilim=20Stubi=C4=8Dan?= <vilim.stubican@degordian.com>
Date: Mon, 26 Feb 2018 17:31:11 +0100
Subject: [PATCH 261/388] Type definitions for parity-pmd 0.4.0 (#23901)

* Type definitions for parity-pmd 0.4.0

* Contributors list update

* Removed unnecessary reference to node
---
 types/parity-pmd/index.d.ts          | 27 +++++++++++++++++++++++++++
 types/parity-pmd/parity-pmd-tests.ts | 27 +++++++++++++++++++++++++++
 types/parity-pmd/tsconfig.json       | 23 +++++++++++++++++++++++
 types/parity-pmd/tslint.json         |  1 +
 4 files changed, 78 insertions(+)
 create mode 100644 types/parity-pmd/index.d.ts
 create mode 100644 types/parity-pmd/parity-pmd-tests.ts
 create mode 100644 types/parity-pmd/tsconfig.json
 create mode 100644 types/parity-pmd/tslint.json

diff --git a/types/parity-pmd/index.d.ts b/types/parity-pmd/index.d.ts
new file mode 100644
index 0000000000..30b02d72ef
--- /dev/null
+++ b/types/parity-pmd/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for parity-pmd 0.4
+// Project: https://github.com/paritytrading/node-parity-pmd#readme
+// Definitions by: Leonard Vujanić <https://github.com/leovujanic>
+//                 Vilim Stubičan <https://github.com/jewbre>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+/**
+ * Declares Parity PMD message structure
+ * Full reference can be found here https://github.com/paritytrading/parity/blob/master/libraries/net/doc/PMD.md
+ */
+export interface PMDMessage {
+    messageType: string;
+    version?: string;
+    timestamp?: number;
+    orderNumber?: number;
+    side?: string;
+    instrument?: string;
+    quantity?: number;
+    price?: number;
+}
+
+export function format(message: PMDMessage): Buffer;
+
+export function parse(buffer: Buffer): PMDMessage;
diff --git a/types/parity-pmd/parity-pmd-tests.ts b/types/parity-pmd/parity-pmd-tests.ts
new file mode 100644
index 0000000000..3645e7598c
--- /dev/null
+++ b/types/parity-pmd/parity-pmd-tests.ts
@@ -0,0 +1,27 @@
+import { format, parse, PMDMessage } from 'parity-pmd';
+
+// Arrange
+const buffer = new Buffer(5);
+buffer.writeUInt8(0x56, 0);
+buffer.writeUInt32BE(70, 1);
+const parsedContent: PMDMessage = parse(buffer);
+
+// Act & Assert
+// $ExpectType PMDMessage
+parse(buffer);
+
+// $ExpectType Buffer
+format(parsedContent);
+
+// Invalid type
+// $ExpectError
+parse('');
+
+// $ExpectError
+format({});
+
+// Invalid sub type
+// $ExpectError
+format({
+    messageType: 1
+});
diff --git a/types/parity-pmd/tsconfig.json b/types/parity-pmd/tsconfig.json
new file mode 100644
index 0000000000..92345f62fb
--- /dev/null
+++ b/types/parity-pmd/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",
+        "parity-pmd-tests.ts"
+    ]
+}
diff --git a/types/parity-pmd/tslint.json b/types/parity-pmd/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parity-pmd/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 66ddd925606c1774b62009726b08b5ab66b3b5da Mon Sep 17 00:00:00 2001
From: Dmitry Guketlev <yavanosta@yandex.ru>
Date: Mon, 26 Feb 2018 19:31:50 +0300
Subject: [PATCH 262/388] Add typings for forever agent (#23900)

---
 types/forever-agent/forever-agent-tests.ts | 37 ++++++++++++++++++++++
 types/forever-agent/index.d.ts             | 28 ++++++++++++++++
 types/forever-agent/tsconfig.json          | 23 ++++++++++++++
 types/forever-agent/tslint.json            |  1 +
 4 files changed, 89 insertions(+)
 create mode 100644 types/forever-agent/forever-agent-tests.ts
 create mode 100644 types/forever-agent/index.d.ts
 create mode 100644 types/forever-agent/tsconfig.json
 create mode 100644 types/forever-agent/tslint.json

diff --git a/types/forever-agent/forever-agent-tests.ts b/types/forever-agent/forever-agent-tests.ts
new file mode 100644
index 0000000000..b1ba9965fc
--- /dev/null
+++ b/types/forever-agent/forever-agent-tests.ts
@@ -0,0 +1,37 @@
+import ForeverAgent = require("forever-agent");
+
+const agent = new ForeverAgent();
+const agentSsl = new ForeverAgent.SSL();
+
+const agentWithBaseOptions = new ForeverAgent({
+    keepAlive: true,
+    keepAliveMsecs: 100,
+    maxFreeSockets: 500,
+    maxSockets: 100,
+});
+
+const agentSslWithBaseOptions = new ForeverAgent({
+    keepAlive: true,
+    keepAliveMsecs: 100,
+    maxFreeSockets: 500,
+    maxSockets: 100,
+});
+
+const agentWithAllOptions = new ForeverAgent({
+    keepAlive: true,
+    keepAliveMsecs: 100,
+    maxFreeSockets: 500,
+    maxSockets: 100,
+    minSockets: 500,
+});
+
+const agentSslWithAllOptions = new ForeverAgent({
+    keepAlive: true,
+    keepAliveMsecs: 100,
+    maxFreeSockets: 500,
+    maxSockets: 100,
+    minSockets: 500,
+});
+
+const agentDefaultMinSockets = ForeverAgent.defaultMinSockets;
+const agentSslDefaultMinSockets = ForeverAgent.SSL.defaultMinSockets;
diff --git a/types/forever-agent/index.d.ts b/types/forever-agent/index.d.ts
new file mode 100644
index 0000000000..1126a2a1c4
--- /dev/null
+++ b/types/forever-agent/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for forever-agent 0.6
+// Project: https://github.com/mikeal/forever-agent
+// Definitions by: Dmitry Guketlev <https://github.com/yavanosta>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Agent as HttpAgent, AgentOptions as HttpAgentOptions } from "http";
+
+export = ForeverAgentModule;
+
+interface ForeverAgentOptions extends HttpAgentOptions {
+    minSockets?: number;
+}
+
+declare class ForeverAgent extends HttpAgent {
+    constructor(options?: ForeverAgentOptions);
+
+    static defaultMinSockets: number;
+}
+
+declare class ForeverAgentSSL extends ForeverAgent {
+    constructor(options?: ForeverAgentOptions);
+}
+
+declare const ForeverAgentModule: typeof ForeverAgent & {
+    SSL: typeof ForeverAgentSSL,
+};
diff --git a/types/forever-agent/tsconfig.json b/types/forever-agent/tsconfig.json
new file mode 100644
index 0000000000..4868c35d0c
--- /dev/null
+++ b/types/forever-agent/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",
+        "forever-agent-tests.ts"
+    ]
+}
diff --git a/types/forever-agent/tslint.json b/types/forever-agent/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/forever-agent/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6627256182d01771d4284baae48fb762914b110d Mon Sep 17 00:00:00 2001
From: johanblumenberg <johan.blumenberg@gmail.com>
Date: Mon, 26 Feb 2018 17:32:47 +0100
Subject: [PATCH 263/388] Add missing types to expect (#23924)

* expect: add toBeNull(), toBeDefined(), toBeUndefined()

* expect: add expect(...).not

* expect: add typings for expect.any()

* expect: added toMatchObject()

* expect: added toHaveBeenLastCalledWith()
---
 types/expect/expect-tests.ts | 115 +++++++++++++++++++++++++++++++++++
 types/expect/index.d.ts      |   8 +++
 2 files changed, 123 insertions(+)

diff --git a/types/expect/expect-tests.ts b/types/expect/expect-tests.ts
index 41bdbe5581..fea4a3d4d9 100644
--- a/types/expect/expect-tests.ts
+++ b/types/expect/expect-tests.ts
@@ -88,6 +88,17 @@ describe('A spy', () => {
     expect(spy).toHaveBeenCalledWith(1, 2, 3);
   });
 
+  it('knows the arguments it was last called with', () => {
+    spy(0, 1, 2);
+    spy(1, 2, 3);
+    expect(spy).toHaveBeenLastCalledWith(1, 2, 3);
+  });
+
+  it('accepts to have been called with any object', () => {
+    spy({});
+    expect(spy).toHaveBeenCalledWith(expect.any(Object));
+  });
+
   describe('that calls some other function', () => {
     let otherContext: any;
     let otherArguments: any;
@@ -462,6 +473,66 @@ describe('toBeFalsy', () => {
   });
 });
 
+describe('toBeDefined', () => {
+  it('does not throw on defined actual values', () => {
+    expect(() => {
+      expect(1).toBeDefined();
+      expect(0).toBeDefined();
+      expect(null).toBeDefined();
+    }).toNotThrow();
+  });
+
+  it('throws on undefined actual values', () => {
+    expect(() => {
+      expect(undefined).toBeDefined();
+    }).toThrow();
+  });
+});
+
+describe('toBeUndefined', () => {
+  it('throws on defined values', () => {
+    expect(() => {
+      expect(42).toBeUndefined();
+    }).toThrow();
+
+    expect(() => {
+      expect(0).toBeUndefined();
+    }).toThrow();
+
+    expect(() => {
+      expect(null).toBeUndefined();
+    }).toThrow();
+  });
+
+  it('does not throw with undefined actual values', () => {
+    expect(() => {
+      expect(undefined).toBeUndefined();
+    }).toNotThrow();
+  });
+});
+
+describe('toBeNull', () => {
+  it('throws on non-null values', () => {
+    expect(() => {
+      expect(42).toBeNull();
+    }).toThrow();
+
+    expect(() => {
+      expect(0).toBeNull();
+    }).toThrow();
+
+    expect(() => {
+      expect(undefined).toBeNull();
+    }).toThrow();
+  });
+
+  it('does not throw with null actual values', () => {
+    expect(() => {
+      expect(null).toBeNull();
+    }).toNotThrow();
+  });
+});
+
 describe('toEqual', () => {
   it('works', () => {
     expect(() => {
@@ -953,6 +1024,36 @@ describe('expect(array).toNotMatch', () => {
   });
 });
 
+describe('expect(object).toMatchObject', () => {
+  it('does not throw when the actual value matches', () => {
+    expect(() => {
+      expect({
+        statusCode: 200,
+        headers: {
+          server: 'express web server'
+        }
+      }).toMatchObject({
+        statusCode: 200,
+        headers: {}
+      });
+    }).toNotThrow();
+  });
+
+  it('throws when the actual value does not match', () => {
+    expect(() => {
+      expect({
+        statusCode: 200,
+        headers: {
+          server: 'nginx web server'
+        }
+      }).toMatchObject({
+        statusCode: 201,
+        headers: {}
+      });
+    }).toThrow(/to match/);
+  });
+});
+
 describe('toNotEqual', () => {
   it('works', () => {
     expect('actual').toNotEqual('expected');
@@ -1100,3 +1201,17 @@ describe('withContext', () => {
     }).toThrow(/must be a function/);
   });
 });
+
+describe('not', () => {
+  it('does not throw on different values', () => {
+    expect(() => {
+      expect(1).not.toEqual(2);
+    }).toNotThrow();
+  });
+
+  it('throws on equal values', () => {
+    expect(() => {
+      expect(1).not.toEqual(1);
+    }).toThrow();
+  });
+});
diff --git a/types/expect/index.d.ts b/types/expect/index.d.ts
index a37e8366f1..0e7ea18e91 100644
--- a/types/expect/index.d.ts
+++ b/types/expect/index.d.ts
@@ -14,6 +14,9 @@ declare namespace expect {
         toBeTruthy(message?: string): Expectation<T>;
         toNotExist(message?: string): Expectation<T>;
         toBeFalsy(message?: string): Expectation<T>;
+        toBeNull(message?: string): Expectation<T>;
+        toBeDefined(message?: string): Expectation<T>;
+        toBeUndefined(message?: string): Expectation<T>;
 
         toBe(value: T, message?: string): Expectation<T>;
         toNotBe(value: any, message?: string): Expectation<T>;
@@ -28,6 +31,7 @@ declare namespace expect {
         toNotBeAn(value: string | {}, message?: string): Expectation<T>;
         toMatch(value: string | RegExp | {}, message?: string): Expectation<T>;
         toNotMatch(value: string | RegExp | {}, message?: string): Expectation<T>;
+        toMatchObject(value: {}, message?: string): Expectation<T>;
 
         toBeLessThan(value: number, message?: string): Expectation<T>;
         toBeLessThanOrEqualTo(value: number, messasge?: string): Expectation<T>;
@@ -55,6 +59,9 @@ declare namespace expect {
         toHaveBeenCalled(message?: string): Expectation<T>;
         toNotHaveBeenCalled(message?: string): Expectation<T>;
         toHaveBeenCalledWith(...args: any[]): Expectation<T>;
+        toHaveBeenLastCalledWith(...args: any[]): Expectation<T>;
+
+        not: Expectation<T>;
 
         // deprecated
         withContext(context: any): Expectation<T>;
@@ -90,6 +97,7 @@ declare namespace expect {
     function restoreSpies(): void;
     function assert(condition: boolean, messageFormat: string, ...extraArgs: any[]): void;
     function extend(extension: Extension): void;
+    function any<T>(ctor: { new (): T }): T;
 }
 
 declare function expect<T>(actual: T): expect.Expectation<T>;

From 385efad406784987948549534a2f72ce0b6eb3c9 Mon Sep 17 00:00:00 2001
From: AEPKILL <yuanstop@gmail.com>
Date: Tue, 27 Feb 2018 00:42:37 +0800
Subject: [PATCH 264/388] Type definitions for sass-webpack-plugin 1.0.0 
 (#23898)

* finish

* add tslint

* pass lint

* fix some error

* fix export error
---
 types/sass-webpack-plugin/index.d.ts          | 32 +++++++++++++++++++
 .../sass-webpack-plugin-tests.ts              | 30 +++++++++++++++++
 types/sass-webpack-plugin/tsconfig.json       | 17 ++++++++++
 types/sass-webpack-plugin/tslint.json         |  1 +
 4 files changed, 80 insertions(+)
 create mode 100644 types/sass-webpack-plugin/index.d.ts
 create mode 100644 types/sass-webpack-plugin/sass-webpack-plugin-tests.ts
 create mode 100644 types/sass-webpack-plugin/tsconfig.json
 create mode 100644 types/sass-webpack-plugin/tslint.json

diff --git a/types/sass-webpack-plugin/index.d.ts b/types/sass-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..df589ca034
--- /dev/null
+++ b/types/sass-webpack-plugin/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for sass-webpack-plugin 1.0
+// Project: https://github.com/jalkoby/sass-webpack-plugin
+// Definitions by: AEPKILL <https://github.com/AepKill>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { Options } from 'node-sass';
+import { Plugin } from 'webpack';
+
+declare namespace SassPlugin {
+  type NODE_ENV = 'production' | 'development';
+  type FileRule = string | string[] | { [key: string]: string };
+  interface Config {
+    sourceMap?: boolean;
+    autoprefixer?: boolean;
+    sass?: Options;
+  }
+}
+
+declare class SassPlugin extends Plugin {
+  constructor(
+    file: SassPlugin.FileRule,
+    mode?: SassPlugin.NODE_ENV | SassPlugin.Config
+  );
+  constructor(
+    file: SassPlugin.FileRule,
+    mode: SassPlugin.NODE_ENV,
+    config?: SassPlugin.Config
+  );
+}
+
+export = SassPlugin;
diff --git a/types/sass-webpack-plugin/sass-webpack-plugin-tests.ts b/types/sass-webpack-plugin/sass-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..26fc27f4bb
--- /dev/null
+++ b/types/sass-webpack-plugin/sass-webpack-plugin-tests.ts
@@ -0,0 +1,30 @@
+import SassPlugin = require('sass-webpack-plugin');
+
+type NODE_ENV = SassPlugin.NODE_ENV;
+
+const env = process.env.NODE_ENV as NODE_ENV;
+
+new SassPlugin('./src/styles/index.scss');
+
+// production ready
+new SassPlugin('./src/styles/index.scss', env);
+
+// multi files
+new SassPlugin(['./src/styles/one.scss', './src/styles/two.sass'], env);
+
+// a different output filename
+new SassPlugin({ './src/styles/index.scss': 'bundle.css' }, env);
+
+// with sass tuning
+new SassPlugin('./src/styles/index.scss', env, {
+  sass: {
+    includePaths: ['node_modules/bootstrap-sass/assets/stylesheets']
+  }
+});
+
+// with source maps + compressing - autoprefixing
+new SassPlugin('./src/styles/index.scss', {
+  sourceMap: true,
+  sass: { outputStyle: 'compressed' },
+  autoprefixer: false
+});
diff --git a/types/sass-webpack-plugin/tsconfig.json b/types/sass-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..f062aaeb5d
--- /dev/null
+++ b/types/sass-webpack-plugin/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6", "dom"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictFunctionTypes": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "jsx": "react",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": ["index.d.ts", "sass-webpack-plugin-tests.ts"]
+}
diff --git a/types/sass-webpack-plugin/tslint.json b/types/sass-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sass-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6e4017430211e42afdcb4ee2f79526dca826ea6b Mon Sep 17 00:00:00 2001
From: Jimmy Luong <jluong@atlassian.com>
Date: Tue, 27 Feb 2018 03:44:31 +1100
Subject: [PATCH 265/388] Add type definitions for @atlaskit/button (#23897)

---
 .../atlaskit__button-tests.tsx                | 38 ++++++++
 types/atlaskit__button/index.d.ts             | 93 +++++++++++++++++++
 types/atlaskit__button/tsconfig.json          | 20 ++++
 types/atlaskit__button/tslint.json            |  1 +
 4 files changed, 152 insertions(+)
 create mode 100644 types/atlaskit__button/atlaskit__button-tests.tsx
 create mode 100644 types/atlaskit__button/index.d.ts
 create mode 100644 types/atlaskit__button/tsconfig.json
 create mode 100644 types/atlaskit__button/tslint.json

diff --git a/types/atlaskit__button/atlaskit__button-tests.tsx b/types/atlaskit__button/atlaskit__button-tests.tsx
new file mode 100644
index 0000000000..dd592255e9
--- /dev/null
+++ b/types/atlaskit__button/atlaskit__button-tests.tsx
@@ -0,0 +1,38 @@
+import Button, { ButtonGroup, themeNamespace } from "@atlaskit/button";
+
+import * as React from "react";
+import { render } from "react-dom";
+
+declare const container: Element;
+
+render(
+    <ButtonGroup appearance="primary">
+        <Button
+            appearance="danger"
+            ariaControls="some-aria-controls"
+            ariaExpanded={true}
+            ariaHaspopup={true}
+            className="some-class-name"
+            component={Button}
+            form="some-form"
+            href="some-href"
+            iconAfter={<div />}
+            iconBefore={<div />}
+            id="some-id"
+            innerRef={() => {}}
+            isDisabled={true}
+            isSelected={true}
+            key="some-key"
+            onClick={event => event.currentTarget.formMethod}
+            ref="some-ref"
+            shouldFitContainer={true}
+            spacing="compact"
+            tabIndex={88}
+            target="some-target"
+            type="button"
+        >
+            {themeNamespace}
+        </Button>
+    </ButtonGroup>,
+    container
+);
diff --git a/types/atlaskit__button/index.d.ts b/types/atlaskit__button/index.d.ts
new file mode 100644
index 0000000000..e9a613fabd
--- /dev/null
+++ b/types/atlaskit__button/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for @atlaskit/button 6.4
+// Project: https://bitbucket.org/atlassian/atlaskit-mk-2/
+// Definitions by: Jimmy Luong <https://github.com/dijimsta>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import {
+    Component,
+    ReactNode,
+    ReactElement,
+    ComponentClass,
+    MouseEventHandler
+} from "react";
+
+export type ButtonAppearances =
+    | "default"
+    | "danger"
+    | "link"
+    | "primary"
+    | "subtle"
+    | "subtle-link"
+    | "warning"
+    | "help";
+
+export interface ButtonProps {
+    /** The base styling to apply to the button. */
+    readonly appearance?: ButtonAppearances;
+    /** Pass aria-controls to underlying html button. */
+    readonly ariaControls?: string;
+    /** Pass aria-expanded to underlying html button. */
+    readonly ariaExpanded?: boolean;
+    /** Pass aria-haspopup to underlying html button. */
+    readonly ariaHaspopup?: boolean;
+    /** This button's child nodes. */
+    readonly children?: ReactNode;
+    /** Add a classname to the button. */
+    readonly className?: string;
+    /** A custom component to use instead of the default button. */
+    readonly component?: ComponentClass<any>;
+    /** Name property of a linked form that the button submits when clicked. */
+    readonly form?: string;
+    /** Provides a url for buttons being used as a link. */
+    readonly href?: string;
+    /** Places an icon within the button, after the button's text. */
+    readonly iconAfter?: ReactElement<any>;
+    /** Places an icon within the button, before the button's text. */
+    readonly iconBefore?: ReactElement<any>;
+    /** Pass a reference on to the styled component */
+    readonly innerRef?: (instance: any) => void;
+    /** Provide a unique id to the button. */
+    readonly id?: string;
+    /** Set if the button is disabled. */
+    readonly isDisabled?: boolean;
+    /** Change the style to indicate the button is selected. */
+    readonly isSelected?: boolean;
+    /** Handler to be called on click. */
+    readonly onClick?: MouseEventHandler<HTMLButtonElement>;
+    /** Set the amount of padding in the button. */
+    readonly spacing?: ButtonSpacing;
+    /** Assign specific tabIndex order to the underlying html button. */
+    readonly tabIndex?: number;
+    /** Pass target down to a link within the button component, if a href is provided. */
+    readonly target?: string;
+    /** Set whether it is a button or a form submission. */
+    readonly type?: ButtonType;
+    /** Option to fit button width to its parent width */
+    readonly shouldFitContainer?: boolean;
+}
+
+export type ButtonType = "button" | "submit";
+
+export type ButtonSpacing = "compact" | "default" | "none";
+
+export interface ButtonState {
+    readonly isActive: boolean;
+    readonly isFocus: boolean;
+    readonly isHover: boolean;
+}
+
+declare class Button extends Component<ButtonProps, ButtonState> {}
+
+export interface ButtonGroupProps {
+    /** The appearance to apply to all buttons. */
+    readonly appearance?: ButtonAppearances;
+    /** The buttons to render. */
+    readonly children: ReactNode;
+}
+
+export class ButtonGroup extends Component<ButtonGroupProps> {}
+
+export const themeNamespace: string;
+
+export default Button;
diff --git a/types/atlaskit__button/tsconfig.json b/types/atlaskit__button/tsconfig.json
new file mode 100644
index 0000000000..3f374a6b3e
--- /dev/null
+++ b/types/atlaskit__button/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6", "dom"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react",
+        "paths": {
+            "@atlaskit/button": ["atlaskit__button"]
+        }
+    },
+    "files": ["index.d.ts", "atlaskit__button-tests.tsx"]
+}
diff --git a/types/atlaskit__button/tslint.json b/types/atlaskit__button/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/atlaskit__button/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3bdafbcb56c0762e60d93b45fd68ee73d6425bf1 Mon Sep 17 00:00:00 2001
From: Dancespiele <spieljs@gmail.com>
Date: Mon, 26 Feb 2018 17:49:21 +0100
Subject: [PATCH 266/388] add types definitions for the roads project (#23832)

* add types for the roads project

* fix a type
---
 types/roads/index.d.ts     | 245 +++++++++++++++++++++++++++++++++++++
 types/roads/roads-tests.ts |  68 ++++++++++
 types/roads/tsconfig.json  |  24 ++++
 types/roads/tslint.json    |   3 +
 4 files changed, 340 insertions(+)
 create mode 100644 types/roads/index.d.ts
 create mode 100644 types/roads/roads-tests.ts
 create mode 100644 types/roads/tsconfig.json
 create mode 100644 types/roads/tslint.json

diff --git a/types/roads/index.d.ts b/types/roads/index.d.ts
new file mode 100644
index 0000000000..55028403b6
--- /dev/null
+++ b/types/roads/index.d.ts
@@ -0,0 +1,245 @@
+// Type definitions for roads 5.0
+// Project: https://github.com/Dashron/roads
+// Definitions by: Francisco Jesus <https://github.com/dancespiele>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+/// <reference types="node" />
+
+/**
+ * Roads module
+ */
+export type Keys = string;
+export type Option = {[k in Keys]: any};
+
+/**
+ * @param method The HTTP method that was provided to the request
+ * @param url The URL that was provided to the request
+ * @param body The body that was provided to the request, after it was properly parsed into an object
+ * @param headers The headers that were provided to the request
+ * @param next The next step of the handler chain
+ */
+export interface Router {
+    method: string;
+    path: string;
+    fn: () => void;
+}
+
+/**
+ * @param babelify A set of options that can influence the build process. See all fields below
+ * @param envify An object to pass to envify. This allows you to change values between your server and client scripts
+ * @param exclude An array of files that should not be included in the build process
+ * @param use_sourcemaps Whether or not the build process should include source maps
+ */
+export interface Options {
+    babelify?: Option;
+    envify?: Option;
+    exclude?: string[];
+    external?: any;
+    use_sourcemaps?: boolean;
+}
+
+/**
+ * A Road is a container that holds an array of functions
+ * @see <a href="https://github.com/dancespiele/roads#roadsroad" target="_blank">new Road()</a>
+ */
+export class Road {
+    /**
+     * Add a custom function that will be executed before every request
+     * @param fn Will be called any time a request is made on the object.
+     * @see <a href="https://github.com/dancespiele/roads#roadusefunction-fn" target="_blank">Road.use(Function fn)</a>
+     */
+    use(fn: (method: string, url: any, body: any, headers: Headers, next: () => any) => any): any;
+
+    /**
+     * Locate and execute the resource method associated with the request parameters
+     * @param method The request HTTP method
+     * @param url The request Url
+     * @param body the request body
+     * @param headers The request headers
+     * @see <a href="https://github.com/Dashron/roads#roadrequeststring-method-string-url-dynamic-body-object-headers"
+     * target="_blank">Road.request(string method, string url, dynamic body, Object headers)</a>
+     */
+    request(method: string, url: string, body?: any, headers?: Headers): any;
+}
+
+/**
+ * The response object contains all of the information you want to send to the client
+ * @param body The body of the response
+ * @param status The HTTP Status code
+ * @param headers Key value pairs of http headers
+ * @see <a href="https://github.com/Dashron/roads#roadsresponse" target="_blank">Road.Response</a>
+ */
+export class Response {
+    constructor(body: any, status: number, headers?: Option);
+
+    /**
+     * Add a cookie method to the response object. Allows you to set cookies
+     * @param name The name of the cookie
+     * @param value The value name
+     * @param options Cookie options
+     */
+    setCookie(name: string, value: string, options?: any): void;
+
+    /**
+     * Get all the cookies
+     */
+    getCookies(): any;
+}
+
+/**
+ * A helper error, that contains information relevant to common HTTP errors
+ * @param message A message describing the HTTP error
+ * @param code An official http status code
+ * @see <a href="https://github.com/Dashron/roads#roadshttperror" target="_blank">Roads.HttpError</a>
+ */
+export class HttpError {
+    invalid_request: number;
+    unauthorized: number;
+    forbidden: number;
+    not_found: number;
+    method_not_allowed: number;
+    not_acceptable: number;
+    conflict: number;
+    gone: number;
+    unprocessable_entity: number;
+    too_many_requests: number;
+    internal_server_error: number;
+    constructor(message: string, code: number);
+}
+
+/**
+ * Middleware object
+ */
+export namespace middleware {
+    /**
+     * Very simple middleware to apply a single value to the request context
+     * @param key The key that should store the value on the request context
+     * @param val val The value to apply to the request context
+     */
+    function applyToContext(key: string, val: any): () => any;
+
+    /**
+     * Middleware to kill the trailing slash on http requests
+     * @see <a href="https://github.com/Dashron/roads#killslash" target="_blank">killSlash()</a>
+     */
+    function killSlash(): any;
+
+    /**
+     * 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
+     */
+    function cors(allow_origins: string | string[], allow_headers?: string[]): any;
+
+    /**
+     * Translate the request body into a usable value
+     * @param body request body
+     * @param content_type media type of the body
+     */
+    function parseBody(body: any, content_type: string): object | string;
+
+    /**
+     * Adds two simple functions to get and set a page title on the request context. This is very helpful for isomorphic js, since on the client, page titles aren't part of the rendered view data.
+     */
+    function setTitle(): any;
+
+    /**
+     * Applies a method to the request context that allows you to make requests into another roads object
+     * @param key The name of the key in the request context that will store the roads request
+     * @param road road The roads object that you will interact with
+     */
+    function reroute(key: string, road: Road): () => any;
+
+    /**
+     *  Middleware to Apply proper cors headers
+     */
+    class SimpleRouter {
+        /**
+         * It have all the routers configured
+         */
+        routers: Router[];
+
+        /**
+         * @param road The road for the routers
+         */
+        constructor(road?: Road);
+
+        /**
+         * @param road apply manualy the router middleware
+         */
+        applyMiddleware(road: Road): void;
+
+        /**
+         * Add a route to receive the request
+         * @param method Methot to receive the request
+         * @param path Paht to receive the request
+         * @param fn Handle the request received
+         */
+        addRoute(method: string, path: string, fn: (url: any, body: any, headers: Headers, next: () => any) => any): any;
+
+        /**
+         * Receive file request
+         * @param file_path path of the file to receive
+         * @param prefix prefix of the path file
+         */
+        addRouteFile(file_path: string, prefix?: string): any;
+    }
+}
+
+/**
+ * To integrate to differents HTTP server
+ */
+export namespace integrations {
+    /**
+     * Integration to express
+     * @param road The Road object that contains all routing information for this integration
+     */
+    function express(road: Road): () => any;
+
+    /**
+     * Integration to koa
+     * @param road The Road object that contains all routing information for this integration
+     */
+    function koa(road: Road): () => any;
+}
+
+/**
+ * A helper object to easily enable PJAX on your website using roads
+ */
+export class PJAX {
+    /**
+     * @param road The road that will turn your pjax requests into HTML
+     * @param container_element The element that will be filled with your roads output
+     * @param window The pages window object to help set page title and other items
+     */
+    constructor(road: Road, container_element?: Element | null, window?: Window | null);
+
+    /**
+     * Adds middleware to the assigned road whcih will adds setTitle to the request context. This allows you to easily update the page title
+     */
+    addTitleMiddleware(): this;
+
+    /**
+     * Assigns the cookie middlware to the road to properly handle cookies
+     * @param document The pages document object to properly parse and set cookies
+     */
+    addCookieMiddleware(document: Document): any;
+
+    /**
+     * Hooks up the PJAX functionality to the information provided via the constructor
+     */
+    register(): any;
+
+    /**
+     * @param response_object The response from the roads request
+     */
+    render(response_object: object): any;
+}
+
+/**
+ * Browserify function to convert your script to run in the browser
+ * @param input_file The source file that will be converted to use in the browser
+ * @param output_file The output file that will be accessible by your browser
+ * @param options A set of options that can influence the build process. See all fields below
+ */
+export function build(input_file: string, output_file: string, options?: Options): any;
diff --git a/types/roads/roads-tests.ts b/types/roads/roads-tests.ts
new file mode 100644
index 0000000000..6914c3d218
--- /dev/null
+++ b/types/roads/roads-tests.ts
@@ -0,0 +1,68 @@
+import { build, Road, middleware, integrations, Response, HttpError, PJAX } from "roads";
+
+const road = new Road();
+const router = new middleware.SimpleRouter(road);
+
+road.use(middleware.cors("*"));
+
+road.use(middleware.killSlash);
+
+router.addRoute("GET", "/user", (path, body, headers, next) => {
+    const response = new Response({name: "test"}, 200, {"last-modified": (new Date()).toString()});
+    response.setCookie("name", "value", {path: ''});
+    response.getCookies();
+    return response;
+});
+
+router.addRouteFile('./example.png', 'http://image-example.com');
+
+road.request("GET", "/user")
+    .then((response: any) => {
+        console.log(`response: ${JSON.stringify(response)}`);
+    });
+
+road.use((method, url, body, headers, next) => {
+    return JSON.stringify({
+        method,
+        url,
+        body,
+        headers,
+        next
+    });
+});
+
+road.use((method, url, body, headers, next) => {
+    // execute the actual resource method, and return the response
+    return next()
+        // Catch any errors that are thrown by the resources
+        .catch ((err: any) => {
+            // Wrap the errors in response objects. If they are [HttpErrors](#roadshttperror) we adjust the status code
+            switch (err.code) {
+                case 404:
+                    return new HttpError(err.massage , 404);
+                case 405:
+                    return new HttpError(err.massage, 405);
+                case 500:
+                default:
+                    return new HttpError(err.massage, 500);
+            }
+        });
+});
+
+const pjax = new PJAX(road, document.getElementById('container'), window);
+pjax.register();
+build(__dirname + '/static/client.js', __dirname + '/static/client.brws.js', {
+    use_sourcemaps: true,
+    external: {
+        roads: {
+            output_file: __dirname + '/static/roads.brws.js',
+        },
+        react: {
+            output_file: __dirname + '/static/react.brws.js',
+        }
+    },
+    babelify: {presets: ['react']}
+});
+
+const koa = integrations.koa(road);
+const express = integrations.express(road);
diff --git a/types/roads/tsconfig.json b/types/roads/tsconfig.json
new file mode 100644
index 0000000000..ac8a53a641
--- /dev/null
+++ b/types/roads/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",
+        "roads-tests.ts"
+    ]
+}
diff --git a/types/roads/tslint.json b/types/roads/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/roads/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 4843cd33e3eb82203b08c2b7cea022e469695edc Mon Sep 17 00:00:00 2001
From: Muhammad Fawwaz Orabi <mfawwaz93@gmail.com>
Date: Mon, 26 Feb 2018 18:51:35 +0200
Subject: [PATCH 267/388] Add type definitions for react-helmet-async (#23825)

* Add type definitions for react-helmet-async

* Require TS 2.6

* Rename FilledContext to PopulatedContext

* Add tests
---
 types/react-helmet-async/index.d.ts           | 20 +++++++++++++++++++
 .../react-helmet-async-tests.tsx              | 15 ++++++++++++++
 types/react-helmet-async/tsconfig.json        | 17 ++++++++++++++++
 types/react-helmet-async/tslint.json          |  1 +
 4 files changed, 53 insertions(+)
 create mode 100644 types/react-helmet-async/index.d.ts
 create mode 100644 types/react-helmet-async/react-helmet-async-tests.tsx
 create mode 100644 types/react-helmet-async/tsconfig.json
 create mode 100644 types/react-helmet-async/tslint.json

diff --git a/types/react-helmet-async/index.d.ts b/types/react-helmet-async/index.d.ts
new file mode 100644
index 0000000000..1a240b075b
--- /dev/null
+++ b/types/react-helmet-async/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for react-helmet-async 0.0
+// Project: https://github.com/staylor/react-helmet-async#readme
+// Definitions by: forabi <https://github.com/forabi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+
+import Helmet, { HelmetData } from 'react-helmet';
+export default Helmet;
+
+export interface PopulatedContext {
+    helmet: HelmetData;
+}
+
+interface ProviderProps {
+    context?: {};
+}
+
+export class HelmetProvider extends React.Component<ProviderProps> {}
diff --git a/types/react-helmet-async/react-helmet-async-tests.tsx b/types/react-helmet-async/react-helmet-async-tests.tsx
new file mode 100644
index 0000000000..e91f437edc
--- /dev/null
+++ b/types/react-helmet-async/react-helmet-async-tests.tsx
@@ -0,0 +1,15 @@
+import * as React from 'react';
+import { renderToString } from 'react-dom/server';
+import Helmet, { HelmetProvider, PopulatedContext } from 'react-helmet-async';
+
+const helmetContext = {};
+
+const markup = renderToString(
+    <HelmetProvider context={helmetContext}>
+        <div>
+            <Helmet>
+                <title>Hello, world!</title>
+            </Helmet>
+        </div>
+    </HelmetProvider>
+);
diff --git a/types/react-helmet-async/tsconfig.json b/types/react-helmet-async/tsconfig.json
new file mode 100644
index 0000000000..bbd3f732ac
--- /dev/null
+++ b/types/react-helmet-async/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "jsx": "react",
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "react-helmet-async-tests.tsx"]
+}
diff --git a/types/react-helmet-async/tslint.json b/types/react-helmet-async/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-helmet-async/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 651ab56894e243abead0a763643213a0a760747b Mon Sep 17 00:00:00 2001
From: Brian Schlenker <bschlenk@umich.edu>
Date: Mon, 26 Feb 2018 08:55:05 -0800
Subject: [PATCH 268/388] Upgrade es6-promisify typings to 6.0.0 (#23739)

* Upgrade es6-promisify typings to 6.0.0

* Change test import to be not relative
---
 types/es6-promisify/es6-promisify-tests.ts | 10 +----
 types/es6-promisify/index.d.ts             | 47 +++++++++++++++-------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/types/es6-promisify/es6-promisify-tests.ts b/types/es6-promisify/es6-promisify-tests.ts
index e2e004a950..e86c4f7f9e 100644
--- a/types/es6-promisify/es6-promisify-tests.ts
+++ b/types/es6-promisify/es6-promisify-tests.ts
@@ -1,6 +1,6 @@
 /// <reference types="node" />
 
-import promisify = require('es6-promisify');
+import { promisify } from 'es6-promisify';
 
 function callbackFunction(a: string, b: string, callback: (error: any, combined: string) => void): void {
 	callback(undefined, a + b);
@@ -10,14 +10,8 @@ function multiArgFunction(a: string, b: string, c: string, callback: (error: any
 	callback(undefined, a + c, b + c);
 }
 
-const noKeys: promisify.Settings = {};
-const multiArgFunctionSettings: promisify.Settings = {
-	thisArg: multiArgFunction,
-	multiArgs: true
-};
-
 const callbackPromiseFactory: (...args: any[]) => Promise<string> = promisify(callbackFunction);
-const multiArgPromiseFactory: (...args: any[]) => Promise<string[]> = promisify(multiArgFunction, multiArgFunctionSettings);
+const multiArgPromiseFactory: (...args: any[]) => Promise<any> = promisify(multiArgFunction);
 
 const callbackPromise: Promise<string> = callbackPromiseFactory('stringA', 'stringB');
 const multiArgPromise: Promise<string[]> = multiArgPromiseFactory('stringA', 'stringB', 'stringC');
diff --git a/types/es6-promisify/index.d.ts b/types/es6-promisify/index.d.ts
index 8965b48503..1ce79ec210 100644
--- a/types/es6-promisify/index.d.ts
+++ b/types/es6-promisify/index.d.ts
@@ -1,24 +1,43 @@
-// Type definitions for es6-promisify 5.0
+// Type definitions for es6-promisify 6.0
 // Project: https://github.com/digitaldesignlabs/es6-promisify#readme
 // Definitions by: Harry Shipton <https://github.com/harryshipton>
+//                 Brian Schlenker <https://github.com/bschlenk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function es6_promisify(original: (...args: any[]) => any, settings?: es6_promisify.Settings): ((...args: any[]) => Promise<any>);
-
 // If the issue at https://github.com/Microsoft/TypeScript/issues/1360 is fixed,
-// then an update should be submitted replacing the above declaration with the
-// following declarations.
+// then an update should be submitted replacing the promisify declaration with
+// the following declarations.
 /*
-declare function es6_promisify<T>(original: (...args: any[], callback: (error: any, arg: T) => any) => any, settings?: Settings): ((...args: any[]) => Promise<T>);
+function promisify<T>(original: (...args: any[], callback: (error: any, arg: T) => any) => any): ((...args: any[]) => Promise<T>);
 
-declare function es6_promisify(original: (...args: any[], callback: (error: any, ...args: any[]) => any) => any, settings?: Settings): ((...args: any[]) => Promise<any[]>);
+function promisify(original: (...args: any[], callback: (error: any, ...args: any[]) => any) => any): ((...args: any[]) => Promise<any>);
 */
 
-declare namespace es6_promisify {
-    interface Settings {
-        thisArg?: any;
-        multiArgs?: boolean;
-    }
-}
+export type Callback<T> = (err: any, arg?: T) => any;
+export type CallbackFunction = (...args: any[]) => any;
+export type PromiseFunction = (...args: any[]) => Promise<any>;
 
-export = es6_promisify;
+export function promisify<T>(original: (cb: Callback<T>) => any):
+    () => Promise<T>;
+export function promisify<T, U>(original: (param1: U, cb: Callback<T>) => any):
+    (param1: U) => Promise<T>;
+export function promisify<T, U, V>(original: (param1: U, param2: V, cb: Callback<T>) => any):
+    (param1: U, param2: V) => Promise<T>;
+export function promisify<T, U, V, W>(original: (param1: U, param2: V, param3: W, cb: Callback<T>) => any):
+    (param1: U, param2: V, param3: W) => Promise<T>;
+export function promisify(original: CallbackFunction): PromiseFunction;
+
+export namespace promisify {
+    /**
+     * This symbol can be placed on the function to be promisified to
+     * provide names as an array of strings for the values in a success
+     * callback.
+     */
+    const argumentNames: symbol;
+
+    /**
+     * The user can supply their own Promise implementation by setting it
+     * here. Otherwise, the global Promise object will be used.
+     */
+    let Promise: PromiseConstructor;
+}

From 5bdd72f928a7f136e2bbb5ff2dd0a451659e64d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kevin=20Tji=C3=A5m?= <kevin@kevincharm.com>
Date: Tue, 27 Feb 2018 00:55:52 +0800
Subject: [PATCH 269/388] [@types/three] Fix function signatures for some
 Animation related classes (#23782)

* fix(three): fix function signature for AnimationMixer.stopAllAction

* fix(three): change first arg in AnimationClip.findByName to array
---
 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 3ba0be89e8..a5e2b6486c 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -271,7 +271,7 @@ export class AnimationClip {
     optimize(): AnimationClip;
 
     static CreateFromMorphTargetSequence( name: string, morphTargetSequence: MorphTarget[], fps: number, noLoop: boolean ): AnimationClip;
-    static findByName( clipArray: AnimationClip, name: string ): AnimationClip;
+    static findByName( clipArray: AnimationClip[], name: string ): AnimationClip;
     static CreateClipsFromMorphTargetSequences( morphTargets: MorphTarget[], fps: number, noLoop: boolean ): AnimationClip[];
     static parse( json: any ): AnimationClip;
     static parseAnimation( animation: any, bones: Bone[], nodeName: string ): AnimationClip;
@@ -286,7 +286,7 @@ export class AnimationMixer extends EventDispatcher {
 
     clipAction(clip: AnimationClip, root?: any): AnimationAction;
     existingAction(clip: AnimationClip, root?: any): AnimationAction;
-    stopAllAction(clip: AnimationClip, root?: any): AnimationMixer;
+    stopAllAction(): AnimationMixer;
     update(deltaTime: number): AnimationMixer;
     getRoot(): any;
     uncacheClip(clip: AnimationClip): void;

From 786fae6a7fca5529a926b0adffddcd9b4de73d13 Mon Sep 17 00:00:00 2001
From: Peter Burns <rictic@gmail.com>
Date: Mon, 26 Feb 2018 08:59:53 -0800
Subject: [PATCH 270/388] ExportNamedDeclaration#source can be null (#23909)

e.g. this named declaration has a source:
```javascript
export {foo} from './bar.js';
```

and this one does not:
```javascript
export const foo = 10;
```

Try it out at https://astexplorer.net/ to confirm.
---
 types/babel-types/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/babel-types/index.d.ts b/types/babel-types/index.d.ts
index cbed3e076c..b1de338923 100644
--- a/types/babel-types/index.d.ts
+++ b/types/babel-types/index.d.ts
@@ -422,7 +422,7 @@ export interface ExportNamedDeclaration extends Node {
     type: "ExportNamedDeclaration";
     declaration: Declaration;
     specifiers: ExportSpecifier[];
-    source: StringLiteral;
+    source: StringLiteral | null;
 }
 
 export interface ExportSpecifier extends Node {

From 28a3b11694e22cb7ded033ad53e2bb860b710542 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard-thieu@users.noreply.github.com>
Date: Mon, 26 Feb 2018 12:02:12 -0500
Subject: [PATCH 271/388] [simplebar] Allow SimpleBar to be imported as a
 module. (#23911)

* [simplebar] Allow SimpleBar to be imported as a module.

* [simplebar] Add missing author.
---
 types/simplebar/index.d.ts           | 5 ++++-
 types/simplebar/test/module-tests.ts | 4 ++++
 types/simplebar/tsconfig.json        | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 types/simplebar/test/module-tests.ts

diff --git a/types/simplebar/index.d.ts b/types/simplebar/index.d.ts
index 64533d7408..46b6b9e737 100644
--- a/types/simplebar/index.d.ts
+++ b/types/simplebar/index.d.ts
@@ -1,9 +1,12 @@
 // Type definitions for simplebar.js 2.4
 // Project: https://github.com/Grsmto/simplebar
-// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+// Definitions by: Gregor Woiwode <https://github.com/gregonnet>, Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
+export as namespace SimpleBar;
+export = SimpleBar;
+
 declare class SimpleBar {
     static removeObserver(): void;
 
diff --git a/types/simplebar/test/module-tests.ts b/types/simplebar/test/module-tests.ts
new file mode 100644
index 0000000000..b7d10d73bf
--- /dev/null
+++ b/types/simplebar/test/module-tests.ts
@@ -0,0 +1,4 @@
+import SimpleBar = require('simplebar');
+
+// $ExpectType typeof SimpleBar
+SimpleBar;
diff --git a/types/simplebar/tsconfig.json b/types/simplebar/tsconfig.json
index 467b6358e4..9c51115e84 100644
--- a/types/simplebar/tsconfig.json
+++ b/types/simplebar/tsconfig.json
@@ -19,6 +19,7 @@
     },
     "files": [
         "index.d.ts",
-        "simplebar-tests.ts"
+        "simplebar-tests.ts",
+        "test/module-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 3b04deac0953c4b0539bda1abf36a48f160fff4f Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Mon, 26 Feb 2018 09:03:12 -0800
Subject: [PATCH 272/388] Added 'decompress-response'. (#23885)

---
 .../decompress-response-tests.ts              |  6 +++++
 types/decompress-response/index.d.ts          | 11 +++++++++
 types/decompress-response/tsconfig.json       | 23 +++++++++++++++++++
 types/decompress-response/tslint.json         |  1 +
 4 files changed, 41 insertions(+)
 create mode 100644 types/decompress-response/decompress-response-tests.ts
 create mode 100644 types/decompress-response/index.d.ts
 create mode 100644 types/decompress-response/tsconfig.json
 create mode 100644 types/decompress-response/tslint.json

diff --git a/types/decompress-response/decompress-response-tests.ts b/types/decompress-response/decompress-response-tests.ts
new file mode 100644
index 0000000000..f47665cbe0
--- /dev/null
+++ b/types/decompress-response/decompress-response-tests.ts
@@ -0,0 +1,6 @@
+import decompressResponse = require("decompress-response");
+import http = require("http");
+
+http.get("localhost", response => {
+    response = decompressResponse(response);
+});
diff --git a/types/decompress-response/index.d.ts b/types/decompress-response/index.d.ts
new file mode 100644
index 0000000000..8e7ec88646
--- /dev/null
+++ b/types/decompress-response/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for decompress-response 3.3
+// Project: https://github.com/sindresorhus/decompress-response#readme
+// Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import http = require("http");
+
+export = decompress_response;
+declare function decompress_response(response: http.IncomingMessage): http.IncomingMessage;
diff --git a/types/decompress-response/tsconfig.json b/types/decompress-response/tsconfig.json
new file mode 100644
index 0000000000..c7a77a9fd1
--- /dev/null
+++ b/types/decompress-response/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",
+        "decompress-response-tests.ts"
+    ]
+}
diff --git a/types/decompress-response/tslint.json b/types/decompress-response/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/decompress-response/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9750d12776e36ac88e7fd710ccb4a1886069ab7b Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Mon, 26 Feb 2018 09:03:51 -0800
Subject: [PATCH 273/388] Added 'json-parse-better-errors'. (#23884)

---
 types/json-parse-better-errors/index.d.ts     | 18 +++++++++++++++
 .../json-parse-better-errors-tests.ts         | 11 +++++++++
 types/json-parse-better-errors/tsconfig.json  | 23 +++++++++++++++++++
 types/json-parse-better-errors/tslint.json    |  1 +
 4 files changed, 53 insertions(+)
 create mode 100644 types/json-parse-better-errors/index.d.ts
 create mode 100644 types/json-parse-better-errors/json-parse-better-errors-tests.ts
 create mode 100644 types/json-parse-better-errors/tsconfig.json
 create mode 100644 types/json-parse-better-errors/tslint.json

diff --git a/types/json-parse-better-errors/index.d.ts b/types/json-parse-better-errors/index.d.ts
new file mode 100644
index 0000000000..5cf16c38e0
--- /dev/null
+++ b/types/json-parse-better-errors/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for json-parse-better-errors 1.0
+// Project: https://github.com/zkat/json-parse-better-errors#readme
+// Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = json_parse_better_errors;
+
+/**
+ * Converts a JavaScript Object Notation (JSON) string into an object.
+ * @param text A valid JSON string.
+ * @param reviver A function that transforms the results. This function is called for each member of the object.
+ *               If a member contains nested objects, the nested objects are transformed before the parent object is.
+ * @param context The number of characters to display in each direction around the position of an error.
+ */
+declare function json_parse_better_errors(
+    txt: string,
+    reviver?: (key: string, value: any) => any,
+    context?: number): any;
diff --git a/types/json-parse-better-errors/json-parse-better-errors-tests.ts b/types/json-parse-better-errors/json-parse-better-errors-tests.ts
new file mode 100644
index 0000000000..ec77a01fea
--- /dev/null
+++ b/types/json-parse-better-errors/json-parse-better-errors-tests.ts
@@ -0,0 +1,11 @@
+import parseJson = require("json-parse-better-errors");
+
+parseJson(`"hello"`);
+parseJson(`trash`);
+parseJson(`{ "a": {} }`, k => k.toLowerCase(), 20);
+parseJson(`{
+    "compilerOptions": {
+
+    }
+}
+`, undefined, 40);
diff --git a/types/json-parse-better-errors/tsconfig.json b/types/json-parse-better-errors/tsconfig.json
new file mode 100644
index 0000000000..b7dda9071a
--- /dev/null
+++ b/types/json-parse-better-errors/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",
+        "json-parse-better-errors-tests.ts"
+    ]
+}
diff --git a/types/json-parse-better-errors/tslint.json b/types/json-parse-better-errors/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/json-parse-better-errors/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6eaa654fd2abdc1f37fc2078cc574821f7e0513e Mon Sep 17 00:00:00 2001
From: Philippe Leger <Philippe.Leger@tritondigital.com>
Date: Mon, 26 Feb 2018 12:09:24 -0500
Subject: [PATCH 274/388] Add deprecationWarnings in Options interface

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

diff --git a/types/webdriverio/index.d.ts b/types/webdriverio/index.d.ts
index f5dbcf4884..8de0c72308 100644
--- a/types/webdriverio/index.d.ts
+++ b/types/webdriverio/index.d.ts
@@ -4,6 +4,7 @@
 //                 Tim Brust <https://github.com/timbru31>
 //                 Fredrik Smedberg <https://github.com/fsmedberg-tc>
 //                 Tanvir ul Islam <https://github.com/tanvirislam06>
+//                 Phil Leger <https://github.com/phil-lgr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
@@ -397,6 +398,7 @@ declare namespace WebdriverIO {
     interface Options {
         baseUrl?: string;
         bail?: number;
+        deprecationWarnings?: boolean;
         coloredLogs?: boolean;
         capabilities?: DesiredCapabilities[];
         connectionRetryTimeout?: number;
diff --git a/types/webdriverio/webdriverio-tests.ts b/types/webdriverio/webdriverio-tests.ts
index 1765029a32..4a078ef6e9 100644
--- a/types/webdriverio/webdriverio-tests.ts
+++ b/types/webdriverio/webdriverio-tests.ts
@@ -26,7 +26,7 @@ describe.only("my webdriverio tests", () => {
     let client: webdriverio.Client<void>;
 
     before(async () => {
-        client = webdriverio.remote({ desiredCapabilities: { browserName: "phantomjs" } });
+        client = webdriverio.remote({ deprecationWarnings: true, desiredCapabilities: { browserName: "phantomjs" } });
         await client.init();
     });
 

From f77d259e80400e34b600b348a4cc08960c492798 Mon Sep 17 00:00:00 2001
From: sgoll <1277035+sgoll@users.noreply.github.com>
Date: Mon, 26 Feb 2018 18:10:55 +0100
Subject: [PATCH 275/388] [ramda] Add second type argument to eqBy to allow
 different codomain (#23926)

* Add second type argument to eqBy to allow different codomain

* Add test for new type argument

* Resolve unreachable function overload
---
 types/ramda/index.d.ts     | 7 +++----
 types/ramda/ramda-tests.ts | 8 ++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 205df9f569..081a62cbd7 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -576,10 +576,9 @@ declare namespace R {
          * Takes a function and two values in its domain and returns true if the values map to the same value in the
          * codomain; false otherwise.
          */
-        eqBy<T>(fn: (a: T) => T, a: T, b: T): boolean;
-        eqBy<T>(fn: (a: T) => T, a: T): (b: T) => boolean;
-        eqBy<T>(fn: (a: T) => T): (a: T, b: T) => boolean;
-        eqBy<T>(fn: (a: T) => T): (a: T) => (b: T) => boolean;
+        eqBy<T, U = T>(fn: (a: T) => U, a: T, b: T): boolean;
+        eqBy<T, U = T>(fn: (a: T) => U, a: T): (b: T) => boolean;
+        eqBy<T, U = T>(fn: (a: T) => U): CurriedFunction2<T, T, boolean>;
 
         /**
          * Reports whether two functions have the same value for the specified property.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 8aef1c65fc..c32ab72028 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -2136,6 +2136,14 @@ class Rectangle {
     const c: (a: any[]) => any[] = R.symmetricDifferenceWith(eqA)(l1); // => [{a: 1}, {a: 2}, {a: 5}, {a: 6}]
 };
 
+() => {
+    const eqL = R.eqBy<string, number>(s => s.length);
+    const l1 = ['bb', 'ccc', 'dddd'];
+    const l2 = ['aaa', 'bb', 'c'];
+    R.symmetricDifferenceWith(eqL, l1, l2); // => ['dddd', 'c']
+    R.symmetricDifferenceWith(eqL)(l1, l2); // => ['dddd', 'c']
+};
+
 /*****************************************************************
  * String category
  */

From c576e544beac58d911fe017a20bf3f2c794b45aa Mon Sep 17 00:00:00 2001
From: Rodrigo Saboya <saboya@users.noreply.github.com>
Date: Sat, 17 Feb 2018 22:33:46 -0200
Subject: [PATCH 276/388] Updating catbox to hapi 17 bindings.

---
 types/catbox/catbox-tests.ts                  |  24 +-
 types/catbox/index.d.ts                       | 102 +++---
 types/catbox/tsconfig.json                    |   5 -
 types/catbox/v7/catbox-tests.ts               |  27 ++
 types/catbox/v7/index.d.ts                    | 310 ++++++++++++++++++
 types/catbox/v7/tsconfig.json                 |  31 ++
 types/catbox/v7/tslint.json                   |   1 +
 types/h2o2/tsconfig.json                      |   3 +
 types/hapi-auth-basic/tsconfig.json           |   5 -
 types/hapi-auth-jwt2/tsconfig.json            |   3 +
 types/hapi-decorators/tsconfig.json           |   3 +
 types/hapi/index.d.ts                         |   4 +-
 .../test/server/server-cache-provision.ts     |   4 +-
 types/hapi/test/server/server-cache.ts        |   4 +-
 types/hapi/tsconfig.json                      |   5 -
 types/hapi/v16/tsconfig.json                  |   3 +
 types/inert/tsconfig.json                     |   5 -
 types/inert/v4/tsconfig.json                  |   3 +
 types/nes/tsconfig.json                       |   5 -
 types/optics-agent/tsconfig.json              |   5 -
 types/swagger-express-mw/tsconfig.json        |   3 +
 types/swagger-hapi/tsconfig.json              |   3 +
 types/swagger-node-runner/tsconfig.json       |   3 +
 types/swagger-restify-mw/tsconfig.json        |   3 +
 types/swagger-sails-hook/tsconfig.json        |   3 +
 types/vision/tsconfig.json                    |   5 -
 types/vision/v4/tsconfig.json                 |   3 +
 types/yar/tsconfig.json                       |   5 -
 28 files changed, 464 insertions(+), 116 deletions(-)
 create mode 100644 types/catbox/v7/catbox-tests.ts
 create mode 100644 types/catbox/v7/index.d.ts
 create mode 100644 types/catbox/v7/tsconfig.json
 create mode 100644 types/catbox/v7/tslint.json

diff --git a/types/catbox/catbox-tests.ts b/types/catbox/catbox-tests.ts
index 565573adad..25d4826d25 100644
--- a/types/catbox/catbox-tests.ts
+++ b/types/catbox/catbox-tests.ts
@@ -1,26 +1,26 @@
-import Catbox = require("catbox");
+import { CacheItem, Client, Policy, EnginePrototypeOrObject } from "catbox";
 
-const Memory: Catbox.EnginePrototypeOrObject = {
-    start(callback: Catbox.CallBackNoResult) {},
-    stop() {},
-    get() {},
-    set() {},
-    drop() {},
+const Memory: EnginePrototypeOrObject = {
+    async start(): Promise<void> {},
+    stop(): void {},
+    async get(): Promise<null | CacheItem> {},
+    async set(): Promise<void> {},
+    async drop(): Promise<void> {},
     isReady(): boolean { return true; },
     validateSegmentName(segment: string): null { return null; },
 };
 
-const client = new Catbox.Client(Memory, { partition: 'cache' });
+const client = new Client(Memory, { partition: 'cache' });
 
-const cache = new Catbox.Policy({
+const cache = new Policy({
     expiresIn: 5000,
 }, client, 'cache');
 
-cache.set('foo', 'bar', 5000, () => {});
+cache.set('foo', 'bar', 5000).then(() => {});
 
-cache.get('foo', () => {});
+cache.get('foo').then(() => {});
 
-cache.drop('foo', () => {});
+cache.drop('foo').then(() => {});
 
 cache.isReady();
 
diff --git a/types/catbox/index.d.ts b/types/catbox/index.d.ts
index 826f1f7369..6d51e48696 100644
--- a/types/catbox/index.d.ts
+++ b/types/catbox/index.d.ts
@@ -1,14 +1,11 @@
-// Type definitions for catbox 7.1
+// Type definitions for catbox 10.0
 // Project: https://github.com/hapijs/catbox
-// Definitions by: Jason Swearingen <https://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
+// Definitions by: Jason Swearingen <https://github.com/jasonswearingen>
+//                 AJP <https://github.com/AJamesPhillips>
+//                 Rodrigo Saboya <https://github.com/saboya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-import * as Boom from 'boom';
-
-export type CallBackNoResult = (err?: Boom.BoomError) => void;
-export type CallBackWithResult<T> = (err: Boom.BoomError | null | undefined, result: T) => void;
-
 /**
  * Client
  * The Client object provides a low-level cache abstraction. The object is constructed using new Client(engine, options) where:
@@ -23,34 +20,31 @@ export type CallBackWithResult<T> = (err: Boom.BoomError | null | undefined, res
 export class Client implements ClientApi {
     constructor(engine: EnginePrototypeOrObject, options: ClientOptions);
 
-    /** start(callback) - creates a connection to the cache server. Must be called before any other method is available. The callback signature is function(err). */
-    start(callback: CallBackNoResult): void;
+    /** start() - creates a connection to the cache server. Must be called before any other method is available. */
+    start(): Promise<void>;
     /** stop() - terminates the connection to the cache server. */
     stop(): void;
     /**
      * get(key, callback) - retrieve an item from the cache engine if found where:
      *  * key - a cache key object (see [ICacheKey]).
-     *  * callback - a function with the signature function(err, cached). If the item is not found, both err and cached are null. If found, the cached object is returned
      */
-    get(key: CacheKey, callback: CallBackWithResult<null | CachedObject>): CacheItem;
+    get(key: CacheKey): Promise<null | CachedObject>;
     /**
      * set(key, value, ttl, callback) - store an item in the cache for a specified length of time, where:
      *  * key - a cache key object (see [ICacheKey]).
      *  * value - the string or object value to be stored.
      *  * ttl - a time-to-live value in milliseconds after which the item is automatically removed from the cache (or is marked invalid).
-     *  * callback - a function with the signature function(err).
      */
-    set(key: CacheKey, value: CacheItem, ttl: number, callback: CallBackNoResult): void;
+    set(key: CacheKey, value: CacheItem, ttl: number): Promise<void>;
     /**
      * drop(key, callback) - remove an item from cache where:
      *  * key - a cache key object (see [ICacheKey]).
-     *  * callback - a function with the signature function(err).
      */
-    drop(key: CacheKey, callback: CallBackNoResult): void;
+    drop(key: CacheKey): Promise<void>;
     /** isReady() - returns true if cache engine determines itself as ready, false if it is not ready. */
     isReady(): boolean;
     /** validateSegmentName(segment) - returns null if the segment name is valid (see below), otherwise should return an instance of Error with an appropriate message. */
-    validateSegmentName(segment: string): null | Boom.BoomError;
+    validateSegmentName(segment: string): null | Error;
 }
 
 export type EnginePrototypeOrObject = EnginePrototype | ClientApi;
@@ -68,34 +62,31 @@ export interface EnginePrototype {
  * @see {@link https://github.com/hapijs/catbox#api}
  */
 export interface ClientApi {
-    /** start(callback) - creates a connection to the cache server. Must be called before any other method is available. The callback signature is function(err). */
-    start(callback: CallBackNoResult): void;
+    /** start() - creates a connection to the cache server. Must be called before any other method is available. */
+    start(): Promise<void>;
     /** stop() - terminates the connection to the cache server. */
     stop(): void;
     /**
      * get(key, callback) - retrieve an item from the cache engine if found where:
      *  * key - a cache key object (see [ICacheKey]).
-     *  * callback - a function with the signature function(err, cached). If the item is not found, both err and cached are null. If found, the cached object is returned
      */
-    get(key: CacheKey, callback: CallBackWithResult<null | CachedObject>): CacheItem;
+    get(key: CacheKey): Promise<null | CachedObject>;
     /**
-     * set(key, value, ttl, callback) - store an item in the cache for a specified length of time, where:
+     * set(key, value, ttl) - store an item in the cache for a specified length of time, where:
      *  * key - a cache key object (see [ICacheKey]).
      *  * value - the string or object value to be stored.
      *  * ttl - a time-to-live value in milliseconds after which the item is automatically removed from the cache (or is marked invalid).
-     *  * callback - a function with the signature function(err).
      */
-    set(key: CacheKey, value: CacheItem, ttl: number, callback: CallBackNoResult): void;
+    set(key: CacheKey, value: CacheItem, ttl: number): Promise<void>;
     /**
-     * drop(key, callback) - remove an item from cache where:
+     * drop(key) - remove an item from cache where:
      *  * key - a cache key object (see [ICacheKey]).
-     *  * callback - a function with the signature function(err).
      */
-    drop(key: CacheKey, callback: CallBackNoResult): void;
+    drop(key: CacheKey): Promise<void>;
     /** isReady() - returns true if cache engine determines itself as ready, false if it is not ready. */
     isReady(): boolean;
     /** validateSegmentName(segment) - returns null if the segment name is valid (see below), otherwise should return an instance of Error with an appropriate message. */
-    validateSegmentName(segment: string): null | Boom.BoomError;
+    validateSegmentName(segment: string): null | Error;
 }
 
 /**
@@ -135,27 +126,24 @@ export interface ClientOptions {
 export class Policy implements PolicyAPI {
     constructor(options: PolicyOptions, cache: Client, segment: string);
     /**
-     * get(id, callback) - retrieve an item from the cache. If the item is not found and the generateFunc method was provided,
+     * get(id) - retrieve an item from the cache. If the item is not found and the generateFunc method was provided,
      * a new value is generated, stored in the cache, and returned. Multiple concurrent requests are queued and processed once. The method arguments are:
      *  * id - the unique item identifier (within the policy segment). Can be a string or an object with the required 'id' key.
-     *  * callback - the return function.
      */
-    get(id: string | {id: string}, callback: PolicyGetCallback): CacheItem;
+    get(id: string | { id: string }): Promise<PolicyGetPromiseResult | null>;
     /**
-     * set(id, value, ttl, callback) - store an item in the cache where:
+     * set(id, value, ttl) - store an item in the cache where:
      *  * id - the unique item identifier (within the policy segment).
      *  * value - the string or object value to be stored.
      *  * ttl - a time-to-live override value in milliseconds after which the item is automatically removed from the cache (or is marked invalid).
      *    This should be set to 0 in order to use the caching rules configured when creating the Policy object.
-     *  * callback - a function with the signature function(err).
      */
-    set(id: string | {id: string}, value: CacheItem, ttl: number | null, callback: CallBackNoResult): void;
+    set(id: string | { id: string }, value: CacheItem, ttl: number | null): Promise<void>;
     /**
-     * drop(id, callback) - remove the item from cache where:
+     * drop(id) - remove the item from cache where:
      *  * id - the unique item identifier (within the policy segment).
-     *  * callback - a function with the signature function(err).
      */
-    drop(id: string | {id: string}, callback: CallBackNoResult): void;
+    drop(id: string | { id: string }): Promise<void>;
     /** ttl(created) - given a created timestamp in milliseconds, returns the time-to-live left based on the configured rules. */
     ttl(created: number): number;
     /** rules(options) - changes the policy rules after construction (note that items already stored will not be affected) */
@@ -173,27 +161,24 @@ export class Policy implements PolicyAPI {
  */
 export interface PolicyAPI {
     /**
-     * get(id, callback) - retrieve an item from the cache. If the item is not found and the generateFunc method was provided,
+     * get(id) - retrieve an item from the cache. If the item is not found and the generateFunc method was provided,
      * a new value is generated, stored in the cache, and returned. Multiple concurrent requests are queued and processed once. The method arguments are:
      *  * id - the unique item identifier (within the policy segment). Can be a string or an object with the required 'id' key.
-     *  * callback - the return function.
      */
-    get(id: string | {id: string}, callback: PolicyGetCallback): CacheItem;
+    get(id: string | { id: string }): Promise<PolicyGetPromiseResult | null>;
     /**
-     * set(id, value, ttl, callback) - store an item in the cache where:
+     * set(id, value, ttl) - store an item in the cache where:
      *  * id - the unique item identifier (within the policy segment).
      *  * value - the string or object value to be stored.
      *  * ttl - a time-to-live override value in milliseconds after which the item is automatically removed from the cache (or is marked invalid).
      *    This should be set to 0 in order to use the caching rules configured when creating the Policy object.
-     *  * callback - a function with the signature function(err).
      */
-    set(id: string | {id: string}, value: CacheItem, ttl: number | null, callback: CallBackNoResult): void;
+    set(id: string | { id: string }, value: CacheItem, ttl: number | null): Promise<void>;
     /**
-     * drop(id, callback) - remove the item from cache where:
+     * drop(id) - remove the item from cache where:
      *  * id - the unique item identifier (within the policy segment).
-     *  * callback - a function with the signature function(err).
      */
-    drop(id: string | {id: string}, callback: CallBackNoResult): void;
+    drop(id: string | { id: string }): Promise<void>;
     /** ttl(created) - given a created timestamp in milliseconds, returns the time-to-live left based on the configured rules. */
     ttl(created: number): number;
     /** rules(options) - changes the policy rules after construction (note that items already stored will not be affected) */
@@ -204,16 +189,13 @@ export interface PolicyAPI {
     stats(): CacheStatisticsObject;
 }
 
-/**
- * The return function. The function signature is function(err, value, cached, report) where:
- * @param err - any errors encountered.
- * @param value - the fetched or generated value.
- * @param cached - null if a valid item was not found in the cache, or IPolicyGetCallbackCachedOptions
- * @param report - an object with logging information about the generation operation
- */
-export type PolicyGetCallback = (err: null | Boom.BoomError, value: CacheItem, cached: PolicyGetCallbackCachedOptions, report: PolicyGetCallbackReportLog) => void;
+export interface PolicyGetPromiseResult {
+    value: CacheItem;
+    cached: PolicyGetCachedOptions;
+    report: PolicyGetReportLog;
+}
 
-export interface PolicyGetCallbackCachedOptions {
+export interface PolicyGetCachedOptions {
     /** item - the cached value. */
     item: CacheItem;
     /** stored - the timestamp when the item was stored in the cache. */
@@ -262,10 +244,14 @@ export interface PolicyOptions {
     pendingGenerateTimeout?: number;
 }
 
+export interface GenerateFuncFlags {
+    ttl: number;
+}
+
 /**
  * generateFunc
  * Is used in PolicyOptions
- * A function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next)
+ * A function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id)
  * @param id - the id string or object provided to the get() method.
  * @param next - the method called when the new item is returned with the signature function(err, value, ttl) where:
  *      * err - an error condition.
@@ -273,12 +259,12 @@ export interface PolicyOptions {
  *      * ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
  * @see {@link https://github.com/hapijs/catbox#policy}
  */
-export type GenerateFunc = (id: string, next: ((err: null | Boom.BoomError, value: CacheItem, ttl?: number) => void)) => void;
+export type GenerateFunc = (id: string, flags: GenerateFuncFlags) => Promise<CacheItem>;
 
 /**
  * An object with logging information about the generation operation containing the following keys (as relevant):
  */
-export interface PolicyGetCallbackReportLog {
+export interface PolicyGetReportLog {
     /** msec - the cache lookup time in milliseconds. */
     msec: number;
     /** stored - the timestamp when the item was stored in the cache. */
@@ -288,7 +274,7 @@ export interface PolicyGetCallbackReportLog {
     /** ttl - the cache ttl value for the record. */
     ttl: number;
     /** error - lookup error. */
-    error?: Boom.BoomError;
+    error?: Error;
 }
 
 /**
diff --git a/types/catbox/tsconfig.json b/types/catbox/tsconfig.json
index 24e8f7f34e..feb19f81dc 100644
--- a/types/catbox/tsconfig.json
+++ b/types/catbox/tsconfig.json
@@ -13,11 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "boom": [
-                "boom/v4"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/catbox/v7/catbox-tests.ts b/types/catbox/v7/catbox-tests.ts
new file mode 100644
index 0000000000..565573adad
--- /dev/null
+++ b/types/catbox/v7/catbox-tests.ts
@@ -0,0 +1,27 @@
+import Catbox = require("catbox");
+
+const Memory: Catbox.EnginePrototypeOrObject = {
+    start(callback: Catbox.CallBackNoResult) {},
+    stop() {},
+    get() {},
+    set() {},
+    drop() {},
+    isReady(): boolean { return true; },
+    validateSegmentName(segment: string): null { return null; },
+};
+
+const client = new Catbox.Client(Memory, { partition: 'cache' });
+
+const cache = new Catbox.Policy({
+    expiresIn: 5000,
+}, client, 'cache');
+
+cache.set('foo', 'bar', 5000, () => {});
+
+cache.get('foo', () => {});
+
+cache.drop('foo', () => {});
+
+cache.isReady();
+
+cache.stats();
diff --git a/types/catbox/v7/index.d.ts b/types/catbox/v7/index.d.ts
new file mode 100644
index 0000000000..826f1f7369
--- /dev/null
+++ b/types/catbox/v7/index.d.ts
@@ -0,0 +1,310 @@
+// Type definitions for catbox 7.1
+// Project: https://github.com/hapijs/catbox
+// Definitions by: Jason Swearingen <https://github.com/jasonswearingen>, AJP <https://github.com/AJamesPhillips>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import * as Boom from 'boom';
+
+export type CallBackNoResult = (err?: Boom.BoomError) => void;
+export type CallBackWithResult<T> = (err: Boom.BoomError | null | undefined, result: T) => void;
+
+/**
+ * Client
+ * The Client object provides a low-level cache abstraction. The object is constructed using new Client(engine, options) where:
+ * engine - is an object or a prototype function implementing the cache strategy:
+ *  * function - a prototype function with the signature function(options). catbox will call new func(options).
+ *  * object - a pre instantiated client implementation object. Does not support passing options.
+ * options - the strategy configuration object. Each strategy defines its own configuration options with the following common options:
+ *  * partition - the partition name used to isolate the cached results across multiple clients. The partition name is used as the MongoDB database name,
+ *    the Riak bucket, or as a key prefix in Redis and Memcached. To share the cache across multiple clients, use the same partition name.
+ * @see {@link https://github.com/hapijs/catbox#client}
+ */
+export class Client implements ClientApi {
+    constructor(engine: EnginePrototypeOrObject, options: ClientOptions);
+
+    /** start(callback) - creates a connection to the cache server. Must be called before any other method is available. The callback signature is function(err). */
+    start(callback: CallBackNoResult): void;
+    /** stop() - terminates the connection to the cache server. */
+    stop(): void;
+    /**
+     * get(key, callback) - retrieve an item from the cache engine if found where:
+     *  * key - a cache key object (see [ICacheKey]).
+     *  * callback - a function with the signature function(err, cached). If the item is not found, both err and cached are null. If found, the cached object is returned
+     */
+    get(key: CacheKey, callback: CallBackWithResult<null | CachedObject>): CacheItem;
+    /**
+     * set(key, value, ttl, callback) - store an item in the cache for a specified length of time, where:
+     *  * key - a cache key object (see [ICacheKey]).
+     *  * value - the string or object value to be stored.
+     *  * ttl - a time-to-live value in milliseconds after which the item is automatically removed from the cache (or is marked invalid).
+     *  * callback - a function with the signature function(err).
+     */
+    set(key: CacheKey, value: CacheItem, ttl: number, callback: CallBackNoResult): void;
+    /**
+     * drop(key, callback) - remove an item from cache where:
+     *  * key - a cache key object (see [ICacheKey]).
+     *  * callback - a function with the signature function(err).
+     */
+    drop(key: CacheKey, callback: CallBackNoResult): void;
+    /** isReady() - returns true if cache engine determines itself as ready, false if it is not ready. */
+    isReady(): boolean;
+    /** validateSegmentName(segment) - returns null if the segment name is valid (see below), otherwise should return an instance of Error with an appropriate message. */
+    validateSegmentName(segment: string): null | Boom.BoomError;
+}
+
+export type EnginePrototypeOrObject = EnginePrototype | ClientApi;
+
+/**
+ * A prototype CatBox engine function
+ */
+export interface EnginePrototype {
+    new(settings: ClientOptions): ClientApi;
+}
+
+/**
+ * Client API
+ * The Client object provides the following methods:
+ * @see {@link https://github.com/hapijs/catbox#api}
+ */
+export interface ClientApi {
+    /** start(callback) - creates a connection to the cache server. Must be called before any other method is available. The callback signature is function(err). */
+    start(callback: CallBackNoResult): void;
+    /** stop() - terminates the connection to the cache server. */
+    stop(): void;
+    /**
+     * get(key, callback) - retrieve an item from the cache engine if found where:
+     *  * key - a cache key object (see [ICacheKey]).
+     *  * callback - a function with the signature function(err, cached). If the item is not found, both err and cached are null. If found, the cached object is returned
+     */
+    get(key: CacheKey, callback: CallBackWithResult<null | CachedObject>): CacheItem;
+    /**
+     * set(key, value, ttl, callback) - store an item in the cache for a specified length of time, where:
+     *  * key - a cache key object (see [ICacheKey]).
+     *  * value - the string or object value to be stored.
+     *  * ttl - a time-to-live value in milliseconds after which the item is automatically removed from the cache (or is marked invalid).
+     *  * callback - a function with the signature function(err).
+     */
+    set(key: CacheKey, value: CacheItem, ttl: number, callback: CallBackNoResult): void;
+    /**
+     * drop(key, callback) - remove an item from cache where:
+     *  * key - a cache key object (see [ICacheKey]).
+     *  * callback - a function with the signature function(err).
+     */
+    drop(key: CacheKey, callback: CallBackNoResult): void;
+    /** isReady() - returns true if cache engine determines itself as ready, false if it is not ready. */
+    isReady(): boolean;
+    /** validateSegmentName(segment) - returns null if the segment name is valid (see below), otherwise should return an instance of Error with an appropriate message. */
+    validateSegmentName(segment: string): null | Boom.BoomError;
+}
+
+/**
+ * Any method with a key argument takes an object with the following required properties:
+ */
+export interface CacheKey {
+    /** segment - a caching segment name string. Enables using a single cache server for storing different sets of items with overlapping ids. */
+    segment: string;
+    /** id - a unique item identifier string (per segment). Can be an empty string. */
+    id: string;
+}
+
+/** Cached object contains the following: */
+export interface CachedObject {
+    /** item - the value stored in the cache using set(). */
+    item: any;
+    /** stored - the timestamp when the item was stored in the cache (in milliseconds). */
+    stored: number;
+    /** ttl - the remaining time-to-live (not the original value used when storing the object). */
+    ttl: number;
+}
+
+export type CacheItem = any;
+
+export interface ClientOptions {
+    partition: string;
+}
+
+/**
+ * The Policy object provides a convenient cache interface by setting a global policy which is automatically applied to every storage action.
+ * The object is constructed using new Policy(options, [cache, segment]) where:
+ *  * options - an object with the IPolicyOptions structure
+ *  * cache - a Client instance (which has already been started).
+ *  * segment - required when cache is provided. The segment name used to isolate cached items within the cache partition.
+ * @see {@link https://github.com/hapijs/catbox#policy}
+ */
+export class Policy implements PolicyAPI {
+    constructor(options: PolicyOptions, cache: Client, segment: string);
+    /**
+     * get(id, callback) - retrieve an item from the cache. If the item is not found and the generateFunc method was provided,
+     * a new value is generated, stored in the cache, and returned. Multiple concurrent requests are queued and processed once. The method arguments are:
+     *  * id - the unique item identifier (within the policy segment). Can be a string or an object with the required 'id' key.
+     *  * callback - the return function.
+     */
+    get(id: string | {id: string}, callback: PolicyGetCallback): CacheItem;
+    /**
+     * set(id, value, ttl, callback) - store an item in the cache where:
+     *  * id - the unique item identifier (within the policy segment).
+     *  * value - the string or object value to be stored.
+     *  * ttl - a time-to-live override value in milliseconds after which the item is automatically removed from the cache (or is marked invalid).
+     *    This should be set to 0 in order to use the caching rules configured when creating the Policy object.
+     *  * callback - a function with the signature function(err).
+     */
+    set(id: string | {id: string}, value: CacheItem, ttl: number | null, callback: CallBackNoResult): void;
+    /**
+     * drop(id, callback) - remove the item from cache where:
+     *  * id - the unique item identifier (within the policy segment).
+     *  * callback - a function with the signature function(err).
+     */
+    drop(id: string | {id: string}, callback: CallBackNoResult): void;
+    /** ttl(created) - given a created timestamp in milliseconds, returns the time-to-live left based on the configured rules. */
+    ttl(created: number): number;
+    /** rules(options) - changes the policy rules after construction (note that items already stored will not be affected) */
+    rules(options: PolicyOptions): void;
+    /** isReady() - returns true if cache engine determines itself as ready, false if it is not ready or if there is no cache engine set. */
+    isReady(): boolean;
+    /** stats - an object with cache statistics */
+    stats(): CacheStatisticsObject;
+}
+
+/**
+ * Policy API
+ * The Policy object provides the following methods:
+ * @see {@link https://github.com/hapijs/catbox#api-1}
+ */
+export interface PolicyAPI {
+    /**
+     * get(id, callback) - retrieve an item from the cache. If the item is not found and the generateFunc method was provided,
+     * a new value is generated, stored in the cache, and returned. Multiple concurrent requests are queued and processed once. The method arguments are:
+     *  * id - the unique item identifier (within the policy segment). Can be a string or an object with the required 'id' key.
+     *  * callback - the return function.
+     */
+    get(id: string | {id: string}, callback: PolicyGetCallback): CacheItem;
+    /**
+     * set(id, value, ttl, callback) - store an item in the cache where:
+     *  * id - the unique item identifier (within the policy segment).
+     *  * value - the string or object value to be stored.
+     *  * ttl - a time-to-live override value in milliseconds after which the item is automatically removed from the cache (or is marked invalid).
+     *    This should be set to 0 in order to use the caching rules configured when creating the Policy object.
+     *  * callback - a function with the signature function(err).
+     */
+    set(id: string | {id: string}, value: CacheItem, ttl: number | null, callback: CallBackNoResult): void;
+    /**
+     * drop(id, callback) - remove the item from cache where:
+     *  * id - the unique item identifier (within the policy segment).
+     *  * callback - a function with the signature function(err).
+     */
+    drop(id: string | {id: string}, callback: CallBackNoResult): void;
+    /** ttl(created) - given a created timestamp in milliseconds, returns the time-to-live left based on the configured rules. */
+    ttl(created: number): number;
+    /** rules(options) - changes the policy rules after construction (note that items already stored will not be affected) */
+    rules(options: PolicyOptions): void;
+    /** isReady() - returns true if cache engine determines itself as ready, false if it is not ready or if there is no cache engine set. */
+    isReady(): boolean;
+    /** stats - an object with cache statistics */
+    stats(): CacheStatisticsObject;
+}
+
+/**
+ * The return function. The function signature is function(err, value, cached, report) where:
+ * @param err - any errors encountered.
+ * @param value - the fetched or generated value.
+ * @param cached - null if a valid item was not found in the cache, or IPolicyGetCallbackCachedOptions
+ * @param report - an object with logging information about the generation operation
+ */
+export type PolicyGetCallback = (err: null | Boom.BoomError, value: CacheItem, cached: PolicyGetCallbackCachedOptions, report: PolicyGetCallbackReportLog) => void;
+
+export interface PolicyGetCallbackCachedOptions {
+    /** item - the cached value. */
+    item: CacheItem;
+    /** stored - the timestamp when the item was stored in the cache. */
+    stored: number;
+    /** ttl - the cache ttl value for the record. */
+    ttl: number;
+    /** isStale - true if the item is stale. */
+    isStale: boolean;
+}
+
+/**
+ * @see {@link https://github.com/hapijs/catbox#policy}
+ */
+export interface PolicyOptions {
+    /** expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt. */
+    expiresIn?: number;
+    /** expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire. Uses local time. Cannot be used together with expiresIn. */
+    expiresAt?: string;
+    /** generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: */
+    generateFunc?: GenerateFunc;
+    /**
+     * staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided.
+     * Must be less than expiresIn. Alternatively function that returns staleIn value in milliseconds. The function signature is function(stored, ttl) where:
+     *  * stored - the timestamp when the item was stored in the cache (in milliseconds).
+     *  * ttl - the remaining time-to-live (not the original value used when storing the object).
+     */
+    staleIn?: number | ((stored: number, ttl: number) => number);
+    /** staleTimeout - number of milliseconds to wait before returning a stale value while generateFunc is generating a fresh value. */
+    staleTimeout?: number;
+    /**
+     * generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value.
+     * When the value is eventually returned, it is stored in the cache for future requests. Required if generateFunc is present.
+     * Set to false to disable timeouts which may cause all get() requests to get stuck forever.
+     */
+    generateTimeout?: number | false;
+    /** dropOnError - if true, an error or timeout in the generateFunc causes the stale value to be evicted from the cache. Defaults to true. */
+    dropOnError?: boolean;
+    /** generateOnReadError - if false, an upstream cache read error will stop the get() method from calling the generate function and will instead pass back the cache error. Defaults to true. */
+    generateOnReadError?: boolean;
+    /** generateIgnoreWriteError - if false, an upstream cache write error will be passed back with the generated value when calling the get() method. Defaults to true. */
+    generateIgnoreWriteError?: boolean;
+    /**
+     * pendingGenerateTimeout - number of milliseconds while generateFunc call is in progress for a given id, before a subsequent generateFunc call is allowed.
+     * Defaults to 0, no blocking of concurrent generateFunc calls beyond staleTimeout.
+     */
+    pendingGenerateTimeout?: number;
+}
+
+/**
+ * generateFunc
+ * Is used in PolicyOptions
+ * A function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next)
+ * @param id - the id string or object provided to the get() method.
+ * @param next - the method called when the new item is returned with the signature function(err, value, ttl) where:
+ *      * err - an error condition.
+ *      * value - the new value generated.
+ *      * ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
+ * @see {@link https://github.com/hapijs/catbox#policy}
+ */
+export type GenerateFunc = (id: string, next: ((err: null | Boom.BoomError, value: CacheItem, ttl?: number) => void)) => void;
+
+/**
+ * An object with logging information about the generation operation containing the following keys (as relevant):
+ */
+export interface PolicyGetCallbackReportLog {
+    /** msec - the cache lookup time in milliseconds. */
+    msec: number;
+    /** stored - the timestamp when the item was stored in the cache. */
+    stored: number;
+    /** isStale - true if the item is stale. */
+    isStale: boolean;
+    /** ttl - the cache ttl value for the record. */
+    ttl: number;
+    /** error - lookup error. */
+    error?: Boom.BoomError;
+}
+
+/**
+ * an object with cache statistics where:
+ */
+export interface CacheStatisticsObject {
+    /** sets - number of cache writes. */
+    sets: number;
+    /** gets - number of cache get() requests. */
+    gets: number;
+    /** hits - number of cache get() requests in which the requested id was found in the cache (can be stale). */
+    hits: number;
+    /** stales - number of cache reads with stale requests (only counts the first request in a queued get() operation). */
+    stales: number;
+    /** generates - number of calls to the generate function. */
+    generates: number;
+    /** errors - cache operations errors. TODO check this */
+    errors: number;
+}
diff --git a/types/catbox/v7/tsconfig.json b/types/catbox/v7/tsconfig.json
new file mode 100644
index 0000000000..48b4d9f014
--- /dev/null
+++ b/types/catbox/v7/tsconfig.json
@@ -0,0 +1,31 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "boom": [
+                "boom/v4"
+            ],
+            "catbox": [
+                "catbox/v7"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "catbox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/catbox/v7/tslint.json b/types/catbox/v7/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/catbox/v7/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/h2o2/tsconfig.json b/types/h2o2/tsconfig.json
index eb41a55289..767fa4e7b7 100644
--- a/types/h2o2/tsconfig.json
+++ b/types/h2o2/tsconfig.json
@@ -17,6 +17,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/hapi-auth-basic/tsconfig.json b/types/hapi-auth-basic/tsconfig.json
index 191d992f70..80aa0fbace 100644
--- a/types/hapi-auth-basic/tsconfig.json
+++ b/types/hapi-auth-basic/tsconfig.json
@@ -13,11 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "boom": [
-                "boom/v4"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/hapi-auth-jwt2/tsconfig.json b/types/hapi-auth-jwt2/tsconfig.json
index ada8a3f94d..19a6e785ac 100644
--- a/types/hapi-auth-jwt2/tsconfig.json
+++ b/types/hapi-auth-jwt2/tsconfig.json
@@ -17,6 +17,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/hapi-decorators/tsconfig.json b/types/hapi-decorators/tsconfig.json
index a018c33c53..6434d0422e 100644
--- a/types/hapi-decorators/tsconfig.json
+++ b/types/hapi-decorators/tsconfig.json
@@ -19,6 +19,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index f65cee14d4..01586dd3bf 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -453,7 +453,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.BoomError | null;
+    response: ResponseObject | Boom.Boom | null;
 
     /**
      * Same as pre but represented as the response object created by the pre method.
@@ -3847,7 +3847,7 @@ export namespace Lifecycle {
     type ReturnValueTypes =
         (null | string | number | boolean) |
         (Buffer) |
-        (Error | Boom.BoomError) |
+        (Error | Boom.Boom) |
         (stream.Stream) |
         (object | object[]) |
         symbol |
diff --git a/types/hapi/test/server/server-cache-provision.ts b/types/hapi/test/server/server-cache-provision.ts
index f30ce65cd6..1e120348b2 100644
--- a/types/hapi/test/server/server-cache-provision.ts
+++ b/types/hapi/test/server/server-cache-provision.ts
@@ -9,8 +9,8 @@ server.initialize();
 server.cache.provision({engine: require('catbox-memory'), name: 'countries' });
 
 const cache: catbox.Policy = server.cache({segment: 'countries', cache: 'countries', expiresIn: 60 * 60 * 1000 });
-cache.set('norway', 'oslo', 10 * 1000, () => {});
-const value = cache.get('norway', () => {});
+cache.set('norway', 'oslo', 10 * 1000).then(() => {});
+const value = cache.get('norway').then(() => {});
 
 server.start();
 
diff --git a/types/hapi/test/server/server-cache.ts b/types/hapi/test/server/server-cache.ts
index 64f8c85e80..6aa612f3f1 100644
--- a/types/hapi/test/server/server-cache.ts
+++ b/types/hapi/test/server/server-cache.ts
@@ -11,9 +11,9 @@ const catboxOptions: ServerOptionsCache = {
     expiresIn: 60 * 60 * 1000
 };
 const cache: catbox.Policy = server.cache(catboxOptions);
-cache.set('norway', 'oslo', 10 * 1000, () => {});
+cache.set('norway', 'oslo', 10 * 1000).then(() => {});
 
-const value = cache.get('norway', () => {});
+const value = cache.get('norway').then(() => {});
 console.log("Value: " + value);
 
 server.start();
diff --git a/types/hapi/tsconfig.json b/types/hapi/tsconfig.json
index f8db3fc828..c93f0dfc7f 100644
--- a/types/hapi/tsconfig.json
+++ b/types/hapi/tsconfig.json
@@ -13,11 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "boom": [
-                "boom/v4"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/hapi/v16/tsconfig.json b/types/hapi/v16/tsconfig.json
index 517d678910..23087e8eff 100644
--- a/types/hapi/v16/tsconfig.json
+++ b/types/hapi/v16/tsconfig.json
@@ -17,6 +17,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/inert/tsconfig.json b/types/inert/tsconfig.json
index 238aa1a3eb..866d1c4884 100644
--- a/types/inert/tsconfig.json
+++ b/types/inert/tsconfig.json
@@ -13,11 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "boom": [
-                "boom/v4"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/inert/v4/tsconfig.json b/types/inert/v4/tsconfig.json
index fd468493b4..f742ec35d5 100644
--- a/types/inert/v4/tsconfig.json
+++ b/types/inert/v4/tsconfig.json
@@ -17,6 +17,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/nes/tsconfig.json b/types/nes/tsconfig.json
index 05fc49c647..18fc2712d8 100644
--- a/types/nes/tsconfig.json
+++ b/types/nes/tsconfig.json
@@ -13,11 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "boom": [
-                "boom/v4"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/optics-agent/tsconfig.json b/types/optics-agent/tsconfig.json
index 010406be2f..046bfaad81 100644
--- a/types/optics-agent/tsconfig.json
+++ b/types/optics-agent/tsconfig.json
@@ -13,11 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "boom": [
-                "boom/v4"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/swagger-express-mw/tsconfig.json b/types/swagger-express-mw/tsconfig.json
index c1db9f10a4..de623e0eca 100644
--- a/types/swagger-express-mw/tsconfig.json
+++ b/types/swagger-express-mw/tsconfig.json
@@ -17,6 +17,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/swagger-hapi/tsconfig.json b/types/swagger-hapi/tsconfig.json
index df8e735e23..0b6f0cf5ed 100644
--- a/types/swagger-hapi/tsconfig.json
+++ b/types/swagger-hapi/tsconfig.json
@@ -17,6 +17,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/swagger-node-runner/tsconfig.json b/types/swagger-node-runner/tsconfig.json
index d8bb8c8f52..43f153e823 100644
--- a/types/swagger-node-runner/tsconfig.json
+++ b/types/swagger-node-runner/tsconfig.json
@@ -17,6 +17,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/swagger-restify-mw/tsconfig.json b/types/swagger-restify-mw/tsconfig.json
index ec732988fc..89ba456bbf 100644
--- a/types/swagger-restify-mw/tsconfig.json
+++ b/types/swagger-restify-mw/tsconfig.json
@@ -17,6 +17,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/swagger-sails-hook/tsconfig.json b/types/swagger-sails-hook/tsconfig.json
index 98768dd651..0fd1188f61 100644
--- a/types/swagger-sails-hook/tsconfig.json
+++ b/types/swagger-sails-hook/tsconfig.json
@@ -17,6 +17,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/vision/tsconfig.json b/types/vision/tsconfig.json
index 8f34e356c5..3c6377bfea 100644
--- a/types/vision/tsconfig.json
+++ b/types/vision/tsconfig.json
@@ -13,11 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-             "boom": [
-                "boom/v4"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/vision/v4/tsconfig.json b/types/vision/v4/tsconfig.json
index 2ab1f666a0..832edc4057 100644
--- a/types/vision/v4/tsconfig.json
+++ b/types/vision/v4/tsconfig.json
@@ -17,6 +17,9 @@
             "boom": [
                 "boom/v4"
             ],
+            "catbox": [
+                "catbox/v7"
+            ],
             "hapi": [
                 "hapi/v16"
             ],
diff --git a/types/yar/tsconfig.json b/types/yar/tsconfig.json
index 3843d1296e..c2723ded55 100644
--- a/types/yar/tsconfig.json
+++ b/types/yar/tsconfig.json
@@ -13,11 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "boom": [
-                "boom/v4"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },

From 23798c59adf80973f97f7406bb56dcf98c9a8255 Mon Sep 17 00:00:00 2001
From: Tom Wanzek <tomwanzek@gmail.com>
Date: Mon, 26 Feb 2018 13:30:06 -0500
Subject: [PATCH 277/388] refactor(d3-collection): refine and reduce technical
 debt (mulligan) (#23724)

* chore(d3-collection): validate for strictNullChecks

* feat(d3-collection) minimum TS 2.3 for object type

BREAKING CHANGE:

Impose minimum of TypeScript 2.3 to be able to use `object` type
and generic defaults. (Possibly also use `keyof`).
Replace `any` with `object` where it is too wide.
Add `ArrayLike` to some signatures.
Update tests.

* feat(d3-collection) use generic defaults

Use generic defaults and remove some outdated comments.

* doc(d3-collection): complete JSDoc comments

Completes JSDoc comments.
Removes a superfluous signature for `keys`.
---
 types/d3-collection/d3-collection-tests.ts |  21 +-
 types/d3-collection/index.d.ts             | 442 +++++++++++++++++++--
 types/d3-collection/tsconfig.json          |   4 +-
 3 files changed, 418 insertions(+), 49 deletions(-)

diff --git a/types/d3-collection/d3-collection-tests.ts b/types/d3-collection/d3-collection-tests.ts
index 91a72479db..b2e6c2f68b 100644
--- a/types/d3-collection/d3-collection-tests.ts
+++ b/types/d3-collection/d3-collection-tests.ts
@@ -38,6 +38,7 @@ let booleanFlag: boolean;
 // test keys(...) signatures ------------------------------------------------------
 
 stringArray = d3Collection.keys(keyValueObj);
+stringArray = d3Collection.keys([0, 1, 2]);
 
 stringArray = d3Collection.keys(document); // purely for the fun of it
 
@@ -48,17 +49,21 @@ anyArray = d3Collection.values(keyValueObj);
 
 stringArray = d3Collection.values(keyValueObj2);
 stringArray = d3Collection.values<string>(keyValueObj2);
+// stringArray = d3Collection.values<string>(keyValueObj); // test fails, as values in keyValueObj do not meet generic constraint
+stringArray = d3Collection.values(['1', '2']);
 
 anyArray = d3Collection.values(document); // purely for the fun of it
 
 // test entries(...) signatures ------------------------------------------------------
 
 anyKVArray = d3Collection.entries(keyValueObj);
-// stringKVArray = d3Collection.entres(keyValueObj); // test fails, as values in keyValueObj are not all strings
+// stringKVArray = d3Collection.entries(keyValueObj); // test fails, as values in keyValueObj are not all strings
 
 stringKVArray = d3Collection.entries(keyValueObj2);
 stringKVArray = d3Collection.entries<string>(keyValueObj2);
+// stringKVArray = d3Collection.entries<string>(keyValueObj); // test fails, as values in keyValueObj do not meet generic constraint
 
+stringKVArray = d3Collection.entries(['1', '2']);
 anyKVArray = d3Collection.entries(document); // purely for the fun of it
 
 // ---------------------------------------------------------------------
@@ -70,13 +75,15 @@ interface TestObject {
     val: number;
 }
 
-let testObject: TestObject;
+let testObjectMaybe: TestObject | undefined;
 let testObjArray: TestObject[];
 let testObjKVArray: Array<{ key: string, value: TestObject }>;
 
 // Create Map ========================================================
 
 let basicMap: d3Collection.Map<string>;
+let anyMap: d3Collection.Map<any>;
+anyMap = d3Collection.map(); // empty map
 basicMap = d3Collection.map<string>(); // empty map
 
 // from array with accessor without accessor
@@ -107,7 +114,7 @@ booleanFlag = basicMap.has('foo');
 
 // get(...) ------------------------------------------------------------
 
-testObject = testObjMap.get('foo');
+testObjectMaybe = testObjMap.get('foo');
 
 // set(...) ------------------------------------------------------------
 
@@ -304,11 +311,11 @@ let testL1NestedMapRollup: TestL1NestedMapRollup;
 
 testL2NestedMap = nestL2.map(raw);
 
-num = testL2NestedMap.get('1931').get('Manchuria')[0].yield; // access chain to leaf property
+num = testL2NestedMap.get('1931')!.get('Manchuria')![0].yield; // use existence assertion with care for access chain to leaf property
 
 testL1NestedMapRollup = nestL1Rollup.map(raw);
 
-num = testL1NestedMapRollup.get('1931'); // get rollup value
+num = testL1NestedMapRollup.get('1931')!; // get rollup value (use existence assertion with care)
 
 // object(...) --------------------------------------------------------
 
@@ -345,7 +352,7 @@ type TestL2NestedArray = Array<{
 
 type TestL1NestedArrayRollup = Array<{
     key: string;
-    value: number;
+    value?: number; // conservatively allow for value to be undefined
 }>;
 
 let testL2NestedArray: TestL2NestedArray;
@@ -357,4 +364,4 @@ num = testL2NestedArray[0].values[0].values[0].yield; // access chain to leaf pr
 
 testL1NestedArrayRollup = nestL1Rollup.entries(raw);
 
-num = testL1NestedArrayRollup[0].value; // get rollup value
+num = testL1NestedArrayRollup[0].value!; // get rollup value use existence assertion with care
diff --git a/types/d3-collection/index.d.ts b/types/d3-collection/index.d.ts
index e389862394..5e7973e03b 100644
--- a/types/d3-collection/index.d.ts
+++ b/types/d3-collection/index.d.ts
@@ -2,8 +2,9 @@
 // Project: https://github.com/d3/d3-collection/
 // Definitions by: 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.0.1
+// Last module patch version validated against: 1.0.4
 
 /**
  * Reference type things that can be coerced to string implicitely
@@ -16,106 +17,467 @@ export interface Stringifiable {
 // Objects
 // ---------------------------------------------------------------------
 
-export function keys(object: { [key: string]: any }): string[];
-// TODO: When upgrading definitions to use TS 2.2+, use "object" data type in next line
-export function keys(object: any): string[];
+/**
+ * Returns an array containing the property names of the specified object (an associative array).
+ * The order of the returned array is undefined.
+ *
+ * @param obj An object.
+ */
+export function keys(obj: object): string[];
 
-export function values<T>(object: { [key: string]: T }): T[];
-// TODO: When upgrading definitions to use TS 2.2+, use "object" data type in next line
-export function values(object: any): any[];
+/**
+ * Returns an array containing the property values of the specified object (an associative array).
+ * The order of the returned array is undefined.
+ *
+ * The generic refers to the data type of the values.
+ *
+ * @param obj An object.
+ */
+export function values<T>(obj: { [key: string]: T } | ArrayLike<T>): T[];
+/**
+ * Returns an array containing the property values of the specified object (an associative array).
+ * The order of the returned array is undefined.
+ *
+ * @param obj An object.
+ */
+export function values(obj: object): any[];
 
-export function entries<T>(object: { [key: string]: T }): Array<{ key: string, value: T }>;
-// TODO: When upgrading definitions to use TS 2.2+, use "object" data type in next line
-export function entries(object: any): Array<{ key: string, value: any }>;
+/**
+ * Returns an array containing the property keys and values of the specified object (an associative array).
+ * Each entry is an object with a key and value attribute.The order of the returned array is undefined.
+ *
+ * The generic refers to the data type of the values.
+ *
+ * @param obj An object.
+ */
+export function entries<T>(obj: { [key: string]: T } | ArrayLike<T>): Array<{ key: string, value: T }>;
+/**
+ * Returns an array containing the property keys and values of the specified object (an associative array).
+ * Each entry is an object with a key and value attribute.The order of the returned array is undefined.
+ *
+ * @param obj An object.
+ */
+export function entries(obj: object): Array<{ key: string, value: any }>;
 
 // ---------------------------------------------------------------------
 // map / Map
 // ---------------------------------------------------------------------
 
+/**
+ * A datastructure similar to ES6 Maps, but with a few differences:
+ * - Keys are coerced to strings.
+ * - map.each, not map.forEach. (Also, no thisArg.)
+ * - map.remove, not map.delete.
+ * - map.entries returns an array of {key, value} objects, not an iterator of [key, value].
+ * - map.size is a method, not a property; also, there’s map.empty.
+ *
+ * The generic refers to the data type of the map entry values.
+ */
 export interface Map<T> {
+    /**
+     * Returns true if and only if this map has an entry for the specified key string.
+     * Note: the value may be null or undefined.
+     *
+     * @param key Key of map entry to access.
+     */
     has(key: string): boolean;
+    /**
+     * Returns the value for the specified key string.
+     * If the map does not have an entry for the specified key, returns undefined.
+     *
+     * @param key Key of map entry to access.
+     */
     get(key: string): T | undefined;
+    /**
+     * Sets the value for the specified key string and returns the updated map.
+     * If the map previously had an entry for the same key string, the old entry is replaced with the new value.
+     *
+     * @param key Key of map entry to access.
+     * @param value Value to set for entry at key.
+     */
     set(key: string, value: T): this;
+    /**
+     * If the map has an entry for the specified key string, removes the entry and returns true.
+     * Otherwise, this method does nothing and returns false.
+     *
+     * @param key Map key for which to remove the entry.
+     */
     remove(key: string): boolean;
+    /**
+     * Removes all entries from this map.
+     */
     clear(): void;
+    /**
+     * Returns an array of string keys for every entry in this map.
+     * The order of the returned keys is arbitrary.
+     */
     keys(): string[];
+    /**
+     * Returns an array of values for every entry in this map.
+     * The order of the returned values is arbitrary.
+     */
     values(): T[];
+    /**
+     * Returns an array of key-value objects for each entry in this map. The order of the returned entries is arbitrary.
+     * Each entry’s key is a string, but the value can have arbitrary type.
+     */
     entries(): Array<{ key: string, value: T }>;
+    /**
+     * Calls the specified function for each entry in this map and returns undefined.
+     * The iteration order is arbitrary.
+     *
+     * @param func Function to call for each entry. The function is passed the entry’s value and key as arguments,
+     * followed by the map itself.
+     */
     each(func: (value: T, key: string, map: Map<T>) => void): void;
+    /**
+     * Returns true if and only if this map has zero entries.
+     */
     empty(): boolean;
+    /**
+     * Returns the number of entries in this map.
+     */
     size(): number;
 }
 
-export function map<T>(): Map<T>;
+/**
+ * Constructs a new empty map.
+ *
+ * The generic refers to the data type of the map entry values.
+ */
+export function map<T = any>(): Map<T>;
+/**
+ * Constructs a new map by copying another map.
+ *
+ * The generic refers to the data type of the map entry values.
+ *
+ * @param d3Map A D3 Map.
+ */
 export function map<T>(d3Map: Map<T>): Map<T>;
-export function map<T>(object: { [key: string]: T }): Map<T>;
-export function map<T>(object: { [key: number]: T }): Map<T>;
+/**
+ * Constructs a new map by copying all enumerable properties from the specified object into this map.
+ *
+ * The generic refers to the data type of the map entry values.
+ *
+ * @param obj Object to construct the map from.
+ */
+export function map<T>(obj: { [key: string]: T }): Map<T>;
+/**
+ * Constructs a new map by copying all enumerable properties from the specified object into this map.
+ *
+ * The generic refers to the data type of the map entry values.
+ *
+ * @param obj Object to construct the map from.
+ */
+export function map<T>(obj: { [key: number]: T }): Map<T>;
+/**
+ * Constructs a new map from the elements of an array.
+ * An optional key function may be specified to compute the key for each value in the array.
+ *
+ * The generic refers to the data type of the map entry values.
+ *
+ * @param array Array to convert into a map
+ * @param key An optional key function. The functions is invoked for each element in the array being passed
+ * the element's value , it's zero-based index in the array, and the array itself. The function must return a unique string
+ * to be used as the map entry's key.
+ */
 export function map<T>(array: T[], key?: (value: T, i?: number, array?: T[]) => string): Map<T>;
-export function map(object: any): Map<any>; // TODO: When upgrading definitions to use TS 2.2+, use "object" data type for argument
+/**
+ * Constructs a new map by copying all enumerable properties from the specified object into this map.
+ *
+ * @param obj Object to construct the map from.
+ */
+export function map(obj: object): Map<any>;
 
 // ---------------------------------------------------------------------
 // set / Set
 // ---------------------------------------------------------------------
 
+/**
+ * A datastructure similar to ES6 Sets, but with a few differences:
+ *
+ * - Values are coerced to strings.
+ * - set.each, not set.forEach. (Also, no thisArg.)
+ * - set.remove, not set.delete.
+ * - set.size is a method, not a property; also, there’s set.empty.
+ */
 export interface Set {
+    /**
+     * Returns true if and only if this set has an entry for the specified value string.
+     *
+     * @param value Value whose membership in the class to test.
+     */
     has(value: string | Stringifiable): boolean;
+    /**
+     * Adds the specified value string to this set and returns the set.
+     *
+     * @param value Value to add to set.
+     */
     add(value: string | Stringifiable): this;
+    /**
+     * If the set contains the specified value string, removes it and returns true.
+     * Otherwise, this method does nothing and returns false.
+     *
+     * @param value Value to remove from set.
+     */
     remove(value: string | Stringifiable): boolean;
+    /**
+     * Removes all values from this set.
+     */
     clear(): void;
+    /**
+     * Returns an array of the string values in this set. The order of the returned values is arbitrary.
+     * Can be used as a convenient way of computing the unique values for a set of strings.
+     */
     values(): string[];
     /**
-     * The first and second parameter of the function are both passed
-     * the 'value' of the set entry for consistency with map.each(...)
-     * signature
+     * Calls the specified function for each value in this set, passing the value as the first two arguments (for symmetry with map.each),
+     * followed by the set itself. Returns undefined.
+     * The iteration order is arbitrary.
+     *
+     * @param func Function to call for each set element. The first and second argument of the function are both passed
+     * the 'value' of the set entry for consistency with the map.each(...) signature, as a third argument the entire set is passed in.
      */
     each(func: (value: string, valueRepeat: string, set: Set) => void): void;
+    /**
+     * Returns true if and only if this set has zero values.
+     */
     empty(): boolean;
+    /**
+     * Returns the number of values in this set.
+     */
     size(): number;
 }
 
+/**
+ * Constructs a new empty set.
+ */
 export function set(): Set;
+/**
+ * Constructs a new set by copying an existing set.
+ *
+ * @param set A D3 set.
+ */
 export function set(d3Set: Set): Set;
+/**
+ * Constructs a new set by adding the given array of string values to the returned set.
+ *
+ * @param array An array of strings of values which can be implicitly converted to strings.
+ */
 export function set(array: Array<string | Stringifiable>): Set;
-export function set<T>(array: T[], key: (value: T, index?: number, array?: T[]) => string): Set;
+/**
+ * Constructs a new set from an array, adds an array of mapped string values to the returned set.
+ * The specified accessor function is invoked equivalent to calling array.map(accessor) before constructing the set.
+ *
+ * The generic refers to the data type of the array elements.
+ *
+ * @param array An Array of values to map and add as set elements.
+ * @param key An accessor function used to map the original array elements to string elements to be added to the set.
+ * The function is invoked for each array element, being passed the element's value, it's zero-based index in the array, and the array itself.
+ */
+export function set<T>(array: T[], key: (value: T, index: number, array: T[]) => string): Set;
 
 // ---------------------------------------------------------------------
 // nest / Nest
 // ---------------------------------------------------------------------
 
-// NB: the following three interfaces NestedArray, NestedMap and NestedObject provide a more formal definitions
-// of the return values provided by Nest.entries(...), Nest.map(...) and Nest.object(...), respectively. However,
-// the union types cannot be ex ante simplified without knowledge of the nesting level (number of key(...) operations)
-// and whether the data were rolled-up. The latter question also determins whether NestedArray has the 'values' property
-// with an array of type Datum at leaf level, or has a rolled-up 'value' property.
-// The interfaces are not used as return types, as they are cumbersome to work with on the consuming side (Determining the
-// applicable type from the respective union, i. p. for array elements).
-// It is preferable to carefully define appropriate use-case-specific interfaces for the variables that
-// are assigned the return values of the Nest.entries(...), Nest.map(...) and Nest.object(...) operations. The downside
-// is an overly permissive return type.
-
-// Also note, that the below return types for Nest.entries(...), Nest.map(...) and Nest.object(...) strictly only work,
-// if AT LEAST ONE KEY was set. This seems a reasonable constraint in practice, given the intent of the nest operator.
-// Otherwise, an additional '| Datum[] | RollupType` would have to be added to the union type. This would cover
-// cases (a) without key or rollup (b) without key but with rollup. However, again, the union types make it cumbersome
-// without much gain.
-
+/**
+ * A more formal defintion of the nested array returned by Nest.entries(...). This data structure is intended as a reference only.
+ *
+ * As the union types cannot be ex ante simplified without knowledge
+ * of the nesting level (number of key(...) operations) and whether the data were rolled-up, this data structure becomes cumbersome
+ * to use in practice. This is particularly true for discrimiation of array element types.
+ * The use of the rollup function, or lack thereof, also determines whether NestedArray has the 'values' property
+ * with an array of type Datum at leaf level, or has a rolled-up 'value' property.
+ */
 // tslint:disable-next-line:no-empty-interface
 export interface NestedArray<Datum, RollupType> extends Array<{ key: string, values: NestedArray<Datum, RollupType> | Datum[] | undefined, value: RollupType | undefined }> { }
+
+/**
+ * A more formal defintion of the nested array returned by Nest.map(...). This data structure is intended as a reference only.
+ *
+ * As the union types cannot be ex ante simplified without knowledge
+ * of the nesting level (number of key(...) operations) and whether the data were rolled-up, this data structure becomes cumbersome
+ * to use in practice.
+ */
 // tslint:disable-next-line:no-empty-interface
 export interface NestedMap<Datum, RollupType> extends Map<NestedMap<Datum, RollupType> | Datum[] | RollupType> { }
+
+/**
+ * A more formal defintion of the nested array returned by Nest.object(...). This data structure is intended as a reference only.
+ *
+ * As the union types cannot be ex ante simplified without knowledge
+ * of the nesting level (number of key(...) operations) and whether the data were rolled-up, this data structure becomes cumbersome
+ * to use in practice.
+ */
 export interface NestedObject<Datum, RollupType> {
     [key: string]: NestedObject<Datum, RollupType> | Datum[] | RollupType;
 }
 
+/**
+ * A nest operator for generating nested data structures from arrays.
+ *
+ * Nesting allows elements in an array to be grouped into a hierarchical tree structure;
+ * think of it like the GROUP BY operator in SQL, except you can have multiple levels of grouping, and the resulting output is a tree rather than a flat table.
+ * The levels in the tree are specified by key functions. The leaf nodes of the tree can be sorted by value, while the internal nodes can be sorted by key.
+ * An optional rollup function will collapse the elements in each leaf node using a summary function.
+ * The nest operator is reusable, and does not retain any references to the data that is nested.
+ *
+ * The first generic refers to the data type of the array elements on which the nest operator will
+ * be invoked.
+ *
+ * The second generic refers to the data type returned by the roll-up function to be used with the
+ * nest operator.
+ */
 export interface Nest<Datum, RollupType> {
+    /**
+     * Registers a new key function and returns this nest operator.
+     * The key function will be invoked for each element in the input array and must return a string identifier to assign the element to its group.
+     * Most often, the function is a simple accessor. (Keys functions are not passed the input array index.)
+     *
+     * Each time a key is registered, it is pushed onto the end of the internal array of keys,
+     * and the nest operator applies an additional level of nesting.
+     *
+     * @param func A key accessor function being invoked for each element.
+     */
     key(func: (datum: Datum) => string): this;
+    /**
+     * Sorts key values for the current key using the specified comparator function, such as d3.ascending or d3.descending.
+     *
+     * If no comparator is specified for the current key, the order in which keys will be returned is undefined.
+     *
+     * Note that this only affects the result of nest.entries;
+     * the order of keys returned by nest.map and nest.object is always undefined, regardless of comparator.
+     *
+     * @param comparator A comparator function which returns a negative value if, according to the sorting criterion,
+     * a is less than b, or a positive value if a is greater than b, or 0 if the two values are the same under the sorting criterion.
+     */
     sortKeys(comparator: (a: string, b: string) => number): this;
+    /**
+     * Sorts leaf elements using the specified comparator function, such as d3.ascending or d3.descending.
+     * This is roughly equivalent to sorting the input array before applying the nest operator;
+     * however it is typically more efficient as the size of each group is smaller.
+     *
+     * If no value comparator is specified, elements will be returned in the order they appeared in the input array.
+     * This applies to nest.map, nest.entries and nest.object.
+     *
+     * @param comparator A comparator function which returns a negative value if, according to the sorting criterion,
+     * a is less than b, or a positive value if a is greater than b, or 0 if the two values are the same under the sorting criterion.
+     */
     sortValues(comparator: (a: Datum, b: Datum) => number): this;
+    /**
+     * Specifies a rollup function to be applied on each group of leaf elements and returns this nest operator.
+     * The return value of the rollup function will replace the array of leaf values in either the associative array returned by nest.map or nest.object;
+     * for nest.entries, it replaces the leaf entry.values with entry.value.
+     *
+     * If a leaf comparator is specified, the leaf elements are sorted prior to invoking the rollup function.
+     *
+     * @param func A function computing the rollup value for a group of leaf elements.
+     */
     rollup(func: (values: Datum[]) => RollupType): this;
-    map(array: Datum[]): Map<any>; // more specifically it returns NestedMap<Datum, RollupType>
-    object(array: Datum[]): { [key: string]: any };  // more specifically it returns NestedObject<Datum, RollupType>
-    entries(array: Datum[]): Array<{ key: string; values: any; value: RollupType | undefined }>;  // more specifically it returns NestedArray<Datum, RollupType>
+    /**
+     * Applies the nest operator to the specified array, returning a nested map.
+     *
+     * Each entry in the returned map corresponds to a distinct key value returned by the first key function.
+     * The entry value depends on the number of registered key functions: if there is an additional key, the value is another map;
+     * otherwise, the value is the array of elements filtered from the input array that have the given key value.
+     *
+     * NOTE:
+     *
+     * Strictly speaking the return type of this method is:
+     *
+     * (1) NestedMap<Datum, RollupType>, if at least one key function was defined,
+     *
+     * (2) Datum[], if neither a key nor a rollup function were defined, and
+     *
+     * (3) RollupType, if no keys, but a rollup function were defined.
+     *
+     * Since (2) and (3) are edge cases with little to no practical relevance, they have been omitted in favour of ease-of-use.
+     *
+     * Should you determine that this simplification creates an issue in practice, please file an issue on
+     * https://github.com/DefinitelyTyped/DefinitelyTyped.
+     *
+     * The formal, generalized return type under (1) is cumbersome to work with in practice. The recommended approach
+     * is to define the type of the variable being assigned the return value using knowledge specific to the use-case at hand.
+     * I.e. making use of knowing how many keys are applied, and the nature of any roll-up function will make working with
+     * the variable more meaningful, despite the compromise in type-safety.
+     *
+     * @param array An array to create a nested data structure from.
+     */
+    map(array: Datum[]): Map<any>;
+    /**
+     * Applies the nest operator to the specified array, returning a nested object.
+     * Each entry in the returned associative array corresponds to a distinct key value returned by the first key function.
+     * The entry value depends on the number of registered key functions: if there is an additional key, the value is another associative array;
+     * otherwise, the value is the array of elements filtered from the input array that have the given key value.
+     *
+     * WARNING: this method is unsafe if any of the keys conflict with built-in JavaScript properties, such as __proto__.
+     * If you cannot guarantee that the keys will be safe, you should use nest.map instead.
+     *
+     * NOTE:
+     *
+     * Strictly speaking the return type of this method is:
+     *
+     * (1) NestedObject<Datum, RollupType>, if at least one key function was defined,
+     *
+     * (2) Datum[], if neither a key nor a rollup function were defined, and
+     *
+     * (3) RollupType, if no keys, but a rollup function were defined.
+     *
+     * Since (2) and (3) are edge cases with little to no practical relevance, they have been omitted in favour of ease-of-use.
+     *
+     * Should you determine that this simplification creates an issue in practice, please file an issue on
+     * https://github.com/DefinitelyTyped/DefinitelyTyped.
+     *
+     * The formal, generalized return type under (1) is cumbersome to work with in practice. The recommended approach
+     * is to define the type of the variable being assigned the return value using knowledge specific to the use-case at hand.
+     * I.e. making use of knowing how many keys are applied, and the nature of any roll-up function will make working with
+     * the variable more meaningful, despite the compromise in type-safety.
+     *
+     * @param array An array to create a nested data structure from.
+     */
+    object(array: Datum[]): { [key: string]: any };
+    /**
+     * Applies the nest operator to the specified array, returning an array of key-values entries.
+     * Conceptually, this is similar to applying map.entries to the associative array returned by nest.map,
+     * but it applies to every level of the hierarchy rather than just the first (outermost) level.
+     * Each entry in the returned array corresponds to a distinct key value returned by the first key function.
+     * The entry value depends on the number of registered key functions: if there is an additional key, the value is another nested array of entries;
+     * otherwise, the value is the array of elements filtered from the input array that have the given key value.
+     *
+     * NOTE:
+     *
+     * Strictly speaking the return type of this method is:
+     *
+     * (1) NestedArray<Datum, RollupType>, if at least one key function was defined,
+     *
+     * (2) Datum[], if neither a key nor a rollup function were defined, and
+     *
+     * (3) RollupType, if no keys, but a rollup function were defined.
+     *
+     * Since (2) and (3) are edge cases with little to no practical relevance, they have been omitted in favour of ease-of-use.
+     *
+     * Should you determine that this simplification creates an issue in practice, please file an issue on
+     * https://github.com/DefinitelyTyped/DefinitelyTyped.
+     *
+     * The formal, generalized return type under (1) is cumbersome to work with in practice. The recommended approach
+     * is to define the type of the variable being assigned the return value using knowledge specific to the use-case at hand.
+     * I.e. making use of knowing how many keys are applied, and the nature of any roll-up function will make working with
+     * the variable more meaningful, despite the compromise in type-safety.
+     *
+     * @param array An array to create a nested data structure from.
+     */
+    entries(array: Datum[]): Array<{ key: string; values: any; value: RollupType | undefined }>;
 }
 
-export function nest<Datum>(): Nest<Datum, undefined>;
-export function nest<Datum, RollupType>(): Nest<Datum, RollupType>;
+/**
+ * Creates a new nest operator.
+ *
+ * The first generic refers to the data type of the array elements on which the nest operator will
+ * be invoked.
+ *
+ * The second generic refers to the data type returned by the roll-up function to be used with the
+ * nest operator. If not explicitly set, this generic parameter defaults to undefined, implying that
+ * no rollup function will be applied.
+ */
+export function nest<Datum, RollupType = undefined>(): Nest<Datum, RollupType>;
diff --git a/types/d3-collection/tsconfig.json b/types/d3-collection/tsconfig.json
index c2ae30cdbd..7d3824f371 100644
--- a/types/d3-collection/tsconfig.json
+++ b/types/d3-collection/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-collection-tests.ts"
     ]
-}
\ No newline at end of file
+}

From f7a2deb87c76e644c9b0ecf77d9ab4256052ac7e Mon Sep 17 00:00:00 2001
From: PINGUET Julien <pinguet62@gmail.com>
Date: Thu, 22 Feb 2018 12:37:14 +0100
Subject: [PATCH 278/388] [mongorito] Typing for version 3.0

---
 types/mongorito/index.d.ts         | 297 ++++++++++++++++
 types/mongorito/mongorito-tests.ts | 553 +++++++++++++++++++++++++++++
 types/mongorito/tsconfig.json      |  23 ++
 types/mongorito/tslint.json        |  79 +++++
 4 files changed, 952 insertions(+)
 create mode 100644 types/mongorito/index.d.ts
 create mode 100644 types/mongorito/mongorito-tests.ts
 create mode 100644 types/mongorito/tsconfig.json
 create mode 100644 types/mongorito/tslint.json

diff --git a/types/mongorito/index.d.ts b/types/mongorito/index.d.ts
new file mode 100644
index 0000000000..8342495926
--- /dev/null
+++ b/types/mongorito/index.d.ts
@@ -0,0 +1,297 @@
+// Type definitions for mongorito v3.0.4
+// Project: https://github.com/vadimdemedes/mongorito
+// Definitions by: Pinguet62 <https://github.com/pinguet62>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import {Collection, CommonOptions, Db, IndexOptions, Long, MongoClientOptions, ReadPreference} from 'mongodb';
+
+declare namespace mongorito {
+}
+
+export {Timestamp, ObjectId, MinKey, MaxKey, DBRef, Long} from 'mongodb';
+
+type Class<T> = new (...args: any[]) => T;
+export type ModelClass = Class<Model>;
+
+declare class MQuery {
+}
+
+// "extends MQuery": not actually inheritance, but more easy to implement
+export class Query extends MQuery {
+    static find<T extends Model>(this: Class<T>, query?: object): Promise<T[]>;
+
+    static findOne<T extends Model>(this: Class<T>, query?: object): Promise<T | null>;
+
+    static findById<T extends Model>(this: Class<T>, id: object | string): Promise<T | null>;
+
+    static count(query?: object): Promise<number>;
+
+    static sort(field: string | string[], value?: string): Query;
+    static sort(query: object): Query; // TODO best parameter type
+
+    static include(field: string | string[], value?: number): Query;
+    static include(query: object): Query; // TODO best parameter type
+
+    static exclude(field: string | string[], value?: number): Query;
+    static exclude(query: object): Query; // TODO best parameter type
+
+    static remove(query?: object): Promise<object>;
+
+    Model: ModelClass;
+    query: Array<[string, object]>;
+}
+
+// "extends Query": not actually inheritance, but more easy to implement
+export class Model extends Query {
+
+    /**
+     * @see Model#database
+     * @see Database#connection()
+     */
+    static getConnection(): Promise<Db>;
+
+    /**
+     * @see Db#collection(string)
+     */
+    static getCollection<TSchema = any>(): Promise<Collection<TSchema>>;
+
+    static use(plugins?: Plugin | Plugin[]): void;
+
+    static modifyReducer(reducerModifier: ReducerModifier): void;
+
+    static query(method: string, query: [string, any][]): Promise<object[]>;
+
+    /**
+     * @see mongodb.Collection#listIndexes()
+     * @return {Promise<any[]>} {@link CommandCursor#toArray()}
+     */
+    static listIndexes(options?: { batchSize?: number, readPreference?: ReadPreference | string }): Promise<any[]>;
+
+    /**
+     * @see mongodb.Collection#createIndex()
+     */
+    static createIndex(fieldOrSpec: string | any, options?: IndexOptions): Promise<string>;
+
+    /**
+     * @see mongodb.Collection#dropIndex()
+     */
+    static dropIndex(indexName: string, options?: CommonOptions): Promise<object>;
+
+    static embeds(key: string, model: ModelClass): void;
+
+    constructor(fields?: object);
+
+    collection(): string;
+
+    getConnection(): Promise<Db>;
+
+    getCollection<TSchema = any>(): Promise<Collection<TSchema>>;
+
+    set(key: string, value: any): void;
+    set(value: object): void;
+
+    get(key?: string): any;
+
+    unset(keys?: string | string[]): void;
+
+    toJSON(): object;
+
+    isSaved(): boolean;
+
+    save(): Promise<CreatedAction | UpdatedAction>;
+
+    increment(key: string, value?: number): Promise<RefreshedAction>;
+    increment(keys: { [key: string]: number }): Promise<RefreshedAction>;
+
+    refresh(): Promise<RefreshedAction>;
+
+    remove(): Promise<RemovedAction>;
+}
+
+export enum ActionTypes {
+    GET = "@@mongorito/GET",
+    SET = "@@mongorito/SET",
+    UNSET = "@@mongorito/UNSET",
+    REFRESH = "@@mongorito/REFRESH",
+    REFRESHED = "@@mongorito/REFRESHED",
+    SAVE = "@@mongorito/SAVE",
+    CREATE = "@@mongorito/CREATE",
+    CREATED = "@@mongorito/CREATED",
+    UPDATE = "@@mongorito/UPDATE",
+    UPDATED = "@@mongorito/UPDATED",
+    REMOVE = "@@mongorito/REMOVE",
+    REMOVED = "@@mongorito/REMOVED",
+    INCREMENT = "@@mongorito/INCREMENT",
+    CREATE_INDEX = "@@mongorito/CREATE_INDEX",
+    DROP_INDEX = "@@mongorito/DROP_INDEX",
+    LIST_INDEXES = "@@mongorito/LIST_INDEXES",
+    QUERY = "@@mongorito/QUERY",
+    CALL = "@@mongorito/CALL"
+}
+
+export interface GetAction {
+    type: string; // ActionTypes.GET
+    key?: string;
+}
+
+export interface SetAction {
+    type: string; // ActionTypes.SET
+    fields: object;
+}
+
+export interface UnsetAction {
+    type: string; // ActionTypes.UNSET
+    keys: string | string[];
+}
+
+export interface RefreshAction {
+    type: string; // ActionTypes.REFRESH
+}
+
+export interface RefreshedAction {
+    type: string; // ActionTypes.REFRESHED
+    fields: object;
+}
+
+export interface SaveAction {
+    type: string; // ActionTypes.SAVE
+    fields: object;
+}
+
+export interface CreateAction {
+    type: string; // ActionTypes.CREATE
+    id: object;
+}
+
+export interface CreatedAction {
+    type: string; // ActionTypes.CREATED
+    id: object;
+}
+
+export interface UpdateAction {
+    type: string; // ActionTypes.UPDATE
+    fields: object;
+}
+
+export interface UpdatedAction {
+    type: string; // ActionTypes.UPDATED
+    fields: object;
+}
+
+export interface RemoveAction {
+    type: string; // ActionTypes.REMOVE
+}
+
+export interface RemovedAction {
+    type: string; // ActionTypes.REMOVED
+}
+
+export interface IncrementAction {
+    type: string; // ActionTypes.INCREMENT
+    fields: object;
+}
+
+export interface CreateIndexAction {
+    type: string; // ActionTypes.CREATE_INDEX
+    args: any[];
+}
+
+export interface DropIndexAction {
+    type: string; // ActionTypes.DROP_INDEX
+    args: any[];
+}
+
+export interface ListIndexesAction {
+    type: string; // ActionTypes.LIST_INDEXES
+    args: any[];
+}
+
+export interface QueryAction {
+    type: string; // ActionTypes.QUERY
+    method: string;
+    query: { method: string, args: any }[];
+}
+
+export interface CallAction {
+    type: string; // ActionTypes.CALL
+    method: string;
+    args: { method: string, args: any }[];
+}
+
+export type Action =
+    GetAction
+    | SetAction
+    | UnsetAction
+    | RefreshAction
+    | RefreshedAction
+    | SaveAction
+    | CreateAction
+    | CreatedAction
+    | UpdateAction
+    | UpdatedAction
+    | RemoveAction
+    | RemovedAction
+    | IncrementAction
+    | CreateIndexAction
+    | DropIndexAction
+    | ListIndexesAction
+    | QueryAction
+    | CallAction
+
+export type PluginNext = (action: Action) => void;
+
+interface DefaultState {
+    unset: string[],
+    fields: object
+}
+
+export type State = DefaultState & any;
+
+export interface PluginStore {
+    dispatch: (arg: any) => any,
+    getState: () => State,
+    modelClass: ModelClass,
+    model?: Model
+}
+
+export type Reducer<S = any> = (state: S, action: Action) => Reducer;
+
+export interface DefaultReducer {
+    unset: Reducer<string[]>;
+    fields: Reducer<object>;
+}
+
+export type ReducerState = DefaultReducer & Map<any, Reducer>;
+
+export type ReducerModifier = (reducerState: ReducerState) => ReducerState;
+
+export type Plugin = (modelClass: ModelClass) => (store: PluginStore) => (next: PluginNext) => (action: Action) => void;
+
+export enum DatabaseState {
+    STATE_CONNECTED = 0,
+    STATE_CONNECTING = 1,
+    STATE_DISCONNECTED = 2
+}
+
+export class Database {
+    options: MongoClientOptions;
+    state: DatabaseState;
+    models: ModelClass[];
+    plugins: Plugin[];
+
+    constructor(urls?: string | string[], options?: MongoClientOptions);
+
+    connect(): Promise<Db>;
+
+    connection(): Promise<Db>;
+
+    disconnect(): Promise<void>;
+
+    register(models: ModelClass | ModelClass[]): void;
+
+    /**
+     * @see Model#use()
+     */
+    use(plugins?: Plugin | Plugin[]): void;
+}
diff --git a/types/mongorito/mongorito-tests.ts b/types/mongorito/mongorito-tests.ts
new file mode 100644
index 0000000000..88a7b51cc0
--- /dev/null
+++ b/types/mongorito/mongorito-tests.ts
@@ -0,0 +1,553 @@
+/**
+ * - Compilation type-check: using TS compiler "strict" options, and DefinitelyTyped linter (based on comments)
+ * - Dynamic type-check: using `expect(...).toBeInstanceOf(...)` on a simple workflow (require Mongodb instance)
+ */
+
+import {
+    Collection,
+    Db,
+    DBRef as MongodbDBRef,
+    Long as MongodbLong,
+    MaxKey as MongodbMaxKey,
+    MinKey as MongodbMinKey,
+    MongoClientOptions,
+    ObjectId as MongodbObjectId,
+    Timestamp as MongodbTimestamp
+} from 'mongodb';
+import {
+    Action,
+    ActionTypes,
+    CreatedAction,
+    Database,
+    DBRef,
+    Long,
+    MaxKey,
+    MinKey,
+    Model,
+    ModelClass,
+    ObjectId,
+    Plugin,
+    PluginNext,
+    PluginStore,
+    Query,
+    ReducerModifier,
+    ReducerState,
+    RefreshedAction,
+    RemovedAction,
+    State,
+    Timestamp,
+    UpdatedAction
+} from 'mongorito';
+
+const URL = `192.168.99.100:27017`;
+
+// "jest" dependency
+declare function describe(description: string, callback: Function): void;
+declare function it(description: string, callback: Function | Promise<Function>): void;
+declare function expect(obj: any): any;
+
+function expectToBeAModelClass(obj: ModelClass) {
+    expect(obj).toBeInstanceOf(Function);
+    expect(obj).toHaveProperty('constructor');
+    expect(obj).toHaveProperty('database'); // static field set by "Database.register()" call
+}
+
+function expectToBeAPluginStore(obj: PluginStore) {
+    expect(obj.dispatch).toBeInstanceOf(Function);
+
+    expect(obj.getState).toBeInstanceOf(Function);
+    let storeState: State = obj.getState();
+    expectToBeAState(storeState);
+
+    expectToBeAModelClass(obj.modelClass);
+
+    expect(obj.model).toBeInstanceOf(Model);
+}
+
+function expectToBeAState(obj: State) {
+    expect(obj).toHaveProperty('unset');
+    expect(Array.isArray(obj.unset)).toBe(true);
+    expect(obj).toHaveProperty('fields');
+    expect(obj.fields).toBeInstanceOf(Object);
+}
+
+function expectToBeAQuery(obj: Query) {
+    expectToBeAModelClass(obj.Model);
+    expect(Array.isArray(obj.query)).toBe(true);
+}
+
+function expectToBeAAction(obj: Action) {
+    expect(obj).toBeInstanceOf(Object);
+    expect(typeof obj.type).toBe("string");
+}
+
+function expectToBeACreatedAction(obj: CreatedAction | UpdatedAction) {
+    expect(obj).toBeInstanceOf(Object);
+    expect(obj.type).toEqual(ActionTypes.CREATED);
+    expect((obj as any).id).toBeInstanceOf(ObjectId);
+}
+
+function expectToBeAUpdatedAction(obj: CreatedAction | UpdatedAction) {
+    expect(obj).toBeInstanceOf(Object);
+    expect(obj.type).toEqual(ActionTypes.UPDATED);
+    expect((obj as any).fields).toBeInstanceOf(Object);
+}
+
+function expectToBeARefreshedAction(obj: RefreshedAction) {
+    expect(obj).toBeInstanceOf(Object);
+    expect(obj.type).toEqual(ActionTypes.REFRESHED);
+    expect(obj.fields).toBeInstanceOf(Object);
+}
+
+function expectToBeARemovedAction(obj: RemovedAction) {
+    expect(obj).toBeInstanceOf(Object);
+    expect(obj.type).toEqual(ActionTypes.REMOVED);
+}
+
+function expectToBeACollection(obj: Collection) {
+    // expect(obj).toBeInstanceOf(Object);
+    expect(typeof obj.collectionName).toBe("string");
+    expect(typeof obj.namespace).toBe("string");
+    // expect(obj).toHaveProperty("writeConcern");
+    // expect(obj).toHaveProperty("readConcern");
+    // expect(obj).toHaveProperty("hint");
+}
+
+describe('mongorito', () => {
+    const plugin1: Plugin = (modelClass: ModelClass) => (store: PluginStore) => (next: PluginNext) => (action: Action) => {
+        // next(action);
+    };
+    const plugin2: Plugin = (modelClass: ModelClass) => (store: PluginStore) => (next: PluginNext) => (action: Action) => {
+        // next(action);
+    };
+    const plugin3: Plugin = (modelClass: ModelClass) => (store: PluginStore) => (next: PluginNext) => (action: Action) => {
+        // next(action);
+    };
+
+    it('Plugin', async () => {
+        let plugin: Plugin = (modelClass: ModelClass) => {
+            expectToBeAModelClass(modelClass);
+            return (store: PluginStore) => {
+                expectToBeAPluginStore(store);
+                return (next: PluginNext) => {
+                    expect(next).toBeInstanceOf(Function);
+                    return (action: Action) => {
+                        expectToBeAAction(action);
+                        // next(action);
+                    }
+                }
+            }
+        };
+
+        let database = new Database(URL);
+        await database.connect();
+
+        class PluggedModel extends Model {
+        }
+
+        database.register(PluggedModel);
+        PluggedModel.use(plugin);
+        let obj: Model = new PluggedModel({attr: 42});
+        await obj.save()
+    });
+
+    it('Database', async () => {
+        // ----- constructor -----
+
+        new Database(URL);
+        let options: MongoClientOptions = {};
+        let database = new Database(URL, options);
+
+        new Database(URL);
+
+        new Database(['other', URL]);
+
+        new Database(['other', URL], options);
+
+        // ----- connect -----
+
+        let connectResultPromise: Promise<Db> = database.connect();
+        expect(connectResultPromise).toBeInstanceOf(Promise);
+        let connectResult: Db = await connectResultPromise;
+        expect(connectResult).toBeInstanceOf(Db);
+
+        // ----- connection -----
+
+        let connectionResultPromise: Promise<Db> = database.connection();
+        expect(connectionResultPromise).toBeInstanceOf(Promise);
+        let connectionResult: Db = await connectionResultPromise;
+        expect(connectionResult).toBeInstanceOf(Db);
+
+        // ----- disconnect -----
+
+        let disconnectResultPromise: Promise<void> = database.disconnect();
+        expect(disconnectResultPromise).toBeInstanceOf(Promise);
+        let disconnectResult = await disconnectResultPromise;
+        expect(disconnectResult).toBeUndefined();
+
+        // ----- register -----
+        class RegisteredModel extends Model {
+            constructor(fields?: Object) {
+                super(fields);
+            }
+        }
+
+        class RegisteredModelA extends Model {
+            constructor(fields?: Object) {
+                super(fields);
+            }
+        }
+
+        class RegisteredModelB extends Model {
+            constructor(fields?: Object) {
+                super(fields);
+            }
+        }
+
+        expect(database.register(RegisteredModel)).toBeUndefined();
+        expect(database.register([RegisteredModelA, RegisteredModelB])).toBeUndefined();
+
+        // ----- use -----
+
+        expect(database.use(plugin1)).toBeUndefined();
+        expect(database.use([plugin2, plugin3])).toBeUndefined();
+    });
+
+    describe('Model', () => {
+        it('base static', async () => {
+            let database = new Database(URL);
+            await database.connect();
+
+            class Sample extends Model {
+                constructor(fields?: Object) {
+                    super(fields);
+                }
+            }
+
+            database.register(Sample);
+
+            const fieldOrSpec: string = 'any';
+
+            // ----- getConnection -----
+
+            let getConnectionResultPromise: Promise<Db> = Sample.getConnection();
+            expect(getConnectionResultPromise).toBeInstanceOf(Promise);
+            let getConnectionResult: Db = await getConnectionResultPromise;
+            expect(getConnectionResult).toBeInstanceOf(Db);
+
+            // ----- getCollection -----
+
+            let getCollectionResultPromise: Promise<Collection<any>> = Sample.getCollection();
+            expect(getCollectionResultPromise).toBeInstanceOf(Promise);
+            let getCollectionResult: Collection<any> = await getCollectionResultPromise;
+            expectToBeACollection(getCollectionResult);
+
+            // ----- use -----
+
+            // expect(Sample.use(plugin1)).toBeUndefined();
+            // expect(Sample.use([plugin2, plugin3])).toBeUndefined();
+
+            // ----- modifyReducer -----
+
+            let reducer: ReducerModifier = (reducerState: ReducerState) => {
+                expect(reducerState.unset).toBeInstanceOf(Function);
+                expect(reducerState.fields).toBeInstanceOf(Function);
+                return reducerState
+            };
+            expect(Sample.modifyReducer(reducer)).toBeUndefined();
+
+            // ----- query -----
+            await new Sample({'attr': 'first'}).save();
+            await new Sample({'attr': 'second'}).save();
+
+            let method: string = 'find';
+            let query: [string, any][] = [
+                ['where', {'attr': {$exists: true}}],
+                ['limit', 5]
+            ];
+            let queryResultPromise: Promise<Object[]> = Sample.query(method, query);
+            expect(queryResultPromise).toBeInstanceOf(Promise);
+            let queryResult: Object[] = await queryResultPromise;
+            expect(Array.isArray(queryResult)).toBe(true);
+            expect(queryResult.length).toBeGreaterThan(0);
+            queryResult.forEach(x => expect(x).toBeInstanceOf(Object));
+
+            // ----- listIndexes -----
+
+            let listIndexesResultPromise: Promise<any[]> = Sample.listIndexes();
+            expect(listIndexesResultPromise).toBeInstanceOf(Promise);
+            let listIndexesResult: any[] = await listIndexesResultPromise;
+            expect(Array.isArray(listIndexesResult)).toBe(true);
+            listIndexesResult.forEach(x => expect(x).not.toBeUndefined());
+
+            // ----- createIndex -----
+
+            let createIndexResultPromise: Promise<string> = Sample.createIndex(fieldOrSpec);
+            expect(createIndexResultPromise).toBeInstanceOf(Promise);
+            let createIndexResult: string = await createIndexResultPromise;
+            expect(typeof createIndexResult).toBe('string');
+
+            // ----- dropIndex -----
+
+            let dropIndexResultPromise: Promise<object> = Sample.dropIndex(createIndexResult);
+            expect(dropIndexResultPromise).toBeInstanceOf(Promise);
+            let dropIndexResult: object = await dropIndexResultPromise;
+            expect(dropIndexResult).not.toBeUndefined();
+
+            // ----- embeds -----
+            class EmbeddedModel extends Model {
+            }
+
+            let key: string = 'any';
+            let model: ModelClass = EmbeddedModel;
+            expect(Sample.embeds(key, model)).toBeUndefined()
+        });
+
+        it('base', async () => {
+            let database = new Database(URL);
+            await database.connect();
+
+            class Sample extends Model {
+                constructor(fields?: Object) {
+                    super(fields);
+                }
+            }
+
+            database.register(Sample);
+
+            // ----- constructor -----
+
+            let fields: Object = {views: 5, comments: 2};
+            let model = new Sample(fields);
+
+            new Sample();
+
+            // ----- collection -----
+
+            let collectionResult: string = model.collection();
+            expect(typeof collectionResult).toBe('string');
+
+            // ----- getConnection -----
+
+            let getConnectionResultPromise: Promise<Db> = model.getConnection();
+            expect(getConnectionResultPromise).toBeInstanceOf(Promise);
+            let getConnectionResult: Db = await getConnectionResultPromise;
+            expect(getConnectionResult).toBeInstanceOf(Db);
+
+            // ----- getCollection -----
+
+            let getCollectionResultPromise: Promise<Collection<any>> = model.getCollection();
+            expect(getCollectionResultPromise).toBeInstanceOf(Promise);
+            let getCollectionResult: Collection<any> = await getCollectionResultPromise;
+            expectToBeACollection(getCollectionResult);
+
+            // ----- set -----
+            let key: string = 'attr';
+            let key2: string = 'attr2';
+            let key3: string = 'attr3';
+
+            expect(model.set(key, 'val')).toBeUndefined();
+            expect(model.set({key2: 'val1', key3: 'val2'})).toBeUndefined();
+
+            // ----- get -----
+
+            let getResult1: any = model.get(key);
+            expect(getResult1).not.toBeUndefined();
+
+            let getResult2: any = model.get();
+            expect(getResult2).not.toBeUndefined();
+
+            // ----- unset -----
+
+            expect(model.unset(key)).toBeUndefined();
+
+            let keys: string[] = [key2, key3];
+            expect(model.unset(keys)).toBeUndefined();
+
+            // ----- toJSON -----
+
+            let toJSONResult: object = model.toJSON();
+            expect(toJSONResult).toBeInstanceOf(Object);
+
+            // ----- isSaved -----
+
+            let isSavedResult: boolean = model.isSaved();
+            expect(typeof isSavedResult).toBe('boolean');
+
+            // ----- save -----
+
+            let save1ResultPromise: Promise<CreatedAction | UpdatedAction> = model.save();
+            expect(save1ResultPromise).toBeInstanceOf(Promise);
+            let save1Result: CreatedAction | UpdatedAction = await save1ResultPromise;
+            expectToBeACreatedAction(save1Result);
+
+            let save2ResultPromise: Promise<CreatedAction | UpdatedAction> = model.save();
+            expect(save2ResultPromise).toBeInstanceOf(Promise);
+            let save2Result: CreatedAction | UpdatedAction = await save2ResultPromise;
+            expectToBeAUpdatedAction(save2Result);
+
+            // ----- increment -----
+
+            let incrementResultPromise1: Promise<any> = model.increment('views');
+            expect(incrementResultPromise1).toBeInstanceOf(Promise);
+            let incrementResult1: any = await incrementResultPromise1;
+            expectToBeARefreshedAction(incrementResult1);
+
+            let incrementResultPromise2: Promise<any> = model.increment('views', 2);
+            expect(incrementResultPromise2).toBeInstanceOf(Promise);
+            let incrementResult2: any = await incrementResultPromise2;
+            expectToBeARefreshedAction(incrementResult2);
+
+            let incrementResultPromise3: Promise<any> = model.increment({views: 10, comments: 3});
+            expect(incrementResultPromise3).toBeInstanceOf(Promise);
+            let incrementResult3: any = await incrementResultPromise3;
+            expectToBeARefreshedAction(incrementResult3);
+
+            // ----- refresh -----
+
+            let refreshResultPromise: Promise<RefreshedAction> = model.refresh();
+            expect(refreshResultPromise).toBeInstanceOf(Promise);
+            let refreshResult: RefreshedAction = await refreshResultPromise;
+            expectToBeARefreshedAction(refreshResult);
+
+            // ----- remove -----
+
+            let removeResultPromise: Promise<RemovedAction> = model.remove();
+            expect(removeResultPromise).toBeInstanceOf(Promise);
+            let removeResult: RemovedAction = await removeResultPromise;
+            expectToBeARemovedAction(removeResult);
+        });
+
+        it('Query', async () => {
+            let database = new Database(URL);
+            await database.connect();
+
+            class Sample extends Model {
+                constructor(fields?: Object) {
+                    super(fields);
+                }
+            }
+
+            database.register(Sample);
+
+            let cas = new Sample();
+            await cas.save();
+            let ID = cas.get('_id');
+
+            let query: object = {_id: ID};
+
+            // ----- find -----
+
+            let findResultPromise1: Promise<Sample[]> = Sample.find();
+            expect(findResultPromise1).toBeInstanceOf(Promise);
+            let findResult1: Sample[] = await findResultPromise1;
+            expect(Array.isArray(findResult1)).toBe(true);
+            expect(findResult1[0]).toBeInstanceOf(Sample);
+
+            let findResultPromise2: Promise<Sample[]> = Sample.find(query);
+            expect(findResultPromise2).toBeInstanceOf(Promise);
+            let findResult2: Sample[] = await findResultPromise2;
+            expect(Array.isArray(findResult2)).toBe(true);
+            expect(findResult2[0]).toBeInstanceOf(Sample);
+
+            // ----- findOne -----
+
+            let findOneResultPromise1: Promise<Sample | null> = Sample.findOne();
+            expect(findOneResultPromise1).toBeInstanceOf(Promise);
+            let findOneResult1: Sample | null = await findOneResultPromise1;
+            expect(findOneResult1).toBeInstanceOf(Sample);
+
+            let findOneResultPromise2: Promise<Sample | null> = Sample.findOne(query);
+            expect(findOneResultPromise2).toBeInstanceOf(Promise);
+            let findOneResult2: Sample | null = await findOneResultPromise2;
+            expect(findOneResult2).toBeInstanceOf(Sample);
+
+            // ----- findById -----
+
+            let findByIdResultPromise: Promise<Sample | null> = Sample.findById(ID);
+            expect(findByIdResultPromise).toBeInstanceOf(Promise);
+            let findByIdResult: Sample | null = await findByIdResultPromise;
+            expect(findByIdResult).toBeInstanceOf(Sample);
+
+            await Sample.findById(ID.toString());
+
+            // ----- count -----
+
+            let countResultPromise: Promise<number> = Sample.count();
+            expect(countResultPromise).toBeInstanceOf(Promise);
+            let countResult: number = await countResultPromise;
+            expect(typeof countResult).toBe('number');
+
+            await Sample.count(query);
+
+            // ----- sort -----
+
+            let sortResult1: Query = Sample.sort('field-test');
+            expectToBeAQuery(sortResult1);
+
+            let sortResult2: Query = Sample.sort({field: 1, test: -1});
+            expectToBeAQuery(sortResult2);
+
+            // ----- include -----
+
+            let includeResult1: Query = Sample.include('field-test');
+            expectToBeAQuery(includeResult1);
+
+            let includeResult2: Query = Sample.include({field: 1, test: -1});
+            expectToBeAQuery(includeResult2);
+
+            // ----- exclude -----
+
+            let excludeResult1: Query = Sample.exclude('field-test');
+            expectToBeAQuery(excludeResult1);
+
+            let excludeResult2: Query = Sample.exclude({field: 1, test: -1});
+            expectToBeAQuery(excludeResult2);
+
+            // ----- remove -----
+
+            let removeResultPromise: Promise<object> = Sample.remove();
+            expect(removeResultPromise).toBeInstanceOf(Promise);
+            let removeResult: object = await removeResultPromise;
+            expect(removeResult).toBeInstanceOf(Object);
+
+            await Sample.remove(query);
+        });
+    });
+
+    it('Timestamp', async () => {
+        let obj: Timestamp = new Timestamp(1, 9);
+        expect(obj).toBeInstanceOf(Timestamp);
+        expect(obj).toBeInstanceOf(MongodbTimestamp);
+    });
+
+    it('ObjectId', async () => {
+        let obj: ObjectId = new ObjectId();
+        expect(obj).toBeInstanceOf(ObjectId);
+        expect(obj).toBeInstanceOf(MongodbObjectId);
+    });
+
+    it('MinKey', async () => {
+        let obj: MinKey = new MinKey();
+        expect(obj).toBeInstanceOf(MinKey);
+        expect(obj).toBeInstanceOf(MongodbMinKey);
+    });
+
+    it('MaxKey', async () => {
+        let obj: MaxKey = new MaxKey();
+        expect(obj).toBeInstanceOf(MaxKey);
+        expect(obj).toBeInstanceOf(MongodbMaxKey);
+    });
+
+    it('DBRef', async () => {
+        let obj: DBRef = new DBRef('namespace', new ObjectId());
+        expect(obj).toBeInstanceOf(DBRef);
+        expect(obj).toBeInstanceOf(MongodbDBRef);
+    });
+
+    it('Long', async () => {
+        let obj: Long = new Long(1, 9);
+        expect(obj).toBeInstanceOf(Long);
+        expect(obj).toBeInstanceOf(MongodbLong);
+    });
+});
diff --git a/types/mongorito/tsconfig.json b/types/mongorito/tsconfig.json
new file mode 100644
index 0000000000..142c17e29f
--- /dev/null
+++ b/types/mongorito/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",
+        "mongorito-tests.ts"
+    ]
+}
diff --git a/types/mongorito/tslint.json b/types/mongorito/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/mongorito/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 a11d852bd17adc6a93cf9c34a8ae73d8d5e1b579 Mon Sep 17 00:00:00 2001
From: Philippe Leger <Philippe.Leger@tritondigital.com>
Date: Mon, 26 Feb 2018 13:49:54 -0500
Subject: [PATCH 279/388] Add browserstackLocal option, make Hooks optional

---
 types/webdriverio/index.d.ts | 47 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/types/webdriverio/index.d.ts b/types/webdriverio/index.d.ts
index 8de0c72308..2bd1577d72 100644
--- a/types/webdriverio/index.d.ts
+++ b/types/webdriverio/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for WebdriverIO 4.8
+// Type definitions for WebdriverIO 4.10.2
 // Project: http://www.webdriver.io/
 // Definitions by: Nick Malaguti <https://github.com/nmalaguti>
 //                 Tim Brust <https://github.com/timbru31>
@@ -334,71 +334,72 @@ declare namespace WebdriverIO {
     }
 
     interface Hooks {
-        onError<T>(error: Error): Promise<T> & undefined;
+        onError?<T>(error: Error): Promise<T> & undefined;
 
-        onPrepare<T>(
+        onPrepare?<T>(
             config: Options,
             capabilities: DesiredCapabilities
         ): Promise<T> & undefined;
 
-        onComplete<T>(exitCode: number): Promise<T> & undefined;
+        onComplete?<T>(exitCode: number): Promise<T> & undefined;
 
-        before<T>(
+        before?<T>(
             capabilities: DesiredCapabilities,
             specs: string[]
         ): Promise<T> & undefined;
 
-        beforeCommand<T>(
+        beforeCommand?<T>(
             commandName: string,
             args: any[]
         ): Promise<T> & undefined;
 
-        beforeFeature<T>(feature: string): Promise<T> & undefined;
-        beforeHook<T>(): Promise<T> & undefined;
-        beforeScenario<T>(scenario: string): Promise<T> & undefined;
+        beforeFeature?<T>(feature: string): Promise<T> & undefined;
+        beforeHook?<T>(): Promise<T> & undefined;
+        beforeScenario?<T>(scenario: string): Promise<T> & undefined;
 
-        beforeSession<T>(
+        beforeSession?<T>(
             config: Options,
             capabilities: DesiredCapabilities,
             specs: string[]
         ): Promise<T> & undefined;
 
-        beforeStep<T>(step: string): Promise<T> & undefined;
-        beforeSuite<T>(suite: Suite): Promise<T> & undefined;
-        beforeTest<T>(test: Test): Promise<T> & undefined;
-        afterHook<T>(): Promise<T> & undefined;
+        beforeStep?<T>(step: string): Promise<T> & undefined;
+        beforeSuite?<T>(suite: Suite): Promise<T> & undefined;
+        beforeTest?<T>(test: Test): Promise<T> & undefined;
+        afterHook?<T>(): Promise<T> & undefined;
 
-        after<T>(
+        after?<T>(
             result: number,
             capabilities: DesiredCapabilities,
             specs: string[]
         ): Promise<T> & undefined;
 
-        afterCommand<T>(
+        afterCommand?<T>(
             commandName: string,
             args: any[],
             result: any,
             error?: Error
         ): Promise<T> & undefined;
 
-        afterScenario<T>(scenario: any): Promise<T> & undefined;
+        afterScenario?<T>(scenario: any): Promise<T> & undefined;
 
-        afterSession<T>(
+        afterSession?<T>(
             config: Options,
             capabilities: DesiredCapabilities,
             specs: string[]
         ): Promise<T> & undefined;
 
-        afterStep<T>(stepResult: any): Promise<T> & undefined;
-        afterSuite<T>(suite: Suite): Promise<T> & undefined;
-        afterTest<T>(test: Test): Promise<T> & undefined;
-        afterFeature<T>(feature: string): Promise<T> & undefined;
+        afterStep?<T>(stepResult: any): Promise<T> & undefined;
+        afterSuite?<T>(suite: Suite): Promise<T> & undefined;
+        afterTest?<T>(test: Test): Promise<T> & undefined;
+        afterFeature?<T>(feature: string): Promise<T> & undefined;
     }
 
     interface Options {
         baseUrl?: string;
         bail?: number;
         deprecationWarnings?: boolean;
+        browserstackLocal?: boolean;
         coloredLogs?: boolean;
         capabilities?: DesiredCapabilities[];
         connectionRetryTimeout?: number;
@@ -415,7 +416,7 @@ declare namespace WebdriverIO {
         path?: string;
         plugins?: { [name: string]: any; };
         reporters?: string[] | ((...args: any[]) => void);
-        reporterOptions?: { outputDir?: string; };
+        reporterOptions?: { outputDir?: string, [reporterName: string]: any };
         logLevel?: string;
         maxInstances?: number;
         maxInstancesPerCapability?: number;

From 06d86a34b5869d4412cfc21c4252d856823c4c5b Mon Sep 17 00:00:00 2001
From: nickp10 <nickp10@hotmail.com>
Date: Mon, 26 Feb 2018 12:05:58 -0700
Subject: [PATCH 280/388] Add types for jamon/playmusic

---
 types/playmusic/index.d.ts         | 325 ++++++++++++++++++++++++++
 types/playmusic/playmusic-tests.ts | 357 +++++++++++++++++++++++++++++
 types/playmusic/tsconfig.json      |  24 ++
 types/playmusic/tslint.json        |   3 +
 4 files changed, 709 insertions(+)
 create mode 100644 types/playmusic/index.d.ts
 create mode 100644 types/playmusic/playmusic-tests.ts
 create mode 100644 types/playmusic/tsconfig.json
 create mode 100644 types/playmusic/tslint.json

diff --git a/types/playmusic/index.d.ts b/types/playmusic/index.d.ts
new file mode 100644
index 0000000000..e7ffa3d3b7
--- /dev/null
+++ b/types/playmusic/index.d.ts
@@ -0,0 +1,325 @@
+// Type definitions for playmusic 2.3
+// Project: https://www.github.com/jamon/playmusic
+// Definitions by: Nick Paddock <https://github.com/nickp10>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export interface InitOptions {
+	androidId?: string;
+	email?: string;
+	password?: string;
+	masterToken?: string;
+}
+
+export interface LoginOptions {
+	androidId?: string;
+	email?: string;
+	password?: string;
+}
+
+export interface LoginResponse {
+	androidId: string;
+	masterToken: string;
+}
+
+export interface LibraryOptions {
+	limit?: number;
+	nextPageToken?: string;
+}
+
+export interface LibraryResponse {
+	data?: LibraryData;
+	kind?: string;
+	nextPageToken?: string;
+}
+
+export interface LibraryData {
+	items?: LibraryItem[];
+}
+
+export interface LibraryItem {
+	album?: string;
+	albumArtist?: string;
+	albumArtRef?: ArtRef[];
+	artist?: string;
+	artistArtRef?: ArtRef[];
+	artistId?: string[];
+	beatsPerMinute?: number;
+	clientId?: string;
+	comment?: string;
+	composer?: string;
+	creationTimestamp?: string;
+	deleted?: boolean;
+	discNumber?: number;
+	durationMillis?: string;
+	estimatedSize?: string;
+	genre?: string;
+	id?: string;
+	kind?: string;
+	lastModifiedTimestamp?: string;
+	nid?: string;
+	playCount?: number;
+	rating?: string;
+	recentTimestamp?: string;
+	storeId?: string;
+	title?: string;
+	totalDiscCount?: number;
+	totalTrackCount?: number;
+	trackNumber?: number;
+	year?: number;
+}
+
+export interface ArtRef {
+	url?: string;
+}
+
+export interface PlaylistListResponse {
+	data?: PlaylistListData;
+	kind?: string;
+}
+
+export interface PlaylistListData {
+	items?: PlaylistListItem[];
+}
+
+export interface PlaylistListItem {
+	accessControlled?: boolean;
+	creationTimestamp?: string;
+	deleted?: boolean;
+	description?: string;
+	id?: string;
+	kind?: string;
+	lastModifiedTimestamp?: string;
+	name?: string;
+	ownerName?: string;
+	ownerProfilePhotoUrl?: string;
+	recentTimestamp?: string;
+	shareToken?: string;
+	type?: string;
+}
+
+export interface PlaylistOptions {
+	limit?: number;
+	nextPageToken?: string;
+}
+
+export interface PlaylistResponse {
+	data?: PlaylistData;
+	kind?: string;
+	nextPageToken?: string;
+}
+
+export interface PlaylistData {
+	items?: PlaylistItem[];
+}
+
+export interface PlaylistItem {
+	absolutePosition?: string;
+	clientId?: string;
+	creationTimestamp?: string;
+	deleted?: boolean;
+	id?: string;
+	kind?: string;
+	lastModifiedTimestamp?: string;
+	playlistId?: string;
+	source?: string;
+	track?: PlaylistTrack;
+	trackId?: string;
+}
+
+export interface PlaylistTrack {
+	album?: string;
+	albumArtist?: string;
+	albumArtRef?: ArtRef[];
+	albumAvailableForPurchase?: boolean;
+	albumId?: string;
+	artist?: string;
+	artistArtRef?: ArtRef[];
+	artistId?: string[];
+	composer?: string;
+	contentType?: string;
+	discNumber?: number;
+	durationMillis?: string;
+	estimatedSize?: string;
+	genre?: string;
+	kind?: string;
+	nid?: string;
+	playCount?: number;
+	storeId?: string;
+	title?: string;
+	trackAvailableForPurchase?: boolean;
+	trackAvailableForSubscription?: boolean;
+	trackNumber?: number;
+	trackType?: string;
+	year?: number;
+}
+
+export interface PlaylistMeta {
+	name?: string;
+	description?: string;
+	shareState?: string;
+}
+
+export interface MutateResponses {
+	mutate_response?: MutateResponse[];
+}
+
+export interface MutateResponse {
+	client_id?: string;
+	id?: string;
+	response_code?: string;
+}
+
+export default class PlayMusic {
+	constructor();
+	init(options: InitOptions, callback: (error: Error) => void): void;
+	login(options: LoginOptions, callback: (error: Error, response: LoginResponse) => void): void;
+
+	/**
+	 * Returns settings / device ids authorized for account.
+	 *
+	 * @param callback function(error, response) - success callback
+	 */
+	getSettings(callback: (error: Error, response: any) => void): void;
+
+	/**
+	 * Returns list of all tracks.
+	 *
+	 * @param callback function(error, response) - success callback
+	 */
+	getLibrary(callback: (error: Error, response: LibraryResponse) => void): void;
+
+	/**
+	 * Returns list of all tracks.
+	 *
+	 * @param options object - parameters
+	 * @param callback function(error, response) - success callback
+	 */
+	getLibrary(options: LibraryOptions, callback: (error: Error, response: LibraryResponse) => void): void;
+
+	/**
+	 * Returns stream URL for a track.
+	 *
+	 * @param id string - track id, hyphenated is preferred, but "nid" will work for all access tracks (not uploaded ones)
+	 * @param callback function(err, streamUrl) - success callback
+	 */
+	getStreamUrl(id: string, callback: (error: Error, streamUrl: string) => void): void;
+
+	/**
+	 * Opens and returns a stream object
+	 *
+	 * @param id string - track id, hyphenated is preferred, but "nid" will work for all access tracks (not uploaded ones)
+	 * @param callback function(stream) - success callback
+	 */
+	getStream(id: string, callback: (error: Error, stream: any) => void): void;
+
+	/**
+	 * Searches for All Access tracks.
+	 *
+	 * @param text string - search text
+	 * @param maxResults int - max number of results to return
+	 * @param callback function(err, searchResults) - success callback
+	 */
+	search(text: string, maxResults: number, callback: (error: Error, searchResults: any) => void): void;
+
+	/**
+	 * Returns list of all playlists.
+	 *
+	 * @param callback function(error, playlists) - success callback
+	 */
+	getPlayLists(callback: (error: Error, response: PlaylistListResponse) => void): void;
+
+	/**
+	 * Creates a new playlist.
+	 *
+	 * @param playlistName string - the playlist name
+	 * @param callback function(error, mutateResponses) - success callback
+	 */
+	addPlayList(playlistName: string, callback: (error: Error, mutateResponses: MutateResponses) => void): void;
+
+	/**
+	 * Deletes a playlist
+	 *
+	 * @param playlistId string - the playlist id
+	 * @param callback function(err, mutationStatus) - success callback
+	 */
+	deletePlaylist(playlistId: string, callback: (error: Error, mutationStatus: MutateResponses) => void): void;
+
+	/**
+	 * Updates a playlist's metadata
+	 *
+	 * @param playlistId string - the playlist id
+	 * @param updates object - data to update the playlist with
+	 * @param callback function(err, mutationStatus) - success callback
+	 */
+	updatePlayListMeta(playlistId: string, updates: PlaylistMeta, callback: (error: Error, mutationStatus: MutateResponses) => void): void;
+
+	/**
+	 * Adds a track to end of a playlist.
+	 *
+	 * @param songId string or array of string - the song id(s)
+	 * @param playlistId string - the playlist id
+	 * @param callback function(error, mutateResponses) - success callback
+	 * @param entryBeforeClientId - optional clientId of playlist entry where to add song after
+	 * @param entryAfterClientId - optional clientId of playlist entry where to add song before
+	 */
+	addTrackToPlayList(
+		songIds: string | string[],
+		playlistId: string,
+		callback: (error: Error, mutateResponses: MutateResponses) => void,
+		entryBeforeClientId?: string,
+		entryAfterClientId?: string): void;
+
+	/**
+	 * Move the specified entry inbetween two specified entries (identified by their clientIds)
+	 *
+	 * @param entryToMove string - the song id to move
+	 * @param entryBeforeClientId - optional clientId of playlist entry where to move song after
+	 * @param entryAfterClientId - optional clientId of playlist entry where to move song before
+	 * @param callback function(err, playlistEntries) - success callback
+	 */
+	movePlayListEntry(entryToMove: string, entryBeforeClientId: string, entryAfterClientId: string, callback: (error: Error, mutateResponses: MutateResponses) => void): void;
+
+	/**
+	 * Increments track's playcount
+	 *
+	 * @param songId int - the song id. See http://bit.ly/1L4U6oK for id requirements.
+	 * @param callback function(err, mutationStatus) - success callback
+	 */
+	incrementTrackPlaycount(songId: string, callback: (error: Error, mutationStatus: MutateResponses) => void): void;
+
+	/**
+	 * Change metadata of a track a library
+	 * Currently only support changing rating
+	 * You need to change a song object with a different rating value:
+	 * 5 = thumb up, 1 = thumb down, 0 = no thumb
+	 *
+	 * @param song object - the track dictionary. You can get from getAllAccessTrack or from getLibrary
+	 * @param callback function(err, success) - success callback
+	 */
+	changeTrackMetadata(song: any, callback: (error: Error, success: MutateResponses) => void): void;
+
+	/**
+	 * Removes given entry ids from playlist entries.
+	 *
+	 * @param playlistItemIds string or array of string - the entry id(s). You can get this from getPlayListEntries or PlaylistItem#id.
+	 * @param callback function(error, mutateResponses) - success callback
+	 */
+	removePlayListEntry(playlistItemIds: string | string[], callback: (error: Error, mutateResponses: MutateResponses) => void): void;
+
+	/**
+	 * Returns tracks on all playlists.
+	 *
+	 * @param callback function(error, response) - success callback
+	 */
+	getPlayListEntries(callback: (error: Error, response: PlaylistResponse) => void): void;
+
+	/**
+	 * Returns tracks on all playlists.
+	 *
+	 * @param options object - parameters
+	 * @param callback function(error, response) - success callback
+	 */
+	getPlayListEntries(options: PlaylistOptions, callback: (error: Error, response: PlaylistResponse) => void): void;
+}
diff --git a/types/playmusic/playmusic-tests.ts b/types/playmusic/playmusic-tests.ts
new file mode 100644
index 0000000000..5cf98b35c0
--- /dev/null
+++ b/types/playmusic/playmusic-tests.ts
@@ -0,0 +1,357 @@
+import PlayMusic, * as pm from "playmusic";
+
+const instance = new PlayMusic();
+
+instance.init({
+	androidId: "androidId",
+	email: "email",
+	password: "password",
+	masterToken: "masterToken"
+}, (error: Error) => {
+	console.log(error.message);
+	console.log(error.name);
+});
+
+instance.login({
+	androidId: "androidId",
+	email: "email",
+	password: "password"
+}, (error: Error, loginResponse: pm.LoginResponse) => {
+	console.log(error.message);
+	console.log(error.name);
+	console.log(loginResponse.androidId);
+	console.log(loginResponse.masterToken);
+});
+
+instance.getSettings((error: Error, response: any) => {
+	console.log(error.message);
+	console.log(error.name);
+});
+
+instance.getLibrary((error: Error, response: pm.LibraryResponse) => {
+	console.log(error.message);
+	console.log(error.name);
+});
+
+instance.getLibrary({
+	limit: 123,
+	nextPageToken: "nextPageToken"
+}, (error: Error, response: pm.LibraryResponse) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (response && response.data && response.data.items) {
+		response.data.items.forEach((item: pm.LibraryItem) => {
+			console.log(item.album);
+			console.log(item.albumArtist);
+			if (item.albumArtRef) {
+				console.log(item.albumArtRef[0].url);
+			}
+			console.log(item.artist);
+			if (item.artistArtRef) {
+				console.log(item.artistArtRef[0].url);
+			}
+			if (item.artistId) {
+				console.log(item.artistId.length);
+			}
+			console.log(item.beatsPerMinute);
+			console.log(item.clientId);
+			console.log(item.comment);
+			console.log(item.composer);
+			console.log(item.creationTimestamp);
+			console.log(item.deleted);
+			console.log(item.discNumber);
+			console.log(item.durationMillis);
+			console.log(item.estimatedSize);
+			console.log(item.genre);
+			console.log(item.id);
+			console.log(item.kind);
+			console.log(item.lastModifiedTimestamp);
+			console.log(item.nid);
+			console.log(item.playCount);
+			console.log(item.rating);
+			console.log(item.recentTimestamp);
+			console.log(item.storeId);
+			console.log(item.title);
+			console.log(item.totalDiscCount);
+			console.log(item.totalTrackCount);
+			console.log(item.trackNumber);
+			console.log(item.year);
+		});
+	}
+	console.log(response.kind);
+	console.log(response.nextPageToken);
+});
+
+instance.getStreamUrl("id", (error: Error, streamUrl: string) => {
+	console.log(error.message);
+	console.log(error.name);
+	console.log(streamUrl);
+});
+
+instance.getStream("id", (error: Error, stream: any) => {
+	console.log(error.message);
+	console.log(error.name);
+	console.log(stream);
+});
+
+instance.search("text", 123, (error: Error, searchResults: any) => {
+	console.log(error.message);
+	console.log(error.name);
+	console.log(searchResults);
+});
+
+instance.getPlayLists((error: Error, response: pm.PlaylistListResponse) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (response && response.data && response.data.items) {
+		response.data.items.forEach((item: pm.PlaylistListItem) => {
+			console.log(item.accessControlled);
+			console.log(item.creationTimestamp);
+			console.log(item.deleted);
+			console.log(item.description);
+			console.log(item.id);
+			console.log(item.kind);
+			console.log(item.lastModifiedTimestamp);
+			console.log(item.name);
+			console.log(item.ownerName);
+			console.log(item.ownerProfilePhotoUrl);
+			console.log(item.recentTimestamp);
+			console.log(item.shareToken);
+			console.log(item.type);
+		});
+	}
+	console.log(response.kind);
+});
+
+instance.addPlayList("playlistName", (error: Error, mutateResponses: pm.MutateResponses) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (mutateResponses && mutateResponses.mutate_response) {
+		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+			console.log(mutateResponse.client_id);
+			console.log(mutateResponse.id);
+			console.log(mutateResponse.response_code);
+		});
+	}
+});
+
+instance.deletePlaylist("playlistId", (error: Error, mutateResponses: pm.MutateResponses) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (mutateResponses && mutateResponses.mutate_response) {
+		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+			console.log(mutateResponse.client_id);
+			console.log(mutateResponse.id);
+			console.log(mutateResponse.response_code);
+		});
+	}
+});
+
+instance.updatePlayListMeta("playlistId", {
+	name: "name",
+	description: "description",
+	shareState: "shareState"
+}, (error: Error, mutateResponses: pm.MutateResponses) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (mutateResponses && mutateResponses.mutate_response) {
+		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+			console.log(mutateResponse.client_id);
+			console.log(mutateResponse.id);
+			console.log(mutateResponse.response_code);
+		});
+	}
+});
+
+instance.addTrackToPlayList("songId", "playlistId", (error: Error, mutateResponses: pm.MutateResponses) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (mutateResponses && mutateResponses.mutate_response) {
+		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+			console.log(mutateResponse.client_id);
+			console.log(mutateResponse.id);
+			console.log(mutateResponse.response_code);
+		});
+	}
+}, "entryBeforeClientId", "entryAfterClientId");
+
+instance.addTrackToPlayList(["songId1", "songId2"], "playlistId", (error: Error, mutateResponses: pm.MutateResponses) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (mutateResponses && mutateResponses.mutate_response) {
+		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+			console.log(mutateResponse.client_id);
+			console.log(mutateResponse.id);
+			console.log(mutateResponse.response_code);
+		});
+	}
+}, "entryBeforeClientId", "entryAfterClientId");
+
+instance.movePlayListEntry("entryToMove", "entryBeforeClientId", "entryAfterClientId", (error: Error, mutateResponses: pm.MutateResponses) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (mutateResponses && mutateResponses.mutate_response) {
+		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+			console.log(mutateResponse.client_id);
+			console.log(mutateResponse.id);
+			console.log(mutateResponse.response_code);
+		});
+	}
+});
+
+instance.incrementTrackPlaycount("songId", (error: Error, mutateResponses: pm.MutateResponses) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (mutateResponses && mutateResponses.mutate_response) {
+		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+			console.log(mutateResponse.client_id);
+			console.log(mutateResponse.id);
+			console.log(mutateResponse.response_code);
+		});
+	}
+});
+
+instance.changeTrackMetadata({ }, (error: Error, mutateResponses: pm.MutateResponses) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (mutateResponses && mutateResponses.mutate_response) {
+		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+			console.log(mutateResponse.client_id);
+			console.log(mutateResponse.id);
+			console.log(mutateResponse.response_code);
+		});
+	}
+});
+
+instance.removePlayListEntry("playlistItemId", (error: Error, mutateResponses: pm.MutateResponses) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (mutateResponses && mutateResponses.mutate_response) {
+		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+			console.log(mutateResponse.client_id);
+			console.log(mutateResponse.id);
+			console.log(mutateResponse.response_code);
+		});
+	}
+});
+
+instance.removePlayListEntry(["playlistItemId1", "playlistItemId2"], (error: Error, mutateResponses: pm.MutateResponses) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (mutateResponses && mutateResponses.mutate_response) {
+		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+			console.log(mutateResponse.client_id);
+			console.log(mutateResponse.id);
+			console.log(mutateResponse.response_code);
+		});
+	}
+});
+
+instance.getPlayListEntries((error: Error, response: pm.PlaylistResponse) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (response && response.data && response.data.items) {
+		response.data.items.forEach((item: pm.PlaylistItem) => {
+			console.log(item.absolutePosition);
+			console.log(item.clientId);
+			console.log(item.creationTimestamp);
+			console.log(item.deleted);
+			console.log(item.id);
+			console.log(item.kind);
+			console.log(item.lastModifiedTimestamp);
+			console.log(item.playlistId);
+			console.log(item.source);
+			if (item.track) {
+				console.log(item.track.album);
+				console.log(item.track.albumArtist);
+				if (item.track.albumArtRef) {
+					console.log(item.track.albumArtRef[0].url);
+				}
+				console.log(item.track.albumAvailableForPurchase);
+				console.log(item.track.albumId);
+				console.log(item.track.artist);
+				if (item.track.artistArtRef) {
+					console.log(item.track.artistArtRef[0].url);
+				}
+				if (item.track.artistId) {
+					console.log(item.track.artistId.length);
+				}
+				console.log(item.track.composer);
+				console.log(item.track.contentType);
+				console.log(item.track.discNumber);
+				console.log(item.track.durationMillis);
+				console.log(item.track.estimatedSize);
+				console.log(item.track.genre);
+				console.log(item.track.kind);
+				console.log(item.track.nid);
+				console.log(item.track.playCount);
+				console.log(item.track.storeId);
+				console.log(item.track.title);
+				console.log(item.track.trackAvailableForPurchase);
+				console.log(item.track.trackAvailableForSubscription);
+				console.log(item.track.trackNumber);
+				console.log(item.track.trackType);
+				console.log(item.track.year);
+			}
+			console.log(item.trackId);
+		});
+	}
+	console.log(response.kind);
+	console.log(response.nextPageToken);
+});
+
+instance.getPlayListEntries({
+	limit: 123,
+	nextPageToken: "nextPageToken"
+}, (error: Error, response: pm.PlaylistResponse) => {
+	console.log(error.message);
+	console.log(error.name);
+	if (response && response.data && response.data.items) {
+		response.data.items.forEach((item: pm.PlaylistItem) => {
+			console.log(item.absolutePosition);
+			console.log(item.clientId);
+			console.log(item.creationTimestamp);
+			console.log(item.deleted);
+			console.log(item.id);
+			console.log(item.kind);
+			console.log(item.lastModifiedTimestamp);
+			console.log(item.playlistId);
+			console.log(item.source);
+			if (item.track) {
+				console.log(item.track.album);
+				console.log(item.track.albumArtist);
+				if (item.track.albumArtRef) {
+					console.log(item.track.albumArtRef[0].url);
+				}
+				console.log(item.track.albumAvailableForPurchase);
+				console.log(item.track.albumId);
+				console.log(item.track.artist);
+				if (item.track.artistArtRef) {
+					console.log(item.track.artistArtRef[0].url);
+				}
+				if (item.track.artistId) {
+					console.log(item.track.artistId.length);
+				}
+				console.log(item.track.composer);
+				console.log(item.track.contentType);
+				console.log(item.track.discNumber);
+				console.log(item.track.durationMillis);
+				console.log(item.track.estimatedSize);
+				console.log(item.track.genre);
+				console.log(item.track.kind);
+				console.log(item.track.nid);
+				console.log(item.track.playCount);
+				console.log(item.track.storeId);
+				console.log(item.track.title);
+				console.log(item.track.trackAvailableForPurchase);
+				console.log(item.track.trackAvailableForSubscription);
+				console.log(item.track.trackNumber);
+				console.log(item.track.trackType);
+				console.log(item.track.year);
+			}
+			console.log(item.trackId);
+		});
+	}
+	console.log(response.kind);
+	console.log(response.nextPageToken);
+});
diff --git a/types/playmusic/tsconfig.json b/types/playmusic/tsconfig.json
new file mode 100644
index 0000000000..7ea1bb4321
--- /dev/null
+++ b/types/playmusic/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",
+        "playmusic-tests.ts"
+    ]
+}
diff --git a/types/playmusic/tslint.json b/types/playmusic/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/playmusic/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 70021de6591d0f4ec28370df4eceb0ffc715caab Mon Sep 17 00:00:00 2001
From: Philippe Leger <Philippe.Leger@tritondigital.com>
Date: Mon, 26 Feb 2018 14:06:17 -0500
Subject: [PATCH 281/388] Remove patch version from header

---
 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 2bd1577d72..8020be7957 100644
--- a/types/webdriverio/index.d.ts
+++ b/types/webdriverio/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for WebdriverIO 4.10.2
+// Type definitions for WebdriverIO 4.10
 // Project: http://www.webdriver.io/
 // Definitions by: Nick Malaguti <https://github.com/nmalaguti>
 //                 Tim Brust <https://github.com/timbru31>

From 6be85b1054a88172f4ae370b30171118b9fb8e58 Mon Sep 17 00:00:00 2001
From: nickp10 <nickp10@hotmail.com>
Date: Mon, 26 Feb 2018 12:08:11 -0700
Subject: [PATCH 282/388] Fix tabs to spaces

---
 types/playmusic/index.d.ts         | 484 ++++++++++++------------
 types/playmusic/playmusic-tests.ts | 572 ++++++++++++++---------------
 2 files changed, 528 insertions(+), 528 deletions(-)

diff --git a/types/playmusic/index.d.ts b/types/playmusic/index.d.ts
index e7ffa3d3b7..fda4a582c5 100644
--- a/types/playmusic/index.d.ts
+++ b/types/playmusic/index.d.ts
@@ -6,320 +6,320 @@
 /// <reference types="node" />
 
 export interface InitOptions {
-	androidId?: string;
-	email?: string;
-	password?: string;
-	masterToken?: string;
+    androidId?: string;
+    email?: string;
+    password?: string;
+    masterToken?: string;
 }
 
 export interface LoginOptions {
-	androidId?: string;
-	email?: string;
-	password?: string;
+    androidId?: string;
+    email?: string;
+    password?: string;
 }
 
 export interface LoginResponse {
-	androidId: string;
-	masterToken: string;
+    androidId: string;
+    masterToken: string;
 }
 
 export interface LibraryOptions {
-	limit?: number;
-	nextPageToken?: string;
+    limit?: number;
+    nextPageToken?: string;
 }
 
 export interface LibraryResponse {
-	data?: LibraryData;
-	kind?: string;
-	nextPageToken?: string;
+    data?: LibraryData;
+    kind?: string;
+    nextPageToken?: string;
 }
 
 export interface LibraryData {
-	items?: LibraryItem[];
+    items?: LibraryItem[];
 }
 
 export interface LibraryItem {
-	album?: string;
-	albumArtist?: string;
-	albumArtRef?: ArtRef[];
-	artist?: string;
-	artistArtRef?: ArtRef[];
-	artistId?: string[];
-	beatsPerMinute?: number;
-	clientId?: string;
-	comment?: string;
-	composer?: string;
-	creationTimestamp?: string;
-	deleted?: boolean;
-	discNumber?: number;
-	durationMillis?: string;
-	estimatedSize?: string;
-	genre?: string;
-	id?: string;
-	kind?: string;
-	lastModifiedTimestamp?: string;
-	nid?: string;
-	playCount?: number;
-	rating?: string;
-	recentTimestamp?: string;
-	storeId?: string;
-	title?: string;
-	totalDiscCount?: number;
-	totalTrackCount?: number;
-	trackNumber?: number;
-	year?: number;
+    album?: string;
+    albumArtist?: string;
+    albumArtRef?: ArtRef[];
+    artist?: string;
+    artistArtRef?: ArtRef[];
+    artistId?: string[];
+    beatsPerMinute?: number;
+    clientId?: string;
+    comment?: string;
+    composer?: string;
+    creationTimestamp?: string;
+    deleted?: boolean;
+    discNumber?: number;
+    durationMillis?: string;
+    estimatedSize?: string;
+    genre?: string;
+    id?: string;
+    kind?: string;
+    lastModifiedTimestamp?: string;
+    nid?: string;
+    playCount?: number;
+    rating?: string;
+    recentTimestamp?: string;
+    storeId?: string;
+    title?: string;
+    totalDiscCount?: number;
+    totalTrackCount?: number;
+    trackNumber?: number;
+    year?: number;
 }
 
 export interface ArtRef {
-	url?: string;
+    url?: string;
 }
 
 export interface PlaylistListResponse {
-	data?: PlaylistListData;
-	kind?: string;
+    data?: PlaylistListData;
+    kind?: string;
 }
 
 export interface PlaylistListData {
-	items?: PlaylistListItem[];
+    items?: PlaylistListItem[];
 }
 
 export interface PlaylistListItem {
-	accessControlled?: boolean;
-	creationTimestamp?: string;
-	deleted?: boolean;
-	description?: string;
-	id?: string;
-	kind?: string;
-	lastModifiedTimestamp?: string;
-	name?: string;
-	ownerName?: string;
-	ownerProfilePhotoUrl?: string;
-	recentTimestamp?: string;
-	shareToken?: string;
-	type?: string;
+    accessControlled?: boolean;
+    creationTimestamp?: string;
+    deleted?: boolean;
+    description?: string;
+    id?: string;
+    kind?: string;
+    lastModifiedTimestamp?: string;
+    name?: string;
+    ownerName?: string;
+    ownerProfilePhotoUrl?: string;
+    recentTimestamp?: string;
+    shareToken?: string;
+    type?: string;
 }
 
 export interface PlaylistOptions {
-	limit?: number;
-	nextPageToken?: string;
+    limit?: number;
+    nextPageToken?: string;
 }
 
 export interface PlaylistResponse {
-	data?: PlaylistData;
-	kind?: string;
-	nextPageToken?: string;
+    data?: PlaylistData;
+    kind?: string;
+    nextPageToken?: string;
 }
 
 export interface PlaylistData {
-	items?: PlaylistItem[];
+    items?: PlaylistItem[];
 }
 
 export interface PlaylistItem {
-	absolutePosition?: string;
-	clientId?: string;
-	creationTimestamp?: string;
-	deleted?: boolean;
-	id?: string;
-	kind?: string;
-	lastModifiedTimestamp?: string;
-	playlistId?: string;
-	source?: string;
-	track?: PlaylistTrack;
-	trackId?: string;
+    absolutePosition?: string;
+    clientId?: string;
+    creationTimestamp?: string;
+    deleted?: boolean;
+    id?: string;
+    kind?: string;
+    lastModifiedTimestamp?: string;
+    playlistId?: string;
+    source?: string;
+    track?: PlaylistTrack;
+    trackId?: string;
 }
 
 export interface PlaylistTrack {
-	album?: string;
-	albumArtist?: string;
-	albumArtRef?: ArtRef[];
-	albumAvailableForPurchase?: boolean;
-	albumId?: string;
-	artist?: string;
-	artistArtRef?: ArtRef[];
-	artistId?: string[];
-	composer?: string;
-	contentType?: string;
-	discNumber?: number;
-	durationMillis?: string;
-	estimatedSize?: string;
-	genre?: string;
-	kind?: string;
-	nid?: string;
-	playCount?: number;
-	storeId?: string;
-	title?: string;
-	trackAvailableForPurchase?: boolean;
-	trackAvailableForSubscription?: boolean;
-	trackNumber?: number;
-	trackType?: string;
-	year?: number;
+    album?: string;
+    albumArtist?: string;
+    albumArtRef?: ArtRef[];
+    albumAvailableForPurchase?: boolean;
+    albumId?: string;
+    artist?: string;
+    artistArtRef?: ArtRef[];
+    artistId?: string[];
+    composer?: string;
+    contentType?: string;
+    discNumber?: number;
+    durationMillis?: string;
+    estimatedSize?: string;
+    genre?: string;
+    kind?: string;
+    nid?: string;
+    playCount?: number;
+    storeId?: string;
+    title?: string;
+    trackAvailableForPurchase?: boolean;
+    trackAvailableForSubscription?: boolean;
+    trackNumber?: number;
+    trackType?: string;
+    year?: number;
 }
 
 export interface PlaylistMeta {
-	name?: string;
-	description?: string;
-	shareState?: string;
+    name?: string;
+    description?: string;
+    shareState?: string;
 }
 
 export interface MutateResponses {
-	mutate_response?: MutateResponse[];
+    mutate_response?: MutateResponse[];
 }
 
 export interface MutateResponse {
-	client_id?: string;
-	id?: string;
-	response_code?: string;
+    client_id?: string;
+    id?: string;
+    response_code?: string;
 }
 
 export default class PlayMusic {
-	constructor();
-	init(options: InitOptions, callback: (error: Error) => void): void;
-	login(options: LoginOptions, callback: (error: Error, response: LoginResponse) => void): void;
+    constructor();
+    init(options: InitOptions, callback: (error: Error) => void): void;
+    login(options: LoginOptions, callback: (error: Error, response: LoginResponse) => void): void;
 
-	/**
-	 * Returns settings / device ids authorized for account.
-	 *
-	 * @param callback function(error, response) - success callback
-	 */
-	getSettings(callback: (error: Error, response: any) => void): void;
+    /**
+     * Returns settings / device ids authorized for account.
+     *
+     * @param callback function(error, response) - success callback
+     */
+    getSettings(callback: (error: Error, response: any) => void): void;
 
-	/**
-	 * Returns list of all tracks.
-	 *
-	 * @param callback function(error, response) - success callback
-	 */
-	getLibrary(callback: (error: Error, response: LibraryResponse) => void): void;
+    /**
+     * Returns list of all tracks.
+     *
+     * @param callback function(error, response) - success callback
+     */
+    getLibrary(callback: (error: Error, response: LibraryResponse) => void): void;
 
-	/**
-	 * Returns list of all tracks.
-	 *
-	 * @param options object - parameters
-	 * @param callback function(error, response) - success callback
-	 */
-	getLibrary(options: LibraryOptions, callback: (error: Error, response: LibraryResponse) => void): void;
+    /**
+     * Returns list of all tracks.
+     *
+     * @param options object - parameters
+     * @param callback function(error, response) - success callback
+     */
+    getLibrary(options: LibraryOptions, callback: (error: Error, response: LibraryResponse) => void): void;
 
-	/**
-	 * Returns stream URL for a track.
-	 *
-	 * @param id string - track id, hyphenated is preferred, but "nid" will work for all access tracks (not uploaded ones)
-	 * @param callback function(err, streamUrl) - success callback
-	 */
-	getStreamUrl(id: string, callback: (error: Error, streamUrl: string) => void): void;
+    /**
+     * Returns stream URL for a track.
+     *
+     * @param id string - track id, hyphenated is preferred, but "nid" will work for all access tracks (not uploaded ones)
+     * @param callback function(err, streamUrl) - success callback
+     */
+    getStreamUrl(id: string, callback: (error: Error, streamUrl: string) => void): void;
 
-	/**
-	 * Opens and returns a stream object
-	 *
-	 * @param id string - track id, hyphenated is preferred, but "nid" will work for all access tracks (not uploaded ones)
-	 * @param callback function(stream) - success callback
-	 */
-	getStream(id: string, callback: (error: Error, stream: any) => void): void;
+    /**
+     * Opens and returns a stream object
+     *
+     * @param id string - track id, hyphenated is preferred, but "nid" will work for all access tracks (not uploaded ones)
+     * @param callback function(stream) - success callback
+     */
+    getStream(id: string, callback: (error: Error, stream: any) => void): void;
 
-	/**
-	 * Searches for All Access tracks.
-	 *
-	 * @param text string - search text
-	 * @param maxResults int - max number of results to return
-	 * @param callback function(err, searchResults) - success callback
-	 */
-	search(text: string, maxResults: number, callback: (error: Error, searchResults: any) => void): void;
+    /**
+     * Searches for All Access tracks.
+     *
+     * @param text string - search text
+     * @param maxResults int - max number of results to return
+     * @param callback function(err, searchResults) - success callback
+     */
+    search(text: string, maxResults: number, callback: (error: Error, searchResults: any) => void): void;
 
-	/**
-	 * Returns list of all playlists.
-	 *
-	 * @param callback function(error, playlists) - success callback
-	 */
-	getPlayLists(callback: (error: Error, response: PlaylistListResponse) => void): void;
+    /**
+     * Returns list of all playlists.
+     *
+     * @param callback function(error, playlists) - success callback
+     */
+    getPlayLists(callback: (error: Error, response: PlaylistListResponse) => void): void;
 
-	/**
-	 * Creates a new playlist.
-	 *
-	 * @param playlistName string - the playlist name
-	 * @param callback function(error, mutateResponses) - success callback
-	 */
-	addPlayList(playlistName: string, callback: (error: Error, mutateResponses: MutateResponses) => void): void;
+    /**
+     * Creates a new playlist.
+     *
+     * @param playlistName string - the playlist name
+     * @param callback function(error, mutateResponses) - success callback
+     */
+    addPlayList(playlistName: string, callback: (error: Error, mutateResponses: MutateResponses) => void): void;
 
-	/**
-	 * Deletes a playlist
-	 *
-	 * @param playlistId string - the playlist id
-	 * @param callback function(err, mutationStatus) - success callback
-	 */
-	deletePlaylist(playlistId: string, callback: (error: Error, mutationStatus: MutateResponses) => void): void;
+    /**
+     * Deletes a playlist
+     *
+     * @param playlistId string - the playlist id
+     * @param callback function(err, mutationStatus) - success callback
+     */
+    deletePlaylist(playlistId: string, callback: (error: Error, mutationStatus: MutateResponses) => void): void;
 
-	/**
-	 * Updates a playlist's metadata
-	 *
-	 * @param playlistId string - the playlist id
-	 * @param updates object - data to update the playlist with
-	 * @param callback function(err, mutationStatus) - success callback
-	 */
-	updatePlayListMeta(playlistId: string, updates: PlaylistMeta, callback: (error: Error, mutationStatus: MutateResponses) => void): void;
+    /**
+     * Updates a playlist's metadata
+     *
+     * @param playlistId string - the playlist id
+     * @param updates object - data to update the playlist with
+     * @param callback function(err, mutationStatus) - success callback
+     */
+    updatePlayListMeta(playlistId: string, updates: PlaylistMeta, callback: (error: Error, mutationStatus: MutateResponses) => void): void;
 
-	/**
-	 * Adds a track to end of a playlist.
-	 *
-	 * @param songId string or array of string - the song id(s)
-	 * @param playlistId string - the playlist id
-	 * @param callback function(error, mutateResponses) - success callback
-	 * @param entryBeforeClientId - optional clientId of playlist entry where to add song after
-	 * @param entryAfterClientId - optional clientId of playlist entry where to add song before
-	 */
-	addTrackToPlayList(
-		songIds: string | string[],
-		playlistId: string,
-		callback: (error: Error, mutateResponses: MutateResponses) => void,
-		entryBeforeClientId?: string,
-		entryAfterClientId?: string): void;
+    /**
+     * Adds a track to end of a playlist.
+     *
+     * @param songId string or array of string - the song id(s)
+     * @param playlistId string - the playlist id
+     * @param callback function(error, mutateResponses) - success callback
+     * @param entryBeforeClientId - optional clientId of playlist entry where to add song after
+     * @param entryAfterClientId - optional clientId of playlist entry where to add song before
+     */
+    addTrackToPlayList(
+        songIds: string | string[],
+        playlistId: string,
+        callback: (error: Error, mutateResponses: MutateResponses) => void,
+        entryBeforeClientId?: string,
+        entryAfterClientId?: string): void;
 
-	/**
-	 * Move the specified entry inbetween two specified entries (identified by their clientIds)
-	 *
-	 * @param entryToMove string - the song id to move
-	 * @param entryBeforeClientId - optional clientId of playlist entry where to move song after
-	 * @param entryAfterClientId - optional clientId of playlist entry where to move song before
-	 * @param callback function(err, playlistEntries) - success callback
-	 */
-	movePlayListEntry(entryToMove: string, entryBeforeClientId: string, entryAfterClientId: string, callback: (error: Error, mutateResponses: MutateResponses) => void): void;
+    /**
+     * Move the specified entry inbetween two specified entries (identified by their clientIds)
+     *
+     * @param entryToMove string - the song id to move
+     * @param entryBeforeClientId - optional clientId of playlist entry where to move song after
+     * @param entryAfterClientId - optional clientId of playlist entry where to move song before
+     * @param callback function(err, playlistEntries) - success callback
+     */
+    movePlayListEntry(entryToMove: string, entryBeforeClientId: string, entryAfterClientId: string, callback: (error: Error, mutateResponses: MutateResponses) => void): void;
 
-	/**
-	 * Increments track's playcount
-	 *
-	 * @param songId int - the song id. See http://bit.ly/1L4U6oK for id requirements.
-	 * @param callback function(err, mutationStatus) - success callback
-	 */
-	incrementTrackPlaycount(songId: string, callback: (error: Error, mutationStatus: MutateResponses) => void): void;
+    /**
+     * Increments track's playcount
+     *
+     * @param songId int - the song id. See http://bit.ly/1L4U6oK for id requirements.
+     * @param callback function(err, mutationStatus) - success callback
+     */
+    incrementTrackPlaycount(songId: string, callback: (error: Error, mutationStatus: MutateResponses) => void): void;
 
-	/**
-	 * Change metadata of a track a library
-	 * Currently only support changing rating
-	 * You need to change a song object with a different rating value:
-	 * 5 = thumb up, 1 = thumb down, 0 = no thumb
-	 *
-	 * @param song object - the track dictionary. You can get from getAllAccessTrack or from getLibrary
-	 * @param callback function(err, success) - success callback
-	 */
-	changeTrackMetadata(song: any, callback: (error: Error, success: MutateResponses) => void): void;
+    /**
+     * Change metadata of a track a library
+     * Currently only support changing rating
+     * You need to change a song object with a different rating value:
+     * 5 = thumb up, 1 = thumb down, 0 = no thumb
+     *
+     * @param song object - the track dictionary. You can get from getAllAccessTrack or from getLibrary
+     * @param callback function(err, success) - success callback
+     */
+    changeTrackMetadata(song: any, callback: (error: Error, success: MutateResponses) => void): void;
 
-	/**
-	 * Removes given entry ids from playlist entries.
-	 *
-	 * @param playlistItemIds string or array of string - the entry id(s). You can get this from getPlayListEntries or PlaylistItem#id.
-	 * @param callback function(error, mutateResponses) - success callback
-	 */
-	removePlayListEntry(playlistItemIds: string | string[], callback: (error: Error, mutateResponses: MutateResponses) => void): void;
+    /**
+     * Removes given entry ids from playlist entries.
+     *
+     * @param playlistItemIds string or array of string - the entry id(s). You can get this from getPlayListEntries or PlaylistItem#id.
+     * @param callback function(error, mutateResponses) - success callback
+     */
+    removePlayListEntry(playlistItemIds: string | string[], callback: (error: Error, mutateResponses: MutateResponses) => void): void;
 
-	/**
-	 * Returns tracks on all playlists.
-	 *
-	 * @param callback function(error, response) - success callback
-	 */
-	getPlayListEntries(callback: (error: Error, response: PlaylistResponse) => void): void;
+    /**
+     * Returns tracks on all playlists.
+     *
+     * @param callback function(error, response) - success callback
+     */
+    getPlayListEntries(callback: (error: Error, response: PlaylistResponse) => void): void;
 
-	/**
-	 * Returns tracks on all playlists.
-	 *
-	 * @param options object - parameters
-	 * @param callback function(error, response) - success callback
-	 */
-	getPlayListEntries(options: PlaylistOptions, callback: (error: Error, response: PlaylistResponse) => void): void;
+    /**
+     * Returns tracks on all playlists.
+     *
+     * @param options object - parameters
+     * @param callback function(error, response) - success callback
+     */
+    getPlayListEntries(options: PlaylistOptions, callback: (error: Error, response: PlaylistResponse) => void): void;
 }
diff --git a/types/playmusic/playmusic-tests.ts b/types/playmusic/playmusic-tests.ts
index 5cf98b35c0..1f8e49e0ab 100644
--- a/types/playmusic/playmusic-tests.ts
+++ b/types/playmusic/playmusic-tests.ts
@@ -3,355 +3,355 @@ import PlayMusic, * as pm from "playmusic";
 const instance = new PlayMusic();
 
 instance.init({
-	androidId: "androidId",
-	email: "email",
-	password: "password",
-	masterToken: "masterToken"
+    androidId: "androidId",
+    email: "email",
+    password: "password",
+    masterToken: "masterToken"
 }, (error: Error) => {
-	console.log(error.message);
-	console.log(error.name);
+    console.log(error.message);
+    console.log(error.name);
 });
 
 instance.login({
-	androidId: "androidId",
-	email: "email",
-	password: "password"
+    androidId: "androidId",
+    email: "email",
+    password: "password"
 }, (error: Error, loginResponse: pm.LoginResponse) => {
-	console.log(error.message);
-	console.log(error.name);
-	console.log(loginResponse.androidId);
-	console.log(loginResponse.masterToken);
+    console.log(error.message);
+    console.log(error.name);
+    console.log(loginResponse.androidId);
+    console.log(loginResponse.masterToken);
 });
 
 instance.getSettings((error: Error, response: any) => {
-	console.log(error.message);
-	console.log(error.name);
+    console.log(error.message);
+    console.log(error.name);
 });
 
 instance.getLibrary((error: Error, response: pm.LibraryResponse) => {
-	console.log(error.message);
-	console.log(error.name);
+    console.log(error.message);
+    console.log(error.name);
 });
 
 instance.getLibrary({
-	limit: 123,
-	nextPageToken: "nextPageToken"
+    limit: 123,
+    nextPageToken: "nextPageToken"
 }, (error: Error, response: pm.LibraryResponse) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (response && response.data && response.data.items) {
-		response.data.items.forEach((item: pm.LibraryItem) => {
-			console.log(item.album);
-			console.log(item.albumArtist);
-			if (item.albumArtRef) {
-				console.log(item.albumArtRef[0].url);
-			}
-			console.log(item.artist);
-			if (item.artistArtRef) {
-				console.log(item.artistArtRef[0].url);
-			}
-			if (item.artistId) {
-				console.log(item.artistId.length);
-			}
-			console.log(item.beatsPerMinute);
-			console.log(item.clientId);
-			console.log(item.comment);
-			console.log(item.composer);
-			console.log(item.creationTimestamp);
-			console.log(item.deleted);
-			console.log(item.discNumber);
-			console.log(item.durationMillis);
-			console.log(item.estimatedSize);
-			console.log(item.genre);
-			console.log(item.id);
-			console.log(item.kind);
-			console.log(item.lastModifiedTimestamp);
-			console.log(item.nid);
-			console.log(item.playCount);
-			console.log(item.rating);
-			console.log(item.recentTimestamp);
-			console.log(item.storeId);
-			console.log(item.title);
-			console.log(item.totalDiscCount);
-			console.log(item.totalTrackCount);
-			console.log(item.trackNumber);
-			console.log(item.year);
-		});
-	}
-	console.log(response.kind);
-	console.log(response.nextPageToken);
+    console.log(error.message);
+    console.log(error.name);
+    if (response && response.data && response.data.items) {
+        response.data.items.forEach((item: pm.LibraryItem) => {
+            console.log(item.album);
+            console.log(item.albumArtist);
+            if (item.albumArtRef) {
+                console.log(item.albumArtRef[0].url);
+            }
+            console.log(item.artist);
+            if (item.artistArtRef) {
+                console.log(item.artistArtRef[0].url);
+            }
+            if (item.artistId) {
+                console.log(item.artistId.length);
+            }
+            console.log(item.beatsPerMinute);
+            console.log(item.clientId);
+            console.log(item.comment);
+            console.log(item.composer);
+            console.log(item.creationTimestamp);
+            console.log(item.deleted);
+            console.log(item.discNumber);
+            console.log(item.durationMillis);
+            console.log(item.estimatedSize);
+            console.log(item.genre);
+            console.log(item.id);
+            console.log(item.kind);
+            console.log(item.lastModifiedTimestamp);
+            console.log(item.nid);
+            console.log(item.playCount);
+            console.log(item.rating);
+            console.log(item.recentTimestamp);
+            console.log(item.storeId);
+            console.log(item.title);
+            console.log(item.totalDiscCount);
+            console.log(item.totalTrackCount);
+            console.log(item.trackNumber);
+            console.log(item.year);
+        });
+    }
+    console.log(response.kind);
+    console.log(response.nextPageToken);
 });
 
 instance.getStreamUrl("id", (error: Error, streamUrl: string) => {
-	console.log(error.message);
-	console.log(error.name);
-	console.log(streamUrl);
+    console.log(error.message);
+    console.log(error.name);
+    console.log(streamUrl);
 });
 
 instance.getStream("id", (error: Error, stream: any) => {
-	console.log(error.message);
-	console.log(error.name);
-	console.log(stream);
+    console.log(error.message);
+    console.log(error.name);
+    console.log(stream);
 });
 
 instance.search("text", 123, (error: Error, searchResults: any) => {
-	console.log(error.message);
-	console.log(error.name);
-	console.log(searchResults);
+    console.log(error.message);
+    console.log(error.name);
+    console.log(searchResults);
 });
 
 instance.getPlayLists((error: Error, response: pm.PlaylistListResponse) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (response && response.data && response.data.items) {
-		response.data.items.forEach((item: pm.PlaylistListItem) => {
-			console.log(item.accessControlled);
-			console.log(item.creationTimestamp);
-			console.log(item.deleted);
-			console.log(item.description);
-			console.log(item.id);
-			console.log(item.kind);
-			console.log(item.lastModifiedTimestamp);
-			console.log(item.name);
-			console.log(item.ownerName);
-			console.log(item.ownerProfilePhotoUrl);
-			console.log(item.recentTimestamp);
-			console.log(item.shareToken);
-			console.log(item.type);
-		});
-	}
-	console.log(response.kind);
+    console.log(error.message);
+    console.log(error.name);
+    if (response && response.data && response.data.items) {
+        response.data.items.forEach((item: pm.PlaylistListItem) => {
+            console.log(item.accessControlled);
+            console.log(item.creationTimestamp);
+            console.log(item.deleted);
+            console.log(item.description);
+            console.log(item.id);
+            console.log(item.kind);
+            console.log(item.lastModifiedTimestamp);
+            console.log(item.name);
+            console.log(item.ownerName);
+            console.log(item.ownerProfilePhotoUrl);
+            console.log(item.recentTimestamp);
+            console.log(item.shareToken);
+            console.log(item.type);
+        });
+    }
+    console.log(response.kind);
 });
 
 instance.addPlayList("playlistName", (error: Error, mutateResponses: pm.MutateResponses) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (mutateResponses && mutateResponses.mutate_response) {
-		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
-			console.log(mutateResponse.client_id);
-			console.log(mutateResponse.id);
-			console.log(mutateResponse.response_code);
-		});
-	}
+    console.log(error.message);
+    console.log(error.name);
+    if (mutateResponses && mutateResponses.mutate_response) {
+        mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+            console.log(mutateResponse.client_id);
+            console.log(mutateResponse.id);
+            console.log(mutateResponse.response_code);
+        });
+    }
 });
 
 instance.deletePlaylist("playlistId", (error: Error, mutateResponses: pm.MutateResponses) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (mutateResponses && mutateResponses.mutate_response) {
-		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
-			console.log(mutateResponse.client_id);
-			console.log(mutateResponse.id);
-			console.log(mutateResponse.response_code);
-		});
-	}
+    console.log(error.message);
+    console.log(error.name);
+    if (mutateResponses && mutateResponses.mutate_response) {
+        mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+            console.log(mutateResponse.client_id);
+            console.log(mutateResponse.id);
+            console.log(mutateResponse.response_code);
+        });
+    }
 });
 
 instance.updatePlayListMeta("playlistId", {
-	name: "name",
-	description: "description",
-	shareState: "shareState"
+    name: "name",
+    description: "description",
+    shareState: "shareState"
 }, (error: Error, mutateResponses: pm.MutateResponses) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (mutateResponses && mutateResponses.mutate_response) {
-		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
-			console.log(mutateResponse.client_id);
-			console.log(mutateResponse.id);
-			console.log(mutateResponse.response_code);
-		});
-	}
+    console.log(error.message);
+    console.log(error.name);
+    if (mutateResponses && mutateResponses.mutate_response) {
+        mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+            console.log(mutateResponse.client_id);
+            console.log(mutateResponse.id);
+            console.log(mutateResponse.response_code);
+        });
+    }
 });
 
 instance.addTrackToPlayList("songId", "playlistId", (error: Error, mutateResponses: pm.MutateResponses) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (mutateResponses && mutateResponses.mutate_response) {
-		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
-			console.log(mutateResponse.client_id);
-			console.log(mutateResponse.id);
-			console.log(mutateResponse.response_code);
-		});
-	}
+    console.log(error.message);
+    console.log(error.name);
+    if (mutateResponses && mutateResponses.mutate_response) {
+        mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+            console.log(mutateResponse.client_id);
+            console.log(mutateResponse.id);
+            console.log(mutateResponse.response_code);
+        });
+    }
 }, "entryBeforeClientId", "entryAfterClientId");
 
 instance.addTrackToPlayList(["songId1", "songId2"], "playlistId", (error: Error, mutateResponses: pm.MutateResponses) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (mutateResponses && mutateResponses.mutate_response) {
-		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
-			console.log(mutateResponse.client_id);
-			console.log(mutateResponse.id);
-			console.log(mutateResponse.response_code);
-		});
-	}
+    console.log(error.message);
+    console.log(error.name);
+    if (mutateResponses && mutateResponses.mutate_response) {
+        mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+            console.log(mutateResponse.client_id);
+            console.log(mutateResponse.id);
+            console.log(mutateResponse.response_code);
+        });
+    }
 }, "entryBeforeClientId", "entryAfterClientId");
 
 instance.movePlayListEntry("entryToMove", "entryBeforeClientId", "entryAfterClientId", (error: Error, mutateResponses: pm.MutateResponses) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (mutateResponses && mutateResponses.mutate_response) {
-		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
-			console.log(mutateResponse.client_id);
-			console.log(mutateResponse.id);
-			console.log(mutateResponse.response_code);
-		});
-	}
+    console.log(error.message);
+    console.log(error.name);
+    if (mutateResponses && mutateResponses.mutate_response) {
+        mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+            console.log(mutateResponse.client_id);
+            console.log(mutateResponse.id);
+            console.log(mutateResponse.response_code);
+        });
+    }
 });
 
 instance.incrementTrackPlaycount("songId", (error: Error, mutateResponses: pm.MutateResponses) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (mutateResponses && mutateResponses.mutate_response) {
-		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
-			console.log(mutateResponse.client_id);
-			console.log(mutateResponse.id);
-			console.log(mutateResponse.response_code);
-		});
-	}
+    console.log(error.message);
+    console.log(error.name);
+    if (mutateResponses && mutateResponses.mutate_response) {
+        mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+            console.log(mutateResponse.client_id);
+            console.log(mutateResponse.id);
+            console.log(mutateResponse.response_code);
+        });
+    }
 });
 
 instance.changeTrackMetadata({ }, (error: Error, mutateResponses: pm.MutateResponses) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (mutateResponses && mutateResponses.mutate_response) {
-		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
-			console.log(mutateResponse.client_id);
-			console.log(mutateResponse.id);
-			console.log(mutateResponse.response_code);
-		});
-	}
+    console.log(error.message);
+    console.log(error.name);
+    if (mutateResponses && mutateResponses.mutate_response) {
+        mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+            console.log(mutateResponse.client_id);
+            console.log(mutateResponse.id);
+            console.log(mutateResponse.response_code);
+        });
+    }
 });
 
 instance.removePlayListEntry("playlistItemId", (error: Error, mutateResponses: pm.MutateResponses) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (mutateResponses && mutateResponses.mutate_response) {
-		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
-			console.log(mutateResponse.client_id);
-			console.log(mutateResponse.id);
-			console.log(mutateResponse.response_code);
-		});
-	}
+    console.log(error.message);
+    console.log(error.name);
+    if (mutateResponses && mutateResponses.mutate_response) {
+        mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+            console.log(mutateResponse.client_id);
+            console.log(mutateResponse.id);
+            console.log(mutateResponse.response_code);
+        });
+    }
 });
 
 instance.removePlayListEntry(["playlistItemId1", "playlistItemId2"], (error: Error, mutateResponses: pm.MutateResponses) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (mutateResponses && mutateResponses.mutate_response) {
-		mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
-			console.log(mutateResponse.client_id);
-			console.log(mutateResponse.id);
-			console.log(mutateResponse.response_code);
-		});
-	}
+    console.log(error.message);
+    console.log(error.name);
+    if (mutateResponses && mutateResponses.mutate_response) {
+        mutateResponses.mutate_response.forEach((mutateResponse: pm.MutateResponse) => {
+            console.log(mutateResponse.client_id);
+            console.log(mutateResponse.id);
+            console.log(mutateResponse.response_code);
+        });
+    }
 });
 
 instance.getPlayListEntries((error: Error, response: pm.PlaylistResponse) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (response && response.data && response.data.items) {
-		response.data.items.forEach((item: pm.PlaylistItem) => {
-			console.log(item.absolutePosition);
-			console.log(item.clientId);
-			console.log(item.creationTimestamp);
-			console.log(item.deleted);
-			console.log(item.id);
-			console.log(item.kind);
-			console.log(item.lastModifiedTimestamp);
-			console.log(item.playlistId);
-			console.log(item.source);
-			if (item.track) {
-				console.log(item.track.album);
-				console.log(item.track.albumArtist);
-				if (item.track.albumArtRef) {
-					console.log(item.track.albumArtRef[0].url);
-				}
-				console.log(item.track.albumAvailableForPurchase);
-				console.log(item.track.albumId);
-				console.log(item.track.artist);
-				if (item.track.artistArtRef) {
-					console.log(item.track.artistArtRef[0].url);
-				}
-				if (item.track.artistId) {
-					console.log(item.track.artistId.length);
-				}
-				console.log(item.track.composer);
-				console.log(item.track.contentType);
-				console.log(item.track.discNumber);
-				console.log(item.track.durationMillis);
-				console.log(item.track.estimatedSize);
-				console.log(item.track.genre);
-				console.log(item.track.kind);
-				console.log(item.track.nid);
-				console.log(item.track.playCount);
-				console.log(item.track.storeId);
-				console.log(item.track.title);
-				console.log(item.track.trackAvailableForPurchase);
-				console.log(item.track.trackAvailableForSubscription);
-				console.log(item.track.trackNumber);
-				console.log(item.track.trackType);
-				console.log(item.track.year);
-			}
-			console.log(item.trackId);
-		});
-	}
-	console.log(response.kind);
-	console.log(response.nextPageToken);
+    console.log(error.message);
+    console.log(error.name);
+    if (response && response.data && response.data.items) {
+        response.data.items.forEach((item: pm.PlaylistItem) => {
+            console.log(item.absolutePosition);
+            console.log(item.clientId);
+            console.log(item.creationTimestamp);
+            console.log(item.deleted);
+            console.log(item.id);
+            console.log(item.kind);
+            console.log(item.lastModifiedTimestamp);
+            console.log(item.playlistId);
+            console.log(item.source);
+            if (item.track) {
+                console.log(item.track.album);
+                console.log(item.track.albumArtist);
+                if (item.track.albumArtRef) {
+                    console.log(item.track.albumArtRef[0].url);
+                }
+                console.log(item.track.albumAvailableForPurchase);
+                console.log(item.track.albumId);
+                console.log(item.track.artist);
+                if (item.track.artistArtRef) {
+                    console.log(item.track.artistArtRef[0].url);
+                }
+                if (item.track.artistId) {
+                    console.log(item.track.artistId.length);
+                }
+                console.log(item.track.composer);
+                console.log(item.track.contentType);
+                console.log(item.track.discNumber);
+                console.log(item.track.durationMillis);
+                console.log(item.track.estimatedSize);
+                console.log(item.track.genre);
+                console.log(item.track.kind);
+                console.log(item.track.nid);
+                console.log(item.track.playCount);
+                console.log(item.track.storeId);
+                console.log(item.track.title);
+                console.log(item.track.trackAvailableForPurchase);
+                console.log(item.track.trackAvailableForSubscription);
+                console.log(item.track.trackNumber);
+                console.log(item.track.trackType);
+                console.log(item.track.year);
+            }
+            console.log(item.trackId);
+        });
+    }
+    console.log(response.kind);
+    console.log(response.nextPageToken);
 });
 
 instance.getPlayListEntries({
-	limit: 123,
-	nextPageToken: "nextPageToken"
+    limit: 123,
+    nextPageToken: "nextPageToken"
 }, (error: Error, response: pm.PlaylistResponse) => {
-	console.log(error.message);
-	console.log(error.name);
-	if (response && response.data && response.data.items) {
-		response.data.items.forEach((item: pm.PlaylistItem) => {
-			console.log(item.absolutePosition);
-			console.log(item.clientId);
-			console.log(item.creationTimestamp);
-			console.log(item.deleted);
-			console.log(item.id);
-			console.log(item.kind);
-			console.log(item.lastModifiedTimestamp);
-			console.log(item.playlistId);
-			console.log(item.source);
-			if (item.track) {
-				console.log(item.track.album);
-				console.log(item.track.albumArtist);
-				if (item.track.albumArtRef) {
-					console.log(item.track.albumArtRef[0].url);
-				}
-				console.log(item.track.albumAvailableForPurchase);
-				console.log(item.track.albumId);
-				console.log(item.track.artist);
-				if (item.track.artistArtRef) {
-					console.log(item.track.artistArtRef[0].url);
-				}
-				if (item.track.artistId) {
-					console.log(item.track.artistId.length);
-				}
-				console.log(item.track.composer);
-				console.log(item.track.contentType);
-				console.log(item.track.discNumber);
-				console.log(item.track.durationMillis);
-				console.log(item.track.estimatedSize);
-				console.log(item.track.genre);
-				console.log(item.track.kind);
-				console.log(item.track.nid);
-				console.log(item.track.playCount);
-				console.log(item.track.storeId);
-				console.log(item.track.title);
-				console.log(item.track.trackAvailableForPurchase);
-				console.log(item.track.trackAvailableForSubscription);
-				console.log(item.track.trackNumber);
-				console.log(item.track.trackType);
-				console.log(item.track.year);
-			}
-			console.log(item.trackId);
-		});
-	}
-	console.log(response.kind);
-	console.log(response.nextPageToken);
+    console.log(error.message);
+    console.log(error.name);
+    if (response && response.data && response.data.items) {
+        response.data.items.forEach((item: pm.PlaylistItem) => {
+            console.log(item.absolutePosition);
+            console.log(item.clientId);
+            console.log(item.creationTimestamp);
+            console.log(item.deleted);
+            console.log(item.id);
+            console.log(item.kind);
+            console.log(item.lastModifiedTimestamp);
+            console.log(item.playlistId);
+            console.log(item.source);
+            if (item.track) {
+                console.log(item.track.album);
+                console.log(item.track.albumArtist);
+                if (item.track.albumArtRef) {
+                    console.log(item.track.albumArtRef[0].url);
+                }
+                console.log(item.track.albumAvailableForPurchase);
+                console.log(item.track.albumId);
+                console.log(item.track.artist);
+                if (item.track.artistArtRef) {
+                    console.log(item.track.artistArtRef[0].url);
+                }
+                if (item.track.artistId) {
+                    console.log(item.track.artistId.length);
+                }
+                console.log(item.track.composer);
+                console.log(item.track.contentType);
+                console.log(item.track.discNumber);
+                console.log(item.track.durationMillis);
+                console.log(item.track.estimatedSize);
+                console.log(item.track.genre);
+                console.log(item.track.kind);
+                console.log(item.track.nid);
+                console.log(item.track.playCount);
+                console.log(item.track.storeId);
+                console.log(item.track.title);
+                console.log(item.track.trackAvailableForPurchase);
+                console.log(item.track.trackAvailableForSubscription);
+                console.log(item.track.trackNumber);
+                console.log(item.track.trackType);
+                console.log(item.track.year);
+            }
+            console.log(item.trackId);
+        });
+    }
+    console.log(response.kind);
+    console.log(response.nextPageToken);
 });

From 1a3679e14cd0e4fe2092c7eb9cbe3a9bfeae8168 Mon Sep 17 00:00:00 2001
From: Justin Simms <526791+jhsimms@users.noreply.github.com>
Date: Mon, 26 Feb 2018 13:28:41 -0600
Subject: [PATCH 283/388] Hapi 17: Fix inability to augment server.plugins type
 (#23855)

* Fix inability to augment server.plugins type

* Replacing more 'any' types and other misc fixes

* Change server.inject to use ApplicationState
---
 types/hapi/index.d.ts                     | 37 +++++++++++++++++++----
 types/hapi/test/request/query.ts          | 13 ++++----
 types/hapi/test/route/route-options.ts    | 12 +++++++-
 types/hapi/test/server/server-app.ts      |  2 +-
 types/hapi/test/server/server-expose.ts   | 14 +++++++++
 types/hapi/test/server/server-inject.ts   | 13 ++++++++
 types/hapi/test/server/server-method.ts   |  3 +-
 types/hapi/test/server/server-options.ts  |  8 +++++
 types/hapi/test/server/server-plugins.ts  |  9 ++++++
 types/hapi/test/server/server-settings.ts |  6 ++++
 10 files changed, 101 insertions(+), 16 deletions(-)

diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 01586dd3bf..aebef5e5d8 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -334,6 +334,10 @@ export interface RequestLog {
     channel: string;
 }
 
+export interface RequestQuery {
+    [key: string]: string | string[];
+}
+
 /**
  * The request object is created internally for each incoming request. It is not the same object received from the node
  * HTTP server callback (which is available via [request.raw.req](https://github.com/hapijs/hapi/blob/master/API.md#request.raw)). The request properties change throughout
@@ -464,7 +468,7 @@ export interface Request extends Podium {
      * By default the object outputted from node's URL parse() method. Might also be set indirectly via request.setUrl in which case it may be a string (if url is set to an object with the query
      * attribute as an unparsed string).
      */
-    readonly query: any;
+    readonly query: RequestQuery | string;
 
     /**
      * An object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.
@@ -1629,6 +1633,13 @@ export interface RouteOptionsValidate {
  */
 export type RouteCompressionEncoderSettings = object;
 
+/**
+ * Empty interface to allow for user-defined augmentations.
+ */
+/* tslint:disable-next-line:no-empty-interface */
+export interface RouteOptionsApp {
+}
+
 /**
  * Each route can be customized to change the default behavior of the request lifecycle.
  * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#route-options)
@@ -1638,7 +1649,7 @@ export interface RouteOptions {
      * Application-specific route configuration state. Should not be used by plugins which should use options.plugins[name] instead.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionsapp)
      */
-    app?: any;
+    app?: RouteOptionsApp;
 
     /**
      * Route authentication configuration. Value can be:
@@ -2574,7 +2585,7 @@ export interface ServerInjectOptions extends Shot.RequestOptions {
     /**
      * sets the initial value of request.app, defaults to {}.
      */
-    app?: any;
+    app?: ApplicationState;
     /**
      * sets the initial value of request.plugins, defaults to {}.
      */
@@ -2656,7 +2667,7 @@ export interface ServerMethodOptions {
      * unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which
      * takes the same arguments as the function and returns a unique string (or null if no key can be generated).
      */
-    generateKey?: (...args: any[]) => any;
+    generateKey?: (...args: any[]) => string | null;
 }
 
 /**
@@ -2710,6 +2721,13 @@ export interface ServerOptionsCompression {
     minBytes: number;
 }
 
+/**
+ * Empty interface to allow for custom augmentation.
+ */
+/* tslint:disable-next-line:no-empty-interface */
+export interface ServerOptionsApp {
+}
+
 /**
  * The server options control the behavior of the server object. Note that the options object is deeply cloned
  * (with the exception of listener which is shallowly copied) and should not contain any values that are unsafe to perform deep copy on.
@@ -2732,7 +2750,7 @@ export interface ServerOptions {
      * state.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serveroptionsapp)
      */
-    app?: any;
+    app?: ServerOptionsApp;
 
     /**
      * Default value: true.
@@ -3212,6 +3230,13 @@ export interface HandlerDecorationMethod {
  */
 export type DecorationMethod<T> = (this: T, ...args: any[]) => any;
 
+/**
+ * An empty interface to allow typings of custom plugin properties.
+ */
+/* tslint:disable-next-line:no-empty-interface */
+export interface PluginProperties {
+}
+
 /**
  * The server object is the main application container. The server manages all incoming requests along with all
  * the facilities provided by the framework. Each server supports a single connection (e.g. listen to port 80).
@@ -3363,7 +3388,7 @@ export class Server extends Podium {
      * the server.plugins[name] object directly or via the server.expose() method.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverplugins)
      */
-    plugins: any;
+    plugins: PluginProperties;
 
     /**
      * The realm object contains sandboxed server settings specific to each plugin or authentication strategy. When
diff --git a/types/hapi/test/request/query.ts b/types/hapi/test/request/query.ts
index c67381f1b9..090ab3ae8d 100644
--- a/types/hapi/test/request/query.ts
+++ b/types/hapi/test/request/query.ts
@@ -1,14 +1,17 @@
 // Added test in addition to docs, for request.query
-import { Lifecycle, Request, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
+import { Lifecycle, Request, RequestQuery, ResponseToolkit, Server, ServerOptions, ServerRoute } from "hapi";
 
 const options: ServerOptions = {
     port: 8000,
 };
 
 const handlerFn: Lifecycle.Method = (request, h) => {
-    const query = request.query as GetThingQuery;
+    const query1 = request.query as string;
+    console.log(query1);
+
+    const query2 = request.query as RequestQuery;
     // http://localhost:8000/?name=test
-    return `You asked for ${query.name}`;
+    return `You asked for ${query2.name}`;
 };
 
 const serverRoute: ServerRoute = {
@@ -17,10 +20,6 @@ const serverRoute: ServerRoute = {
     handler: handlerFn
 };
 
-interface GetThingQuery {
-    name: string;
-}
-
 const server = new Server(options);
 server.route(serverRoute);
 server.start();
diff --git a/types/hapi/test/route/route-options.ts b/types/hapi/test/route/route-options.ts
index 96237debd8..d114154e60 100644
--- a/types/hapi/test/route/route-options.ts
+++ b/types/hapi/test/route/route-options.ts
@@ -102,8 +102,18 @@ const routeOptionsValidate: RouteOptionsValidate = {
     query: true,
 };
 
+declare module 'hapi' {
+    interface RouteOptionsApp {
+        one: number;
+        two: string;
+    }
+}
+
 const routeOptions: RouteOptions = {
-    app: {},
+    app: {
+        one: 1,
+        two: "2"
+    },
     auth: routeOptionsAccess,
     bind: null,
     cache: {
diff --git a/types/hapi/test/server/server-app.ts b/types/hapi/test/server/server-app.ts
index f51ad7ca12..8e9cff88b0 100644
--- a/types/hapi/test/server/server-app.ts
+++ b/types/hapi/test/server/server-app.ts
@@ -8,7 +8,7 @@ const options: ServerOptions = {
 declare module "hapi" {
 	// Demonstrate augmenting the application state.
 	interface ApplicationState {
-		key: string;
+		key?: string;
 	}
 }
 
diff --git a/types/hapi/test/server/server-expose.ts b/types/hapi/test/server/server-expose.ts
index c1a698b6c7..43d6cfdaa6 100644
--- a/types/hapi/test/server/server-expose.ts
+++ b/types/hapi/test/server/server-expose.ts
@@ -1,6 +1,17 @@
 // https://github.com/hapijs/hapi/blob/master/API.md#-serverplugins
 import { Plugin, Server, ServerRegisterOptions } from "hapi";
 
+declare module 'hapi' {
+	interface PluginProperties {
+		example1: {
+			util(): void;
+		};
+		example2: {
+			util(): void;
+		};
+	}
+}
+
 const plugin1: Plugin<any> = {
     name: 'example1',
     async register(server: Server, options: ServerRegisterOptions) {
@@ -22,3 +33,6 @@ const server = new Server({
 server.start();
 server.register(plugin1);
 server.register(plugin2);
+
+server.plugins.example1.util();
+server.plugins.example2.util();
diff --git a/types/hapi/test/server/server-inject.ts b/types/hapi/test/server/server-inject.ts
index 5c7942c16a..a2ae777a71 100644
--- a/types/hapi/test/server/server-inject.ts
+++ b/types/hapi/test/server/server-inject.ts
@@ -17,3 +17,16 @@ server.route(serverRoute);
 server.start();
 
 server.inject('/').then(res => console.log(res.result));
+
+declare module 'hapi' {
+	interface ApplicationState {
+		injectState?: number;
+	}
+}
+
+server.inject({
+	url: "test",
+	app: {
+		injectState: 1
+	}
+});
diff --git a/types/hapi/test/server/server-method.ts b/types/hapi/test/server/server-method.ts
index 2d2b3bdf58..bb729516b7 100644
--- a/types/hapi/test/server/server-method.ts
+++ b/types/hapi/test/server/server-method.ts
@@ -17,7 +17,8 @@ const methodObject: ServerMethodConfigurationObject = {
         cache: {
             expiresIn: 2000,
             generateTimeout: 100
-        }
+        },
+        generateKey: (a: string | undefined) => a === undefined ? null : a
     }
 };
 
diff --git a/types/hapi/test/server/server-options.ts b/types/hapi/test/server/server-options.ts
index ce487bbb20..030c721103 100644
--- a/types/hapi/test/server/server-options.ts
+++ b/types/hapi/test/server/server-options.ts
@@ -54,6 +54,14 @@ const routeOptions: RouteOptions = {
     },
 };
 
+declare module 'hapi' {
+    interface ServerOptionsApp {
+        key1?: string;
+        key2?: string;
+        any_thing?: string;
+    }
+}
+
 const options: ServerOptions = {
     address: '0.0.0.0',
     app: {
diff --git a/types/hapi/test/server/server-plugins.ts b/types/hapi/test/server/server-plugins.ts
index 970b53fb6d..7f3d194f84 100644
--- a/types/hapi/test/server/server-plugins.ts
+++ b/types/hapi/test/server/server-plugins.ts
@@ -13,6 +13,15 @@ interface Plugin3 {
 	three: 3;
 }
 
+declare module 'hapi' {
+	interface PluginProperties {
+		example: {
+			other: string;
+			key: string;
+		};
+	}
+}
+
 const plugin1: Plugin<Plugin1> = {
     name: 'plugin1',
     register: async (server: Server, options: Plugin1) => {
diff --git a/types/hapi/test/server/server-settings.ts b/types/hapi/test/server/server-settings.ts
index 488e31629b..f0619d95da 100644
--- a/types/hapi/test/server/server-settings.ts
+++ b/types/hapi/test/server/server-settings.ts
@@ -1,6 +1,12 @@
 // https://github.com/hapijs/hapi/blob/master/API.md#-serversettings
 import { Server } from "hapi";
 
+declare module 'hapi' {
+	interface ServerOptionsApp {
+		key?: string;
+	}
+}
+
 const server = new Server({
     port: 8000,
     app: {

From 1ac7e292449bff6b2547915a23e77b1744974f84 Mon Sep 17 00:00:00 2001
From: Alexander Marks <aomarks@google.com>
Date: Mon, 26 Feb 2018 11:28:57 -0800
Subject: [PATCH 284/388] Add EOL to WriteOptions. (#23831)

Added in 4.0.2: https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md#402--2017-09-12
Documented here: https://github.com/jprichardson/node-fs-extra/blob/master/docs/writeJson.md
---
 types/fs-extra/index.d.ts    | 1 +
 types/fs-extra/v4/index.d.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/types/fs-extra/index.d.ts b/types/fs-extra/index.d.ts
index f556afa82f..6183dce393 100644
--- a/types/fs-extra/index.d.ts
+++ b/types/fs-extra/index.d.ts
@@ -290,6 +290,7 @@ export interface WriteOptions extends WriteFileOptions {
     fs?: object;
     replacer?: any;
     spaces?: number | string;
+    EOL?: string;
 }
 
 export interface ReadResult {
diff --git a/types/fs-extra/v4/index.d.ts b/types/fs-extra/v4/index.d.ts
index 575df86b4d..e5180a7a94 100644
--- a/types/fs-extra/v4/index.d.ts
+++ b/types/fs-extra/v4/index.d.ts
@@ -290,6 +290,7 @@ export interface WriteOptions extends WriteFileOptions {
     fs?: object;
     replacer?: any;
     spaces?: number | string;
+    EOL?: string;
 }
 
 export interface ReadResult {

From eac2d77cbb4684c24408e14f3fa5c8adfa1407bc Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 26 Feb 2018 11:31:09 -0800
Subject: [PATCH 285/388] fix version

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

diff --git a/types/react-truncate/index.d.ts b/types/react-truncate/index.d.ts
index 54618a9a8e..15c72616c0 100644
--- a/types/react-truncate/index.d.ts
+++ b/types/react-truncate/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-truncate 2.3.0
+// Type definitions for react-truncate 2.3
 // Project: https://github.com/One-com/react-truncate
 // Definitions by: Matt Perry <https://github.com/mattvperry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From bf37dfddd26c24b50d846b1a58bb7ea15a1ef212 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 26 Feb 2018 11:32:59 -0800
Subject: [PATCH 286/388] web-animations-js: Make compatible with
 TypeScript@2.7 (#23793)

---
 types/web-animations-js/index.d.ts | 66 ++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/types/web-animations-js/index.d.ts b/types/web-animations-js/index.d.ts
index 2424e93e92..54c0b8c01b 100644
--- a/types/web-animations-js/index.d.ts
+++ b/types/web-animations-js/index.d.ts
@@ -5,13 +5,12 @@
 
 type AnimationEffectTimingFillMode = "none" | "forwards" | "backwards" | "both" | "auto";
 type AnimationEffectTimingPlaybackDirection = "normal" | "reverse" | "alternate" | "alternate-reverse";
-type AnimationPlayState = "idle" | "pending" | "running" | "paused" | "finished";
+type AnimationPlayState = "idle" | "running" | "paused" | "finished";
 
-declare class AnimationPlaybackEvent {
-    constructor(target: Animation, currentTime: number, timelineTime: number);
+interface AnimationPlaybackEvent {
     target: Animation;
-    currentTime: number;
-    timelineTime: number;
+    readonly currentTime: number | null;
+    readonly timelineTime: number |  null;
     type: string;
     bubbles: boolean;
     cancelable: boolean;
@@ -21,14 +20,26 @@ declare class AnimationPlaybackEvent {
     timeStamp: number;
 }
 
+interface AnimationPlaybackEventInit extends EventInit {
+    currentTime?: number | null;
+    timelineTime?: number | null;
+}
+
+declare var AnimationPlaybackEvent: {
+    prototype: AnimationPlaybackEvent;
+    new(type: string, eventInitDict?: AnimationPlaybackEventInit): AnimationPlaybackEvent;
+};
+
 interface AnimationKeyFrame {
-    easing?: string;
-    offset?: number;
-    [key: string]: string | number | [string | number, string | number] | undefined;
+    easing?: string | string[];
+    offset?: number | Array<number | null> | null;
+    opacity?: number | number[];
+    transform?: string |  string[];
+    // [key: string]: string | number | [string | number, string | number] | undefined; (duplicate string indexer in TypeScript 2.7+)
 }
 
 interface AnimationTimeline {
-    currentTime: number;
+    readonly currentTime: number | null;
     getAnimations(): Animation[];
     play(effect: KeyframeEffect): Animation;
 }
@@ -43,21 +54,35 @@ interface AnimationEffectTiming {
     iterations?: number;
     playbackRate?: number;
 }
-declare class KeyframeEffect {
+
+interface AnimationEffectReadOnly {
+    readonly timing: number;
+    getComputedTiming(): ComputedTimingProperties;
+}
+
+interface ComputedTimingProperties {
+    endTime: number;
+    activeDuration: number;
+    localTime: number | null;
+    progress: number | null;
+    currentIteration: number | null;
+}
+
+declare class KeyframeEffect implements AnimationEffectReadOnly {
     constructor(target: HTMLElement, effect: AnimationKeyFrame | AnimationKeyFrame[], timing: number | AnimationEffectTiming, id?: string);
     activeDuration: number;
     onsample: (timeFraction: number | null, effect: KeyframeEffect, animation: Animation) => void | undefined;
     parent: KeyframeEffect | null;
     target: HTMLElement;
-    timing: AnimationEffectTiming;
+    timing: number;
+    getComputedTiming(): ComputedTimingProperties;
     getFrames(): AnimationKeyFrame[];
     remove(): void;
 }
-type AnimationEventListener = (evt: AnimationPlaybackEvent) => void;
+type AnimationEventListener = (this: Animation, evt: AnimationPlaybackEvent) => any;
 
-declare class Animation {
-    constructor(effect: KeyframeEffect, timeline?: AnimationTimeline);
-    currentTime: number;
+interface Animation extends EventTarget {
+    currentTime: number | null;
     id: string;
     oncancel: AnimationEventListener;
     onfinish: AnimationEventListener;
@@ -69,14 +94,19 @@ declare class Animation {
     pause(): void;
     play(): void;
     reverse(): void;
-    addEventListener(type: "finish" | "cancel", handler: AnimationEventListener): void;
-    removeEventListener(type: "finish" | "cancel", handler: AnimationEventListener): void;
-    effect: KeyframeEffect;
+    addEventListener(type: "finish" | "cancel", handler: EventListener): void;
+    removeEventListener(type: "finish" | "cancel", handler: EventListener): void;
+    effect: AnimationEffectReadOnly;
     readonly finished: Promise<Animation>;
     readonly ready: Promise<Animation>;
     timeline: AnimationTimeline;
 }
 
+declare var Animation: {
+    prototype: Animation;
+    new(effect?: AnimationEffectReadOnly, timeline?: AnimationTimeline): Animation;
+};
+
 declare class SequenceEffect extends KeyframeEffect {
     constructor(effects: KeyframeEffect[]);
 }

From 317dfc327ab3c90da8ee6501b96a46d35bb06da0 Mon Sep 17 00:00:00 2001
From: Muhammad Fawwaz Orabi <mfawwaz93@gmail.com>
Date: Mon, 26 Feb 2018 21:41:38 +0200
Subject: [PATCH 287/388] Add type definitions for react-redux-epic (#23823)

* Add type definitions for react-redux-epic

* Require TS 2.6

* Add package.json

* Trigger CI

* Address feedback

* Add tests

* Remove unnecessary type paramerters

* Fix lint issues

* Re-add generics
---
 types/react-redux-epic/client.d.ts            |  7 +++++
 types/react-redux-epic/index.d.ts             | 22 ++++++++++++++++
 types/react-redux-epic/package.json           |  7 +++++
 .../react-redux-epic-tests.tsx                | 26 +++++++++++++++++++
 types/react-redux-epic/tsconfig.json          | 17 ++++++++++++
 types/react-redux-epic/tslint.json            |  3 +++
 6 files changed, 82 insertions(+)
 create mode 100644 types/react-redux-epic/client.d.ts
 create mode 100644 types/react-redux-epic/index.d.ts
 create mode 100644 types/react-redux-epic/package.json
 create mode 100644 types/react-redux-epic/react-redux-epic-tests.tsx
 create mode 100644 types/react-redux-epic/tsconfig.json
 create mode 100644 types/react-redux-epic/tslint.json

diff --git a/types/react-redux-epic/client.d.ts b/types/react-redux-epic/client.d.ts
new file mode 100644
index 0000000000..54535f59ec
--- /dev/null
+++ b/types/react-redux-epic/client.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+import { Observable } from 'rxjs/Observable';
+
+export function render(
+    element: React.ReactElement<any>,
+    container: Element
+): Observable<undefined>;
diff --git a/types/react-redux-epic/index.d.ts b/types/react-redux-epic/index.d.ts
new file mode 100644
index 0000000000..f9bba811f8
--- /dev/null
+++ b/types/react-redux-epic/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for react-redux-epic 1.1
+// Project: https://github.com/BerkeleyTrue/react-redux-epic#readme
+// Definitions by: forabi <https://github.com/forabi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+import { Observable } from 'rxjs/Observable';
+import { Epic } from 'redux-observable';
+
+export interface Action {
+    type: string;
+}
+
+export function wrapRootEpic<T, S, D, O extends T>(
+    epic: Epic<T, S, D, O>
+): Epic<T, S, D, O>;
+
+export function renderToString(
+    element: React.ReactElement<any>,
+    wrappedEpic: Epic<any, any>
+): Observable<{ markup: string }>;
diff --git a/types/react-redux-epic/package.json b/types/react-redux-epic/package.json
new file mode 100644
index 0000000000..807e511de4
--- /dev/null
+++ b/types/react-redux-epic/package.json
@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "dependencies": {
+        "rxjs": "^5.5.5",
+        "redux-observable": "^0.18.0"
+    }
+}
diff --git a/types/react-redux-epic/react-redux-epic-tests.tsx b/types/react-redux-epic/react-redux-epic-tests.tsx
new file mode 100644
index 0000000000..fa1d4f9c77
--- /dev/null
+++ b/types/react-redux-epic/react-redux-epic-tests.tsx
@@ -0,0 +1,26 @@
+import * as React from 'react';
+import { Epic } from 'redux-observable';
+import { renderToString, wrapRootEpic } from 'react-redux-epic';
+import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/ignoreElements';
+
+interface Action {
+    type: string;
+    payload: any;
+}
+
+const rootEpic: Epic<Action, {}> = action$ => {
+    return action$
+        .do(action => {
+            // Action dispatched
+        })
+        .ignoreElements();
+};
+
+const wrappedRootEpic = wrapRootEpic(rootEpic);
+
+renderToString(<div>Hello, world</div>, wrappedRootEpic).subscribe({
+    next({ markup }) {
+        // Done
+    }
+});
diff --git a/types/react-redux-epic/tsconfig.json b/types/react-redux-epic/tsconfig.json
new file mode 100644
index 0000000000..64657de53c
--- /dev/null
+++ b/types/react-redux-epic/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "jsx": "React",
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "client.d.ts", "react-redux-epic-tests.tsx"]
+}
diff --git a/types/react-redux-epic/tslint.json b/types/react-redux-epic/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-redux-epic/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From cc7370ac0e68f3a629341d9c067496bb0f533de2 Mon Sep 17 00:00:00 2001
From: Fernando Alex Helwanger <fhelwanger@gmail.com>
Date: Mon, 26 Feb 2018 16:44:12 -0300
Subject: [PATCH 288/388] [react-native-loading-spinner-overlay] Add
 react-native-loading-spinner-overlay typings (#23829)

* Add react-native-loading-spinner-overlay typings

* Match `react` typescript version
---
 .../index.d.ts                                | 21 ++++++++++++++++
 ...t-native-loading-spinner-overlay-tests.tsx | 19 +++++++++++++++
 .../tsconfig.json                             | 24 +++++++++++++++++++
 .../tslint.json                               |  1 +
 4 files changed, 65 insertions(+)
 create mode 100644 types/react-native-loading-spinner-overlay/index.d.ts
 create mode 100644 types/react-native-loading-spinner-overlay/react-native-loading-spinner-overlay-tests.tsx
 create mode 100644 types/react-native-loading-spinner-overlay/tsconfig.json
 create mode 100644 types/react-native-loading-spinner-overlay/tslint.json

diff --git a/types/react-native-loading-spinner-overlay/index.d.ts b/types/react-native-loading-spinner-overlay/index.d.ts
new file mode 100644
index 0000000000..93d511d863
--- /dev/null
+++ b/types/react-native-loading-spinner-overlay/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for react-native-loading-spinner-overlay 0.5
+// Project: https://github.com/joinspontaneous/react-native-loading-spinner-overlay
+// 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 SpinnerProps {
+    cancelable?: boolean;
+    color?: string;
+    animation?: "none" | "slide" | "fade";
+    overlayColor?: string;
+    size?: "normal" | "small" | "large";
+    textContent?: string;
+    textStyle?: ReactNative.StyleProp<ReactNative.TextStyle>;
+    visible?: boolean;
+}
+
+export default class Spinner extends React.Component<SpinnerProps> {}
diff --git a/types/react-native-loading-spinner-overlay/react-native-loading-spinner-overlay-tests.tsx b/types/react-native-loading-spinner-overlay/react-native-loading-spinner-overlay-tests.tsx
new file mode 100644
index 0000000000..2b507ccb12
--- /dev/null
+++ b/types/react-native-loading-spinner-overlay/react-native-loading-spinner-overlay-tests.tsx
@@ -0,0 +1,19 @@
+import * as React from "react";
+import Spinner from "react-native-loading-spinner-overlay";
+
+() => {
+    <Spinner />;
+};
+
+() => {
+    <Spinner
+        cancelable={false}
+        color="red"
+        animation="slide"
+        overlayColor="black"
+        size="small"
+        textContent="text"
+        textStyle={{ fontSize: 14 }}
+        visible={true}
+    />;
+};
diff --git a/types/react-native-loading-spinner-overlay/tsconfig.json b/types/react-native-loading-spinner-overlay/tsconfig.json
new file mode 100644
index 0000000000..ef459656dc
--- /dev/null
+++ b/types/react-native-loading-spinner-overlay/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-loading-spinner-overlay-tests.tsx"
+    ]
+}
diff --git a/types/react-native-loading-spinner-overlay/tslint.json b/types/react-native-loading-spinner-overlay/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-loading-spinner-overlay/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 22662d514f87a4a1ac64676977997a8c910f9c6d Mon Sep 17 00:00:00 2001
From: scarletsky <scarletsky1025@gmail.com>
Date: Tue, 27 Feb 2018 03:46:40 +0800
Subject: [PATCH 289/388] playcanvas: update typings (#23867)

---
 .../engine/asset/asset-registry.d.ts          |   2 +-
 types/playcanvas/engine/asset/asset.d.ts      |  24 +++-
 types/playcanvas/engine/core/events.d.ts      |   8 +-
 types/playcanvas/engine/core/path.d.ts        |   2 +-
 types/playcanvas/engine/core/platform.d.ts    |   2 -
 .../engine/framework/application.d.ts         |  38 ++---
 .../components/animation/component.d.ts       |   9 +-
 .../framework/components/component.d.ts       |   8 +-
 .../framework/components/model/component.d.ts |   2 +-
 .../components/script/component.d.ts          |   2 +
 .../framework/components/sound/component.d.ts |   2 +-
 types/playcanvas/engine/framework/entity.d.ts |   5 +-
 types/playcanvas/engine/graphics/device.d.ts  |   8 +-
 types/playcanvas/engine/graphics/texture.d.ts |   3 +-
 .../engine/graphics/vertex-format.d.ts        |   4 +-
 .../engine/graphics/vertex-iterator.d.ts      |   2 +
 types/playcanvas/engine/input/input.d.ts      |  12 +-
 types/playcanvas/engine/input/mouse.d.ts      |   7 +-
 types/playcanvas/engine/input/touch.d.ts      |   7 +-
 types/playcanvas/engine/math/mat3.d.ts        |   2 +
 types/playcanvas/engine/math/mat4.d.ts        |   2 +
 types/playcanvas/engine/math/vec2.d.ts        |   5 +-
 types/playcanvas/engine/math/vec3.d.ts        |   1 +
 types/playcanvas/engine/math/vec4.d.ts        |   2 +
 .../engine/resources/animation.d.ts           |   7 +
 .../playcanvas/engine/resources/cubemap.d.ts  |   7 +
 types/playcanvas/engine/resources/loader.d.ts |  10 +-
 .../playcanvas/engine/resources/material.d.ts |  10 ++
 types/playcanvas/engine/resources/model.d.ts  |   3 +
 types/playcanvas/engine/resources/script.d.ts |   6 +-
 .../playcanvas/engine/resources/texture.d.ts  |   9 ++
 .../engine/scene/basic-material.d.ts          |   3 +
 types/playcanvas/engine/scene/graph-node.d.ts |  11 +-
 types/playcanvas/engine/scene/material.d.ts   |   3 +
 types/playcanvas/engine/scene/mesh.d.ts       |  28 +++-
 types/playcanvas/engine/scene/model.d.ts      |   2 +
 types/playcanvas/engine/scene/morph.d.ts      | 131 ++++++++++++++++++
 types/playcanvas/engine/scene/procedural.d.ts |  16 +--
 types/playcanvas/engine/scene/scene.d.ts      |   4 +-
 types/playcanvas/engine/script/script.d.ts    |  32 ++---
 types/playcanvas/engine/scriptype.d.ts        |   6 +-
 .../playcanvas/engine/shape/bounding-box.d.ts |   6 +-
 .../engine/shape/bounding-sphere.d.ts         |   2 +-
 .../playcanvas/engine/shape/oriented-box.d.ts |   2 +-
 types/playcanvas/engine/shape/plane.d.ts      |   7 +-
 types/playcanvas/engine/vr/vr-display.d.ts    |   6 +-
 types/playcanvas/index.d.ts                   |   8 +-
 47 files changed, 373 insertions(+), 105 deletions(-)
 create mode 100644 types/playcanvas/engine/resources/animation.d.ts
 create mode 100644 types/playcanvas/engine/resources/cubemap.d.ts
 create mode 100644 types/playcanvas/engine/resources/material.d.ts
 create mode 100644 types/playcanvas/engine/resources/texture.d.ts
 create mode 100644 types/playcanvas/engine/scene/morph.d.ts

diff --git a/types/playcanvas/engine/asset/asset-registry.d.ts b/types/playcanvas/engine/asset/asset-registry.d.ts
index 47dede11a3..f4722ee490 100644
--- a/types/playcanvas/engine/asset/asset-registry.d.ts
+++ b/types/playcanvas/engine/asset/asset-registry.d.ts
@@ -166,4 +166,4 @@ declare namespace pc {
         */
         find(name: string, type?: string): pc.Asset;
     }
-}
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/asset/asset.d.ts b/types/playcanvas/engine/asset/asset.d.ts
index 3a5e514a6c..bfc51ff99f 100644
--- a/types/playcanvas/engine/asset/asset.d.ts
+++ b/types/playcanvas/engine/asset/asset.d.ts
@@ -1,5 +1,19 @@
 declare namespace pc {
 
+    const ASSET_ANIMATION = 'animation';
+    const ASSET_AUDIO = 'audio';
+    const ASSET_IMAGE = 'image';
+    const ASSET_JSON = 'json';
+    const ASSET_MODEL = 'model';
+    const ASSET_MATERIAL = 'material';
+    const ASSET_TEXT = 'text';
+    const ASSET_TEXTURE = 'texture';
+    const ASSET_CUBEMAP = 'cubemap';
+    const ASSET_SHADER = 'shader';
+    const ASSET_CSS = 'css';
+    const ASSET_HTML = 'html';
+    const ASSET_SCRIPT = 'script';
+
     /**
     * @name pc.Asset
     * @class An asset record of a file or data resource that can be loaded by the engine.
@@ -77,7 +91,7 @@ declare namespace pc {
         * });
         * app.assets.load(asset);
         */
-        ready(callback: (...args: any[]) => {}, scope: any): void;
+        ready(callback: (...args: any[]) => void, scope?: any): void;
 
         /**
         * @function
@@ -106,7 +120,7 @@ declare namespace pc {
          * });
          * obj.fire('test', 1, 2); // prints 3 to the console
          */
-        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+        on(name: string, callback: (...args: any[]) => void, scope?: any): any;
 
         /**
          * @function
@@ -126,7 +140,7 @@ declare namespace pc {
          * obj.off('test', handler); // Removes all handler functions, called 'test'
          * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
          */
-        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+        off(name: string, callback: (...args: any[]) => void, scope?: any): any;
 
         /**
          * @function
@@ -137,7 +151,7 @@ declare namespace pc {
          * @example
          * obj.fire('test', 'This is the message');
          */
-        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+        fire(name: string, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
 
         /**
          * @function
@@ -153,7 +167,7 @@ declare namespace pc {
          * obj.fire('test', 1, 2); // prints 3 to the console
          * obj.fire('test', 1, 2); // not going to get handled
          */
-        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+        once(name: string, callback: (...args: any[]) => void, scope?: any): any;
 
         /**
         * @function
diff --git a/types/playcanvas/engine/core/events.d.ts b/types/playcanvas/engine/core/events.d.ts
index 21fc207840..7bf4f8b567 100644
--- a/types/playcanvas/engine/core/events.d.ts
+++ b/types/playcanvas/engine/core/events.d.ts
@@ -43,7 +43,7 @@ declare namespace pc {
          * });
          * obj.fire('test', 1, 2); // prints 3 to the console
          */
-        function on(name: string, callback: (...args: any[]) => void, scope: any): any;
+        function on(name: string, callback: (...args: any[]) => void, scope?: any): void;
 
         /**
          * @function
@@ -63,7 +63,7 @@ declare namespace pc {
          * obj.off('test', handler); // Removes all handler functions, called 'test'
          * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
          */
-        function off(name: string, callback: (...args: any[]) => void, scope: any): any;
+        function off(name: string, callback?: (...args: any[]) => void, scope?: any): void;
 
         /**
          * @function
@@ -74,7 +74,7 @@ declare namespace pc {
          * @example
          * obj.fire('test', 'This is the message');
          */
-        function fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+        function fire(name: string, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): void;
 
         /**
          * @function
@@ -90,7 +90,7 @@ declare namespace pc {
          * obj.fire('test', 1, 2); // prints 3 to the console
          * obj.fire('test', 1, 2); // not going to get handled
          */
-        function once(name: string, callback: (...args: any[]) => void, scope: any): any;
+        function once(name: string, callback: (...args: any[]) => void, scope?: any): void;
 
         /**
         * @function
diff --git a/types/playcanvas/engine/core/path.d.ts b/types/playcanvas/engine/core/path.d.ts
index d6fa94abad..e94d8c7133 100644
--- a/types/playcanvas/engine/core/path.d.ts
+++ b/types/playcanvas/engine/core/path.d.ts
@@ -10,7 +10,7 @@ declare namespace pc {
          * The character that separates path segments
          * @name pc.path.delimiter
          */
-        const delimiter = "/",
+        const delimiter = "/";
         /**
          * Join two sections of file path together, insert a delimiter if needed.
          * @param {String} one First part of path to join
diff --git a/types/playcanvas/engine/core/platform.d.ts b/types/playcanvas/engine/core/platform.d.ts
index 15d1995415..f1522c2b90 100644
--- a/types/playcanvas/engine/core/platform.d.ts
+++ b/types/playcanvas/engine/core/platform.d.ts
@@ -1,5 +1,3 @@
-import { platform } from "os";
-
 declare namespace pc {
 
     /**
diff --git a/types/playcanvas/engine/framework/application.d.ts b/types/playcanvas/engine/framework/application.d.ts
index 404ce2e71f..6ef4d996d1 100644
--- a/types/playcanvas/engine/framework/application.d.ts
+++ b/types/playcanvas/engine/framework/application.d.ts
@@ -32,6 +32,8 @@ declare namespace pc {
     class Application {
         constructor(canvas: HTMLCanvasElement, options?: pc.ApplicationOptions)
 
+        static getApplication(id?: string): Application;
+
         // PROPERTIES
 
         /**
@@ -207,23 +209,23 @@ declare namespace pc {
         loadSceneSettings(url: string, callback: (...args: any[]) => {}): void;
 
         /**
-        * @function
-        * @name pc.Application#loadScene
-        * @description Load a scene file.
-        * @param {String} url The URL of the scene file. Usually this will be "scene_id.json"
-        * @param {Function} callback The function to call after loading, passed (err, entity) where err is null if no errors occurred.
-        * @example
-        *
-        * app.loadScene("1000.json", function (err, entity) {
-        *     if (!err) {
-        *       var e = app.root.find("My New Entity");
-        *     } else {
-        *       // error
-        *     }
-        *   }
-        * });
-        */
-       loadScene(url: string, callback: (...args: any[]) => {}): void;
+         * @function
+         * @name pc.Application#loadScene
+         * @description Load a scene file.
+         * @param {String} url The URL of the scene file. Usually this will be "scene_id.json"
+         * @param {Function} callback The function to call after loading, passed (err, entity) where err is null if no errors occurred.
+         * @example
+         *
+         * app.loadScene("1000.json", function (err, entity) {
+         *     if (!err) {
+         *       var e = app.root.find("My New Entity");
+         *     } else {
+         *       // error
+         *     }
+         *   }
+         * });
+         */
+        loadScene(url: string, callback: (...args: any[]) => {}): void;
 
         /**
          * @function
@@ -497,7 +499,7 @@ declare namespace pc {
          * @example
          * obj.fire('test', 'This is the message');
          */
-        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+        fire(name: string, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
 
         /**
          * @function
diff --git a/types/playcanvas/engine/framework/components/animation/component.d.ts b/types/playcanvas/engine/framework/components/animation/component.d.ts
index 5060499b3d..ca0547b6fe 100644
--- a/types/playcanvas/engine/framework/components/animation/component.d.ts
+++ b/types/playcanvas/engine/framework/components/animation/component.d.ts
@@ -20,9 +20,14 @@ declare namespace pc {
         speed: number;
         loop: boolean;
         activate: boolean;
-        assets: pc.Asset[];
+        assets: number[];
         currentTime: number;
         duration: number;
+        playing: boolean;
+        currAnim: string;
+
+        animations: any;
+        animationsIndex: any;
 
         /**
          * @function
@@ -32,7 +37,7 @@ declare namespace pc {
          * @param {Number} [blendTime] The time in seconds to blend from the current
          * animation state to the start of the animation being set.
          */
-        play(name: string, blendTime: number): void;
+        play(name: string, blendTime?: number): void;
 
         /**
         * @function
diff --git a/types/playcanvas/engine/framework/components/component.d.ts b/types/playcanvas/engine/framework/components/component.d.ts
index 5b47908106..113c5e6e80 100644
--- a/types/playcanvas/engine/framework/components/component.d.ts
+++ b/types/playcanvas/engine/framework/components/component.d.ts
@@ -41,7 +41,7 @@ declare namespace pc {
          * });
          * obj.fire('test', 1, 2); // prints 3 to the console
          */
-        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+        on(name: string, callback: (...args: any[]) => void, scope?: any): void;
 
         /**
          * @function
@@ -61,7 +61,7 @@ declare namespace pc {
          * obj.off('test', handler); // Removes all handler functions, called 'test'
          * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
          */
-        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+        off(name: string, callback?: (...args: any[]) => void, scope?: any): void;
 
         /**
          * @function
@@ -72,7 +72,7 @@ declare namespace pc {
          * @example
          * obj.fire('test', 'This is the message');
          */
-        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+        fire(name: string, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): void;
 
         /**
          * @function
@@ -88,7 +88,7 @@ declare namespace pc {
          * obj.fire('test', 1, 2); // prints 3 to the console
          * obj.fire('test', 1, 2); // not going to get handled
          */
-        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+        once(name: string, callback: (...args: any[]) => void, scope?: any): void;
 
         /**
         * @function
diff --git a/types/playcanvas/engine/framework/components/model/component.d.ts b/types/playcanvas/engine/framework/components/model/component.d.ts
index b89d52721c..c6f5679dd3 100644
--- a/types/playcanvas/engine/framework/components/model/component.d.ts
+++ b/types/playcanvas/engine/framework/components/model/component.d.ts
@@ -34,7 +34,7 @@ declare namespace pc {
         constructor(system: pc.ModelComponentSystem, entity: pc.Entity)
 
         type: string;
-        asset: pc.Asset;
+        asset: pc.Asset | number;
         castShadows: boolean;
         receiveShadows: boolean;
         materialAsset: number;
diff --git a/types/playcanvas/engine/framework/components/script/component.d.ts b/types/playcanvas/engine/framework/components/script/component.d.ts
index dbaf70b569..1084b904ef 100644
--- a/types/playcanvas/engine/framework/components/script/component.d.ts
+++ b/types/playcanvas/engine/framework/components/script/component.d.ts
@@ -70,5 +70,7 @@ declare namespace pc {
          * entity.script.move('playerController', 0);
          */
         move(name: string, ind: number): boolean;
+
+        [prop: string]: any;
     }
 }
diff --git a/types/playcanvas/engine/framework/components/sound/component.d.ts b/types/playcanvas/engine/framework/components/sound/component.d.ts
index 0363d61a8f..d5be560773 100644
--- a/types/playcanvas/engine/framework/components/sound/component.d.ts
+++ b/types/playcanvas/engine/framework/components/sound/component.d.ts
@@ -87,7 +87,7 @@ declare namespace pc {
          * this.entity.sound.slot('beep').volume = 0.5;
          *
          */
-        slot(name: string): pc.Slot;
+        slot(name: string): pc.SoundSlot;
 
         /**
         * @function
diff --git a/types/playcanvas/engine/framework/entity.d.ts b/types/playcanvas/engine/framework/entity.d.ts
index 0b1f12ae55..4fd31d0013 100644
--- a/types/playcanvas/engine/framework/entity.d.ts
+++ b/types/playcanvas/engine/framework/entity.d.ts
@@ -54,6 +54,8 @@ declare namespace pc {
         constructor(name?: string, app?: pc.Application)
         constructor(app?: pc.Application)
 
+        private _app: pc.Application;
+
         /**
          * @function
          * @name pc.Entity#addComponent
@@ -102,13 +104,12 @@ declare namespace pc {
         removeComponent(type: pc.ComponentTypes): void;
 
         /**
-         * @private
          * @function
          * @name pc.Entity#getGuid
          * @description Get the GUID value for this Entity
          * @returns {String} The GUID of the Entity
          */
-        private getGuid(): string;
+        public getGuid(): string;
 
         /**
          * @private
diff --git a/types/playcanvas/engine/graphics/device.d.ts b/types/playcanvas/engine/graphics/device.d.ts
index 188de0b1a3..fc0be6df09 100644
--- a/types/playcanvas/engine/graphics/device.d.ts
+++ b/types/playcanvas/engine/graphics/device.d.ts
@@ -45,6 +45,10 @@ declare namespace pc {
          */
         readonly maxVolumeSize: number;
 
+        readonly canvas: HTMLCanvasElement;
+
+        maxPixelRatio: number;
+
         /**
          * @function
          * @name pc.GraphicsDevice#setViewport
@@ -68,13 +72,13 @@ declare namespace pc {
         setScissor(x: number, y: number, w: number, h: number): void;
 
         /**
-         * @private
+         * @public
          * @function
          * @name pc.GraphicsDevice#getProgramLibrary
          * @description Retrieves the program library assigned to the specified graphics device.
          * @returns {pc.ProgramLibrary} The program library assigned to the device.
          */
-        private getProgramLibrary(): pc.ProgramLibrary;
+        getProgramLibrary(): pc.ProgramLibrary;
 
         /**
          * @private
diff --git a/types/playcanvas/engine/graphics/texture.d.ts b/types/playcanvas/engine/graphics/texture.d.ts
index ac637117bf..ed468ba5e6 100644
--- a/types/playcanvas/engine/graphics/texture.d.ts
+++ b/types/playcanvas/engine/graphics/texture.d.ts
@@ -85,7 +85,7 @@ declare namespace pc {
      * @author Will Eastcott
      */
     class Texture {
-        constructor(graphicsDevice: pc.GraphicsDevice, options: {
+        constructor(graphicsDevice: pc.GraphicsDevice, options?: {
             width: number,
             height: number,
             depth: number,
@@ -95,6 +95,7 @@ declare namespace pc {
             anisotropy: number,
             addressU: number,
             addressV: number,
+            addressW: number,
             mipmaps: boolean,
             cubemap: boolean,
             volume: boolean,
diff --git a/types/playcanvas/engine/graphics/vertex-format.d.ts b/types/playcanvas/engine/graphics/vertex-format.d.ts
index 13052e2a8a..f787f3a448 100644
--- a/types/playcanvas/engine/graphics/vertex-format.d.ts
+++ b/types/playcanvas/engine/graphics/vertex-format.d.ts
@@ -58,10 +58,10 @@ declare namespace pc {
      */
     class VertexFormat {
         constructor(graphicsDevice: pc.GraphicsDevice, description: {
-            semantic: number,
+            semantic: string,
             components: number,
             type: number,
-            normalize: boolean
+            normalize?: boolean
         }[])
     }
 }
\ No newline at end of file
diff --git a/types/playcanvas/engine/graphics/vertex-iterator.d.ts b/types/playcanvas/engine/graphics/vertex-iterator.d.ts
index bc9b23d59b..8f56ff6b87 100644
--- a/types/playcanvas/engine/graphics/vertex-iterator.d.ts
+++ b/types/playcanvas/engine/graphics/vertex-iterator.d.ts
@@ -10,6 +10,8 @@ declare namespace pc {
     class VertexIterator {
         constructor(vertexBuffer: pc.VertexBuffer)
 
+        element: any;
+
         /**
          * @function
          * @name pc.VertexIterator#next
diff --git a/types/playcanvas/engine/input/input.d.ts b/types/playcanvas/engine/input/input.d.ts
index d132539b36..97f51d4158 100644
--- a/types/playcanvas/engine/input/input.d.ts
+++ b/types/playcanvas/engine/input/input.d.ts
@@ -41,19 +41,19 @@ declare namespace pc {
         * @name pc.EVENT_TOUCHSTART
         * @description Name of event fired when a new touch occurs. For example, a finger is placed on the device.
         */
-        const VENT_TOUCHSTART = 'touchstart';
+        const EVENT_TOUCHSTART = 'touchstart';
         /**
         * @enum pc.EVENT
         * @name pc.EVENT_TOUCHEND
         * @description Name of event fired when touch ends. For example, a finger is lifted off the device.
         */
-        const VENT_TOUCHEND = 'touchend';
+        const EVENT_TOUCHEND = 'touchend';
         /**
         * @enum pc.EVENT
         * @name pc.EVENT_TOUCHMOVE
         * @description Name of event fired when a touch moves.
         */
-        const VENT_TOUCHMOVE = 'touchmove';
+        const EVENT_TOUCHMOVE = 'touchmove';
         /**
         * @enum pc.EVENT
         * @name pc.EVENT_TOUCHCANCEL
@@ -62,18 +62,18 @@ declare namespace pc {
         * For example, a modal alert pops up during the interaction; the touch point leaves the document area;
         * or there are more touch points than the device supports, in which case the earliest touch point is canceled.
         */
-        const VENT_TOUCHCANCEL = 'touchcancel';
+        const EVENT_TOUCHCANCEL = 'touchcancel';
 
         /**
          * @enum pc.KEY
          * @name pc.KEY_BACKSPACE
          */
-        const EY_BACKSPACE = 8;
+        const KEY_BACKSPACE = 8;
         /**
          * @enum pc.KEY
          * @name pc.KEY_TAB
          */
-        const EY_TAB = 9;
+        const KEY_TAB = 9;
         /**
          * @enum pc.KEY
          * @name pc.KEY_RETURN
diff --git a/types/playcanvas/engine/input/mouse.d.ts b/types/playcanvas/engine/input/mouse.d.ts
index 524e2c40c6..a614d57d15 100644
--- a/types/playcanvas/engine/input/mouse.d.ts
+++ b/types/playcanvas/engine/input/mouse.d.ts
@@ -1,4 +1,4 @@
-type BrowserMouseEvent = typeof MouseEvent;
+type BrowserMouseEvent = MouseEvent;
 
 declare namespace pc {
     /**
@@ -45,16 +45,15 @@ declare namespace pc {
      * @param {Element} [element] The Element that the mouse events are attached to
      */
     class Mouse {
-        constructor(element?: Element)
-
         /**
         * @function
         * @name pc.Mouse.isPointerLocked
         * @description Check if the mouse pointer has been locked, using {@link pc.Mouse#enabledPointerLock}
         * @returns {Boolean} True if locked
         */
-        isPointerLocked(): void;
+        static isPointerLocked(): void;
 
+        constructor(element?: Element)
 
         /**
          * @function
diff --git a/types/playcanvas/engine/input/touch.d.ts b/types/playcanvas/engine/input/touch.d.ts
index d94f8167b7..bc56e87894 100644
--- a/types/playcanvas/engine/input/touch.d.ts
+++ b/types/playcanvas/engine/input/touch.d.ts
@@ -1,5 +1,5 @@
-type BrowserTouchEvent = typeof TouchEvent;
-type BrowserTouch = typeof Touch;
+type BrowserTouchEvent = TouchEvent;
+type BrowserTouch = Touch;
 
 declare namespace pc {
 
@@ -18,6 +18,7 @@ declare namespace pc {
         constructor(device: pc.TouchDevice, event: BrowserTouchEvent)
 
         element: Element;
+        event: BrowserTouchEvent;
         touches: pc.Touch[];
         changedTouches: pc.Touch[];
 
@@ -166,4 +167,4 @@ declare namespace pc {
         */
         hasEvent(name: string): boolean;
     }
-}
\ No newline at end of file
+}
diff --git a/types/playcanvas/engine/math/mat3.d.ts b/types/playcanvas/engine/math/mat3.d.ts
index d84f39d124..1ed5afed3e 100644
--- a/types/playcanvas/engine/math/mat3.d.ts
+++ b/types/playcanvas/engine/math/mat3.d.ts
@@ -15,6 +15,8 @@ declare namespace pc {
     * @param {Number} [v8] The value in row 2, column 2.
     */
     class Mat3 {
+        data: Float32Array;
+
         constructor(v0: number, v1: number, v2: number, v3: number, v4: number, v5: number, v6: number, v7: number, v8: number)
         constructor(v0: [number, number, number, number, number, number, number, number, number])
 
diff --git a/types/playcanvas/engine/math/mat4.d.ts b/types/playcanvas/engine/math/mat4.d.ts
index 73306d52c7..d6fb0e75e9 100644
--- a/types/playcanvas/engine/math/mat4.d.ts
+++ b/types/playcanvas/engine/math/mat4.d.ts
@@ -22,6 +22,8 @@ declare namespace pc {
     * @param {Number} [v15] The value in row 3, column 3.
     */
     class Mat4 {
+        data: Float32Array;
+
         constructor(
             v0: number, v1: number, v2: number, v3: number, v4: number, v5: number, v6: number, v7: number, v8: number,
             v9: number, v10: number, v11: number, v12: number, v13: number, v14: number, v15: number
diff --git a/types/playcanvas/engine/math/vec2.d.ts b/types/playcanvas/engine/math/vec2.d.ts
index ec02347f46..2fc8bef234 100644
--- a/types/playcanvas/engine/math/vec2.d.ts
+++ b/types/playcanvas/engine/math/vec2.d.ts
@@ -8,7 +8,10 @@ declare namespace pc {
     * @param {Number} [y] The y value
     */
     class Vec2 {
-        constructor(x: number, y: number)
+        data: Float32Array;
+
+        constructor(x: number, y: number);
+        constructor();
 
         /**
          * @function
diff --git a/types/playcanvas/engine/math/vec3.d.ts b/types/playcanvas/engine/math/vec3.d.ts
index cc298d6a4e..30ea7a5758 100644
--- a/types/playcanvas/engine/math/vec3.d.ts
+++ b/types/playcanvas/engine/math/vec3.d.ts
@@ -10,6 +10,7 @@ declare namespace pc {
     * var v = new pc.Vec3(1,2,3);
     */
     class Vec3 {
+        data: Float32Array;
 
         constructor(x: number, y: number, z: number)
         constructor(x: [number, number, number])
diff --git a/types/playcanvas/engine/math/vec4.d.ts b/types/playcanvas/engine/math/vec4.d.ts
index f562eeb6bc..919c65f56c 100644
--- a/types/playcanvas/engine/math/vec4.d.ts
+++ b/types/playcanvas/engine/math/vec4.d.ts
@@ -10,6 +10,8 @@ declare namespace pc {
     * @param {Number} [w] The w value
     */
     class Vec4 {
+        data: Float32Array;
+
         constructor(x: number, y: number, z: number, w: number)
         constructor(x: [number, number, number, number])
         constructor();
diff --git a/types/playcanvas/engine/resources/animation.d.ts b/types/playcanvas/engine/resources/animation.d.ts
new file mode 100644
index 0000000000..18a51950c4
--- /dev/null
+++ b/types/playcanvas/engine/resources/animation.d.ts
@@ -0,0 +1,7 @@
+declare namespace pc {
+    class AnimationHandler {
+        load(url: string, callback: Function): void;
+        open(url: string, data: any): any;
+        patch(asset: pc.Asset, assets: pc.AssetRegistry): void;
+    }
+}
diff --git a/types/playcanvas/engine/resources/cubemap.d.ts b/types/playcanvas/engine/resources/cubemap.d.ts
new file mode 100644
index 0000000000..157f62c456
--- /dev/null
+++ b/types/playcanvas/engine/resources/cubemap.d.ts
@@ -0,0 +1,7 @@
+declare namespace pc {
+    class CubemapHandler {
+        load(url: string, callback: Function): void;
+        open(url: string, data: any): any;
+        patch(asset: pc.Asset, assets: pc.AssetRegistry): void;
+    }
+}
diff --git a/types/playcanvas/engine/resources/loader.d.ts b/types/playcanvas/engine/resources/loader.d.ts
index 61e99b179a..632886242f 100644
--- a/types/playcanvas/engine/resources/loader.d.ts
+++ b/types/playcanvas/engine/resources/loader.d.ts
@@ -1,8 +1,9 @@
 declare namespace pc {
 
     interface ResourceHandler {
-        load: (url: 'string', callback: (...args: any[]) => {}) => {};
-        open: (url: 'string', date: any) => {};
+        load(url: 'string', callback: (...args: any[]) => {}): void;
+        open(url: 'string', data: any): any;
+        patch(asset: pc.Asset, assets: pc.AssetRegistry): void;
     }
 
     /**
@@ -25,6 +26,11 @@ declare namespace pc {
         */
         addHandler(type: string, handler: pc.ResourceHandler): void;
 
+        getHandler(type: string): any;
+
+        removeHandler(type: string): void;
+
+
         /**
         * @function
         * @name pc.ResourceLoader#load
diff --git a/types/playcanvas/engine/resources/material.d.ts b/types/playcanvas/engine/resources/material.d.ts
new file mode 100644
index 0000000000..7259655759
--- /dev/null
+++ b/types/playcanvas/engine/resources/material.d.ts
@@ -0,0 +1,10 @@
+declare namespace pc {
+
+    function getMaterialParamType(name: string): string;
+
+    class MaterialHandler {
+        load(url: string, callback: Function): void;
+        open(url: string, data: any): void;
+        patch(asset: pc.Asset, assets: pc.AssetRegistry): void;
+    }
+}
diff --git a/types/playcanvas/engine/resources/model.d.ts b/types/playcanvas/engine/resources/model.d.ts
index a5d7dbd8e7..116c83c6ac 100644
--- a/types/playcanvas/engine/resources/model.d.ts
+++ b/types/playcanvas/engine/resources/model.d.ts
@@ -7,6 +7,9 @@ declare namespace pc {
      * @param {pc.GraphicsDevice} device The graphics device that will be rendering
      */
     class ModelHandler {
+
+        static DEFAULT_MATERIAL: pc.StandardMaterial;
+
         constructor(device: pc.GraphicsDevice)
 
         /**
diff --git a/types/playcanvas/engine/resources/script.d.ts b/types/playcanvas/engine/resources/script.d.ts
index 3f7fd26292..2299dfc3e9 100644
--- a/types/playcanvas/engine/resources/script.d.ts
+++ b/types/playcanvas/engine/resources/script.d.ts
@@ -8,7 +8,11 @@ declare namespace pc {
      * @param {pc.Application} app The running {pc.Application}
      */
     class ScriptHandler {
-        constructor(app: pc.Application)
+        static _push(Type: ScriptType): void;
 
+        constructor(app: pc.Application)
+        load(url: string, callback: Function): void;
+        open(url: string, data: any): any;
+        patch(asset: pc.Asset, assets: pc.AssetRegistry): void;
     }
 }
diff --git a/types/playcanvas/engine/resources/texture.d.ts b/types/playcanvas/engine/resources/texture.d.ts
new file mode 100644
index 0000000000..d5073290e6
--- /dev/null
+++ b/types/playcanvas/engine/resources/texture.d.ts
@@ -0,0 +1,9 @@
+declare namespace pc {
+    class TextureHandler {
+        crossOrigin: boolean | string;
+
+        load(url: string, callback: Function): void;
+        open(url: string, data: any): any;
+        patch(asset: pc.Asset, assets: pc.AssetRegistry): void;
+    }
+}
diff --git a/types/playcanvas/engine/scene/basic-material.d.ts b/types/playcanvas/engine/scene/basic-material.d.ts
index 6bca34dfd5..f6c4404b39 100644
--- a/types/playcanvas/engine/scene/basic-material.d.ts
+++ b/types/playcanvas/engine/scene/basic-material.d.ts
@@ -23,6 +23,9 @@ declare namespace pc {
      */
     class BasicMaterial extends pc.Material {
 
+        color: pc.Color;
+        colorMap: pc.Texture;
+
         /**
          * @function
          * @name pc.BasicMaterial#clone
diff --git a/types/playcanvas/engine/scene/graph-node.d.ts b/types/playcanvas/engine/scene/graph-node.d.ts
index f9d587f8af..b5baf6579b 100644
--- a/types/playcanvas/engine/scene/graph-node.d.ts
+++ b/types/playcanvas/engine/scene/graph-node.d.ts
@@ -8,6 +8,8 @@ declare namespace pc {
      */
     class GraphNode {
         constructor(name?: string)
+        name: string;
+        tags: pc.Tags;
 
         /**
          * @readonly
@@ -64,7 +66,7 @@ declare namespace pc {
          * @type pc.GraphNode[]
          * @description A read-only property to get the children of this graph node.
          */
-        readonly children: pc.GraphNode;
+        readonly children: pc.GraphNode[];
 
         /**
          * @function
@@ -378,6 +380,7 @@ declare namespace pc {
          * this.entity.setLocalEulerAngles(0, 90, 0); // Set rotation of 90 degrees around y-axis.
          */
         setLocalEulerAngles(x: number, y: number, z: number): void;
+        setLocalEulerAngles(...args: number[]): void;
 
         /**
          * @function
@@ -402,6 +405,7 @@ declare namespace pc {
          * this.entity.setLocalPosition(0, 10, 0);
          */
         setLocalPosition(x: number, y: number, z: number): void;
+        setLocalPosition(...args: number[]): void;
 
         /**
          * @function
@@ -437,6 +441,7 @@ declare namespace pc {
          * this.entity.setLocalRotation(0, 0, 0, 1);
          */
         setLocalRotation(x: number, y: number, z: number, w: number): void;
+        setLocalRotation(...args: number[]): void;
 
         /**
          * @function
@@ -449,6 +454,7 @@ declare namespace pc {
          * this.entity.setLocalScale(10, 10, 10);
          */
         setLocalScale(x: number, y: number, z: number): void;
+        setLocalScale(...args: number[]): void;
 
         /**
          * @function
@@ -484,6 +490,7 @@ declare namespace pc {
          * this.entity.setPosition(0, 10, 0);
          */
         setPosition(x: number, y: number, z: number): void;
+        setPosition(...args: number[]): void;
 
         /**
          * @function
@@ -521,6 +528,7 @@ declare namespace pc {
          * this.entity.setRotation(0, 0, 0, 1);
          */
         setRotation(x: number, y: number, z: number, w: number): void;
+        setRotation(...args: number[]): void;
 
         /**
          * @function
@@ -534,6 +542,7 @@ declare namespace pc {
          * this.entity.setEulerAngles(0, 90, 0);
          */
         setEulerAngles(x: number, y: number, z: number): void;
+        setEulerAngles(...args: number[]): void;
 
         /**
          * @function
diff --git a/types/playcanvas/engine/scene/material.d.ts b/types/playcanvas/engine/scene/material.d.ts
index 1cb8d487f7..7d387cc0a0 100644
--- a/types/playcanvas/engine/scene/material.d.ts
+++ b/types/playcanvas/engine/scene/material.d.ts
@@ -57,6 +57,9 @@ declare namespace pc {
         alphaTest: number;
         alphaToCoverage: boolean;
         alphaWrite: boolean;
+        blend: boolean;
+        blendSrc: number;
+        blendDst: number;
         blendType: number;
         blueWrite: boolean;
         cull: number;
diff --git a/types/playcanvas/engine/scene/mesh.d.ts b/types/playcanvas/engine/scene/mesh.d.ts
index 6a0dca71e6..b9ecd12591 100644
--- a/types/playcanvas/engine/scene/mesh.d.ts
+++ b/types/playcanvas/engine/scene/mesh.d.ts
@@ -1,5 +1,12 @@
 declare namespace pc {
 
+    type MeshPrimitive = {
+        type: number;
+        base: number;
+        count: number;
+        indexed?: boolean;
+    }
+
     /**
      * @name pc.Mesh
      * @class A graphical primitive. The mesh is defined by a {@link pc.VertexBuffer} and an optional
@@ -19,8 +26,10 @@ declare namespace pc {
     class Mesh {
         vertexBuffer: pc.VertexBuffer;
         indexBuffer: pc.IndexBuffer;
-        primitive: {}[];
+        primitive: MeshPrimitive[];
         aabb: pc.BoundingBox;
+        skin: pc.Skin;
+        morph: pc.Morph;
     }
 
     /**
@@ -65,11 +74,8 @@ declare namespace pc {
     class MeshInstance {
         constructor(node: pc.GraphNode, mesh: pc.Mesh, material: pc.Material)
 
-        aabb: pc.BoundingBox;
         castShadow: boolean;
         visible: boolean;
-        layer: number;
-        material: pc.Material;
         renderStyle: number;
         cull: boolean;
 
@@ -80,7 +86,21 @@ declare namespace pc {
          * To ignore all dynamic lights, set mask to 0. Defaults to 1.
          */
         mask: number;
+        node: pc.GraphNode;
+        mesh: pc.Mesh;
+        aabb: pc.BoundingBox;
+        material: pc.Material;
+        layer: number;
+        receiveShadow: boolean;
+        skinInstance: pc.SkinInstance;
+        screenSpace: boolean;
+        key: number;
+    }
 
+    class Command {
+        constructor(layer: number, blendType: number, command: Function);
 
+        key: number;
+        conmand: Function;
     }
 }
\ No newline at end of file
diff --git a/types/playcanvas/engine/scene/model.d.ts b/types/playcanvas/engine/scene/model.d.ts
index 0961d443af..f11ebf80fa 100644
--- a/types/playcanvas/engine/scene/model.d.ts
+++ b/types/playcanvas/engine/scene/model.d.ts
@@ -38,6 +38,8 @@ declare namespace pc {
          */
         destroy(): void;
 
+        getMaterials(): pc.StandardMaterial[];
+
         /**
          * @function
          * @name pc.Model#generateWireframe
diff --git a/types/playcanvas/engine/scene/morph.d.ts b/types/playcanvas/engine/scene/morph.d.ts
new file mode 100644
index 0000000000..58e971ebec
--- /dev/null
+++ b/types/playcanvas/engine/scene/morph.d.ts
@@ -0,0 +1,131 @@
+declare namespace pc {
+
+    interface MorphTargetOptions {
+        deltaPositions: number[];
+        deltaNormals?: number[];
+        deltaTangents?: number[];
+        indices?: number[];
+        name?: string;
+        aabb?: pc.BoundingBox;
+    }
+
+    /**
+     * @private
+     * @name pc.MorphTarget
+     * @class A Morph Target (also known as Blend Shape) contains deformation data to apply to existing mesh.
+     * Multiple morph targets can be blended together on a mesh. This is useful for effects that are hard to achieve with conventional animation and skinning.
+     * @param {Object} options Object for passing optional arguments.
+     * @param {Number[]} deltaPositions An array of 3-dimensional vertex position offsets.
+     * @param {Number[]} [deltaNormals] An array of 3-dimensional vertex normal offsets.
+     * @param {Number[]} [deltaTangents] An array of 4-dimensional vertex normal tangents.
+     * @param {Number[]} [options.indices] A morph target doesn't have to contain a full copy of the original mesh with added deformations.
+     * Instead, only deformed vertices can be stored. This array contains indices to the original mesh's vertices and must be of the same size
+     * as other arrays.
+     * @param {String} [name] Name
+     * @param {pc.BoundingBox} [aabb] Bounding box. Will be automatically generated, if undefined.
+     */
+    class MorphTarget {
+        constructor(optionsi: MorphTargetOptions);
+        deltaPositions: number[];
+        deltaNormals: number[];
+        deltaTangents: number[];
+        indices: number[];
+        name: string;
+        aabb: pc.BoundingBox;
+    }
+
+    /**
+     * @private
+     * @name pc.Morph
+     * @class Contains a list of pc.MorphTarget, a combined AABB and some associated data.
+     * @param {pc.MoprhTarget[]} targets A list of morph targets
+     */
+    class Morph {
+        constructor(targets: pc.MorphTarget[]);
+
+        aabb: pc.BoundingBox;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Morph#addTarget
+         * @description Adds a new morph target to the list
+         * @param {pc.MoprhTarget} target A new morph target
+         */
+        addTarget(target: pc.MorphTarget): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Morph#removeTarget
+         * @description Remove the specified morph target from the list
+         * @param {pc.MoprhTarget} target A morph target to delete
+         */
+        removeTarget(target: pc.MorphTarget): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.Morph#getTarget
+         * @description Gets the morph target by index
+         * @param {Number} index An index of morph target.
+         * @returns {pc.MorphTarget} A morph target object
+         */
+        getTarget(index: number): pc.MorphTarget;
+    }
+
+    /**
+     * @private
+     * @name pc.MorphInstance
+     * @class An instance of pc.Morph. Contains weights to assign to every pc.MorphTarget, holds morphed buffer and associated data.
+     * @param {pc.Morph} morph The pc.Morph to instance.
+     */
+    class MorphInstance {
+        constructor(morph: pc.Morph);
+
+        morph: pc.Morph;
+
+        /**
+         * @function
+         * @name pc.MorphInstance#destroy
+         * @description Frees video memory allocated by this object.
+         */
+        destroy(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.MorphInstance#getWeight
+         * @description Gets current weight of the specified morph target.
+         * @param {Number} index An index of morph target.
+         * @returns {Number} Weight
+         */
+        getWeight(index: number): number;
+
+        /**
+         * @private
+         * @function
+         * @name pc.MorphInstance#setWeight
+         * @description Sets weight of the specified morph target.
+         * @param {Number} index An index of morph target.
+         * @param {Number} weight Weight
+         */
+        setWeight(index: number, weight: number): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.MorphInstance#updateBounds
+         * @description Calculates AABB for this morph instance. Called automatically by renderer.
+         */
+        updateBounds(): void;
+
+        /**
+         * @private
+         * @function
+         * @name pc.MorphInstance#update
+         * @description Performs morphing. Called automatically by renderer.
+         */
+        update(mesh: pc.Mesh): void;
+    }
+}
\ No newline at end of file
diff --git a/types/playcanvas/engine/scene/procedural.d.ts b/types/playcanvas/engine/scene/procedural.d.ts
index 9b1f3e66d6..8254952918 100644
--- a/types/playcanvas/engine/scene/procedural.d.ts
+++ b/types/playcanvas/engine/scene/procedural.d.ts
@@ -59,7 +59,7 @@ declare namespace pc {
      *     });
      * @author Will Eastcott
      */
-    function createMesh(device: pc.GraphicsDevice, positions: number[], opts: {
+    function createMesh(device: pc.GraphicsDevice, positions: number[], opts?: {
         normals: number[],
         tangents: number[],
         colors: number[],
@@ -86,7 +86,7 @@ declare namespace pc {
      * @returns {pc.Mesh} A new torus-shaped mesh.
      * @author Will Eastcott
      */
-    function createTorus(device: pc.GraphicsDevice, opts: {
+    function createTorus(device: pc.GraphicsDevice, opts?: {
         tubeRadius: number,
         ringRadius: number,
         segments: number,
@@ -111,7 +111,7 @@ declare namespace pc {
      * @returns {pc.Mesh} A new cylinder-shaped mesh.
      * @author Will Eastcott
      */
-    function createCylinder(device: pc.GraphicsDevice, opts: {
+    function createCylinder(device: pc.GraphicsDevice, opts?: {
         radius: number,
         height: number,
         heightSegments: number,
@@ -136,7 +136,7 @@ declare namespace pc {
      * @returns {pc.Mesh} A new cylinder-shaped mesh.
      * @author Will Eastcott
      */
-    function createCapsule(device: pc.GraphicsDevice, opts: {
+    function createCapsule(device: pc.GraphicsDevice, opts?: {
         radius: number,
         height: number,
         heightSegments: number,
@@ -162,7 +162,7 @@ declare namespace pc {
      * @returns {pc.Mesh} A new cone-shaped mesh.
      * @author Will Eastcott
      */
-    function createCone(device: pc.GraphicsDevice, opts: {
+    function createCone(device: pc.GraphicsDevice, opts?: {
         baseRadius: number,
         peakRadius: number,
         height: number,
@@ -186,7 +186,7 @@ declare namespace pc {
      * @returns {pc.Mesh} A new sphere-shaped mesh.
      * @author Will Eastcott
      */
-    function createSphere(device: pc.GraphicsDevice, opts: {
+    function createSphere(device: pc.GraphicsDevice, opts?: {
         radius: number,
         segments: number
     }): pc.Mesh;
@@ -209,7 +209,7 @@ declare namespace pc {
      * @returns {pc.Mesh} A new plane-shaped mesh.
      * @author Will Eastcott
      */
-    function createPlane(device: pc.GraphicsDevice, opts: {
+    function createPlane(device: pc.GraphicsDevice, opts?: {
         halfExtents: pc.Vec2,
         widthSegments: number,
         lenghtSegments: number
@@ -233,7 +233,7 @@ declare namespace pc {
      * @return {pc.Mesh} A new box-shaped mesh.
      * @author Will Eastcott
      */
-    function createBox(device: pc.GraphicsDevice, opts: {
+    function createBox(device: pc.GraphicsDevice, opts?: {
         halfExtents: pc.Vec3,
         widthSegments: number,
         lengthSegments: number,
diff --git a/types/playcanvas/engine/scene/scene.d.ts b/types/playcanvas/engine/scene/scene.d.ts
index 87bf620a9e..c73e3c61ee 100644
--- a/types/playcanvas/engine/scene/scene.d.ts
+++ b/types/playcanvas/engine/scene/scene.d.ts
@@ -326,5 +326,7 @@ declare namespace pc {
          * @author Will Eastcott
          */
         update(): void;
+
+        setSkybox(cubemaps: pc.Texture[]): void;
     }
-}
\ No newline at end of file
+}
diff --git a/types/playcanvas/engine/script/script.d.ts b/types/playcanvas/engine/script/script.d.ts
index 21cd5540d9..f1565d1c47 100644
--- a/types/playcanvas/engine/script/script.d.ts
+++ b/types/playcanvas/engine/script/script.d.ts
@@ -144,6 +144,9 @@ declare namespace pc {
     * };
     */
     function createScript<Instance extends ScriptType, Class extends ScriptTypeConstructor<Instance>>(name: string, app?: pc.Application): Class;
+    namespace createScript {
+        export let reservedAttributes: any;
+    }
 
     /**
     * @name ScriptType
@@ -172,7 +175,7 @@ declare namespace pc {
          * @type String
          * @description Name of a Script Type.
          */
-        _name: string;
+        __name: string;
 
         /**
          * @field
@@ -220,9 +223,6 @@ declare namespace pc {
 
     interface ScriptType {
         [key: string]: any;
-        app: pc.Application;
-        entity: pc.Entity;
-        enabled: boolean;
 
         /**
          * initialize is called if defined when script is about to run for the first time.
@@ -231,7 +231,7 @@ declare namespace pc {
         initialize?(): void;
 
         /**
-         * postInitialize will run after all initialize methods are executed in the  
+         * postInitialize will run after all initialize methods are executed in the
          * same tick or enabling chain of actions.
          * @memberof ScriptType
          */
@@ -239,22 +239,22 @@ declare namespace pc {
 
         /**
          * update is called if defined for enabled (running state) scripts on each tick.
-         * @param {number} dt 
+         * @param {number} dt
          * @memberof ScriptType
          */
         update?(dt: number): void;
 
         /**
-         * postUpdate is called if defined for enabled (running state) scripts on each tick,  
+         * postUpdate is called if defined for enabled (running state) scripts on each tick,
          * after update.
          * @memberof ScriptType
          */
         postUpdate?(): void;
 
         /**
-         * This method will be called when a ScriptType that already exists in the registry   
-         * gets redefined. If the new ScriptType has a `swap` method in its prototype, 
-         * then it will be executed to perform hot-reload at runtime. 
+         * This method will be called when a ScriptType that already exists in the registry
+         * gets redefined. If the new ScriptType has a `swap` method in its prototype,
+         * then it will be executed to perform hot-reload at runtime.
          * @memberof ScriptType
          */
         swap?(): void;
@@ -274,7 +274,7 @@ declare namespace pc {
          * });
          * obj.fire('test', 1, 2); // prints 3 to the console
          */
-        on(name: string, callback: (...args: any[]) => void, scope: any): any;
+        on?(name: string, callback: (...args: any[]) => void, scope: any): any;
 
         /**
          * @function
@@ -294,7 +294,7 @@ declare namespace pc {
          * obj.off('test', handler); // Removes all handler functions, called 'test'
          * obj.off('test', handler, this); // Removes all hander functions, called 'test' with scope this
          */
-        off(name: string, callback: (...args: any[]) => void, scope: any): any;
+        off?(name: string, callback: (...args: any[]) => void, scope: any): any;
 
         /**
          * @function
@@ -305,7 +305,7 @@ declare namespace pc {
          * @example
          * obj.fire('test', 'This is the message');
          */
-        fire(name: string, arg1: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
+        fire?(name: string, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, arg6?: any, arg7?: any, arg8?: any): any;
 
         /**
          * @function
@@ -321,7 +321,7 @@ declare namespace pc {
          * obj.fire('test', 1, 2); // prints 3 to the console
          * obj.fire('test', 1, 2); // not going to get handled
          */
-        once(name: string, callback: (...args: any[]) => void, scope: any): any;
+        once?(name: string, callback: (...args: any[]) => void, scope: any): any;
 
         /**
         * @function
@@ -332,7 +332,7 @@ declare namespace pc {
         * obj.on('test', function () { }); // bind an event to 'test'
         * obj.hasEvent('test'); // returns true
         */
-        hasEvent(name: string): boolean;
+        hasEvent?(name: string): boolean;
 
     }
-}
\ No newline at end of file
+}
diff --git a/types/playcanvas/engine/scriptype.d.ts b/types/playcanvas/engine/scriptype.d.ts
index 89fb94c5c4..bd9dc5dfc0 100644
--- a/types/playcanvas/engine/scriptype.d.ts
+++ b/types/playcanvas/engine/scriptype.d.ts
@@ -1,5 +1,5 @@
 interface ScriptType {
-    name: string;
+    name?: string;
 
     /**
      * Interface to define public script attributes available in the editor. 
@@ -13,7 +13,7 @@ interface ScriptType {
      * @memberof ScriptType
      */
     initialize?(): void;
-    
+
     /**
      * postInitialize will run after all initialize methods are executed in the  
      * same tick or enabling chain of actions.
@@ -42,4 +42,4 @@ interface ScriptType {
      * @memberof ScriptType
      */
     swap?(): void;
-}
\ No newline at end of file
+}
diff --git a/types/playcanvas/engine/shape/bounding-box.d.ts b/types/playcanvas/engine/shape/bounding-box.d.ts
index 67340a2246..b91183b607 100644
--- a/types/playcanvas/engine/shape/bounding-box.d.ts
+++ b/types/playcanvas/engine/shape/bounding-box.d.ts
@@ -21,6 +21,10 @@ declare namespace pc {
          */
         add(other: pc.BoundingBox): void;
 
+        copy(src: pc.BoundingBox): void;
+
+        clone(): pc.BoundingBox;
+
         /**
          * @function
          * @name pc.BoundingBox#intersects
@@ -38,7 +42,7 @@ declare namespace pc {
          * @param {pc.Vec3} [point] If there is an intersection, the intersection point will be copied into here.
          * @returns {Boolean} True if there is an intersection.
          */
-        intersectsRay(ray: pc.Ray, point: pc.Vec3): boolean;
+        intersectsRay(ray: pc.Ray, point?: pc.Vec3): boolean;
 
         /**
          * @function
diff --git a/types/playcanvas/engine/shape/bounding-sphere.d.ts b/types/playcanvas/engine/shape/bounding-sphere.d.ts
index 5fd1c3503f..f25c92072b 100644
--- a/types/playcanvas/engine/shape/bounding-sphere.d.ts
+++ b/types/playcanvas/engine/shape/bounding-sphere.d.ts
@@ -24,7 +24,7 @@ declare namespace pc {
          * @param {pc.Vec3} [point] If there is an intersection, the intersection point will be copied into here.
          * @returns {Boolean} True if there is an intersection.
          */
-        intersectsRay(ray: pc.Ray, point: pc.Vec3): boolean;
+        intersectsRay(ray: pc.Ray, point?: pc.Vec3): boolean;
 
         /**
          * @function
diff --git a/types/playcanvas/engine/shape/oriented-box.d.ts b/types/playcanvas/engine/shape/oriented-box.d.ts
index 47ca9df330..aeff67f2e8 100644
--- a/types/playcanvas/engine/shape/oriented-box.d.ts
+++ b/types/playcanvas/engine/shape/oriented-box.d.ts
@@ -21,7 +21,7 @@ declare namespace pc {
          * @param {pc.Vec3} [point] If there is an intersection, the intersection point will be copied into here.
          * @returns {Boolean} True if there is an intersection.
          */
-        intersectsRay(ray: pc.Ray, point: pc.Vec3): boolean;
+        intersectsRay(ray: pc.Ray, point?: pc.Vec3): boolean;
 
         /**
          * @function
diff --git a/types/playcanvas/engine/shape/plane.d.ts b/types/playcanvas/engine/shape/plane.d.ts
index a7ce142fd6..fcb8a557dc 100644
--- a/types/playcanvas/engine/shape/plane.d.ts
+++ b/types/playcanvas/engine/shape/plane.d.ts
@@ -9,7 +9,10 @@ declare namespace pc {
      * @param {pc.Vec3} [normal] Normal of the plane. The constructor takes a reference of this parameter.
      */
     class Plane {
-        constructor(point: pc.Vec3, normal: pc.Vec3)
+        constructor(point?: pc.Vec3, normal?: pc.Vec3)
+
+        point: pc.Vec3;
+        normal: pc.Vec3;
 
         /**
          * @function
@@ -30,6 +33,6 @@ declare namespace pc {
          * @param {pc.Vec3} [point] If there is an intersection, the intersection point will be copied into here
          * @returns {Boolean} True if there is an intersection
          */
-        intersectsRay(ray: pc.Ray, point: pc.Vec3): boolean;
+        intersectsRay(ray: pc.Ray, point?: pc.Vec3): boolean;
     }
 }
diff --git a/types/playcanvas/engine/vr/vr-display.d.ts b/types/playcanvas/engine/vr/vr-display.d.ts
index a39562c143..c0d23fc944 100644
--- a/types/playcanvas/engine/vr/vr-display.d.ts
+++ b/types/playcanvas/engine/vr/vr-display.d.ts
@@ -1,5 +1,5 @@
-type NativeVRDisplay = typeof VRDisplay;
-type NativeVRDisplayCapabilities = typeof VRDisplayCapabilities;
+type NativeVRDisplay = VRDisplay;
+type NativeVRDisplayCapabilities = VRDisplayCapabilities;
 
 declare namespace pc {
 
@@ -96,6 +96,6 @@ declare namespace pc {
         * @description Return the current frame data that is updated during polling.
         * @returns {VRFrameData} The frame data object
         */
-        getFrameData(): void;    
+        getFrameData(): void;
     }
 }
diff --git a/types/playcanvas/index.d.ts b/types/playcanvas/index.d.ts
index 03899cd1b9..24fe7ec6ee 100644
--- a/types/playcanvas/index.d.ts
+++ b/types/playcanvas/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Philippe Vaillancourt <https://github.com/Neoflash1979>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="webvr-api" />
 /// <reference path="./engine/scriptype.d.ts" />
 /// <reference path="./engine/core/debug.d.ts" />
 /// <reference path="./engine/core/color.d.ts" />
@@ -52,10 +53,14 @@
 /// <reference path="./engine/math/vec3.d.ts" />
 /// <reference path="./engine/math/vec4.d.ts" />
 /// <reference path="./engine/net/http.d.ts" />
+/// <reference path="./engine/resources/animation.d.ts" />
 /// <reference path="./engine/resources/css.d.ts" />
+/// <reference path="./engine/resources/cubemap.d.ts" />
 /// <reference path="./engine/resources/loader.d.ts" />
-/// <reference path="./engine/resources/script.d.ts" />
+/// <reference path="./engine/resources/material.d.ts" />
 /// <reference path="./engine/resources/model.d.ts" />
+/// <reference path="./engine/resources/script.d.ts" />
+/// <reference path="./engine/resources/texture.d.ts" />
 /// <reference path="./engine/script/script-registry.d.ts" />
 /// <reference path="./engine/script/script.d.ts" />
 /// <reference path="./engine/shape/bounding-box.d.ts" />
@@ -72,6 +77,7 @@
 /// <reference path="./engine/scene/material.d.ts" />
 /// <reference path="./engine/scene/mesh.d.ts" />
 /// <reference path="./engine/scene/model.d.ts" />
+/// <reference path="./engine/scene/morph.d.ts" />
 /// <reference path="./engine/scene/pick.d.ts" />
 /// <reference path="./engine/scene/scene.d.ts" />
 /// <reference path="./engine/scene/procedural.d.ts" />

From 574ea0954ec287413f4beb5233e06bca21899b24 Mon Sep 17 00:00:00 2001
From: Damian Senn <senn@puzzle.ch>
Date: Mon, 26 Feb 2018 20:47:25 +0100
Subject: [PATCH 290/388] jQuery offset method might return undefined (#23821)

---
 types/jquery/v1/index.d.ts | 2 +-
 types/jquery/v2/index.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/jquery/v1/index.d.ts b/types/jquery/v1/index.d.ts
index ee66781019..8cbc9c5789 100644
--- a/types/jquery/v1/index.d.ts
+++ b/types/jquery/v1/index.d.ts
@@ -1771,7 +1771,7 @@ interface JQuery {
      * Get the current coordinates of the first element in the set of matched elements, relative to the document.
      * @see {@link https://api.jquery.com/offset/#offset}
      */
-    offset(): JQueryCoordinates;
+    offset(): JQueryCoordinates | undefined;
     /**
      * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
      *
diff --git a/types/jquery/v2/index.d.ts b/types/jquery/v2/index.d.ts
index 9d30f12c38..2f9a79adf4 100644
--- a/types/jquery/v2/index.d.ts
+++ b/types/jquery/v2/index.d.ts
@@ -1771,7 +1771,7 @@ interface JQuery {
      * Get the current coordinates of the first element in the set of matched elements, relative to the document.
      * @see {@link https://api.jquery.com/offset/#offset}
      */
-    offset(): JQueryCoordinates;
+    offset(): JQueryCoordinates | undefined;
     /**
      * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements.
      *

From fe309837c42f5ac261488e706600f0fafab87d39 Mon Sep 17 00:00:00 2001
From: Jesse Pinho <jesse@jessepinho.com>
Date: Mon, 26 Feb 2018 20:49:30 +0100
Subject: [PATCH 291/388] Add typing for `hrefTo` in @storybook/addon-links
 (#23811)

* Add typing for `hrefTo`

See [the documentation for `hrefTo`](https://github.com/storybooks/storybook/blob/1a550e912b0c484ae787dc44809add30f6291dc4/addons/links/README.md#hrefto-function).

* Addd definition author

* Add type usage to tests

* Update the package version
---
 types/storybook__addon-links/index.d.ts                    | 7 +++++--
 .../storybook__addon-links-tests.tsx                       | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/types/storybook__addon-links/index.d.ts b/types/storybook__addon-links/index.d.ts
index 141072aa2a..72ec6aa296 100644
--- a/types/storybook__addon-links/index.d.ts
+++ b/types/storybook__addon-links/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for @storybook/addon-links 3.0
+// Type definitions for @storybook/addon-links 3.3
 // Project: https://github.com/storybooks/storybook
-// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions by: Joscha Feth <https://github.com/joscha>,
+//                 Jesse Pinho <https://github.com/jessepinho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -9,3 +10,5 @@ import * as React from 'react';
 export type LinkToFunction = (...args: any[]) => string;
 
 export function linkTo<T>(book: string | LinkToFunction, kind?: string | LinkToFunction): React.MouseEventHandler<T>;
+
+export function hrefTo(kind: string, story: string): Promise<string>;
diff --git a/types/storybook__addon-links/storybook__addon-links-tests.tsx b/types/storybook__addon-links/storybook__addon-links-tests.tsx
index 2f138daf20..e922b0fc00 100644
--- a/types/storybook__addon-links/storybook__addon-links-tests.tsx
+++ b/types/storybook__addon-links/storybook__addon-links-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { storiesOf } from '@storybook/react';
-import { linkTo } from '@storybook/addon-links';
+import { hrefTo, linkTo } from '@storybook/addon-links';
 
 storiesOf('Button', module)
   .add('First', () => (
@@ -12,3 +12,5 @@ storiesOf('Button', module)
   .add('With function', () => (
     <button onClick={linkTo((arg1, arg2) => 'Button', () => 'First')}>Go to "First"</button>
   ));
+
+hrefTo('Button', 'First').then(link => link);

From d2afdde5ba6bd8de808178a863a1614dc3feae0b Mon Sep 17 00:00:00 2001
From: Jan Lohage <j2L4e@users.noreply.github.com>
Date: Mon, 26 Feb 2018 20:52:21 +0100
Subject: [PATCH 292/388] @feathersjs/feathers + @feathersjs/socketio: Minor
 fixes (#23822)

* [@feathersjs] add @feathersjs/socket-commons import to @feathersjs/socketio and @feathersjs/primus packages

* [@feathersjs] fix ts version in @feathersjs/socketio and @feathersjs/primus packages

* [@feathersjs] really fix ts version in @feathersjs/socketio and @feathersjs/primus packages

* add express reexports

* @feathersjs/feathers: add generic default type to `Application` interface
@feathersjs/feathers: make Params.paginate optional
@feathersjs/socketio: make callback optional

* change Hook return type from undefined to void

* Update index.d.ts

* disable tslint rule 'void-return' for specific callback

* Update index.d.ts

* Update index.d.ts
---
 types/feathersjs__feathers/index.d.ts       | 15 ++++++++-------
 types/feathersjs__socket-commons/index.d.ts |  6 ++++--
 types/feathersjs__socketio/index.d.ts       |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/types/feathersjs__feathers/index.d.ts b/types/feathersjs__feathers/index.d.ts
index c10a173f06..6ae7b22238 100644
--- a/types/feathersjs__feathers/index.d.ts
+++ b/types/feathersjs__feathers/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jan Lohage <https://github.com/j2L4e>, Abraao Alves <https://github.com/AbraaoAlves>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
@@ -30,7 +30,7 @@ export type ServerSideParams = Params;
 
 export interface Params {
     query?: Query;
-    paginate: false | Pick<PaginationOptions, 'max'>;
+    paginate?: false | Pick<PaginationOptions, 'max'>;
 
     [key: string]: any; // (JL) not sure if we want this
 }
@@ -42,10 +42,11 @@ export interface Paginated<T> {
     data: T[];
 }
 
-export type Hook = <T>(hook: HookContext<T>) => (Promise<HookContext<T>> | undefined);
+// tslint:disable-next-line void-return
+export type Hook = <T>(hook: HookContext<T>) => (Promise<HookContext<T>> | void);
 
 export interface HookContext<T> {
-    app?: Application<any>;
+    app?: Application;
     data?: T;
     error?: any;
     id?: string | number;
@@ -89,7 +90,7 @@ export interface ServiceMethods<T> {
 }
 
 export interface SetupMethod {
-    setup(app: Application<any>, path: string): void;
+    setup(app: Application, path: string): void;
 }
 
 export interface ServiceOverloads<T> {
@@ -106,7 +107,7 @@ export interface ServiceAddons<T> extends EventEmitter {
 
 export type Service<T> = ServiceOverloads<T> & ServiceAddons<T> & ServiceMethods<T>;
 
-export interface Application<ServiceTypes> extends EventEmitter {
+export interface Application<ServiceTypes = any> extends EventEmitter {
     get(name: string): any;
 
     set(name: string, value: any): this;
@@ -129,7 +130,7 @@ export interface Application<ServiceTypes> extends EventEmitter {
 
     service(location: string): Service<any>;
 
-    use(path: string, service: Partial<ServiceMethods<any> & SetupMethod> | Application<any>, options?: any): this;
+    use(path: string, service: Partial<ServiceMethods<any> & SetupMethod> | Application, options?: any): this;
 
     version: string;
 }
diff --git a/types/feathersjs__socket-commons/index.d.ts b/types/feathersjs__socket-commons/index.d.ts
index fca658bf76..043009fd5e 100644
--- a/types/feathersjs__socket-commons/index.d.ts
+++ b/types/feathersjs__socket-commons/index.d.ts
@@ -28,8 +28,10 @@ declare module '@feathersjs/feathers' {
     interface Application<ServiceTypes> {
         channel(...names: string[]): Channel;
 
-        publish<T>(callback: (data: T, hook: HookContext<T>) => Channel | Channel[]): Application<ServiceTypes>;
+        // tslint:disable-next-line void-return
+        publish<T>(callback: (data: T, hook: HookContext<T>) => Channel | Channel[] | void): Application<ServiceTypes>;
 
-        publish<T>(event: string, callback: (data: T, hook: HookContext<T>) => Channel | Channel[]): Application<ServiceTypes>;
+        // tslint:disable-next-line void-return
+        publish<T>(event: string, callback: (data: T, hook: HookContext<T>) => Channel | Channel[] | void): Application<ServiceTypes>;
     }
 }
diff --git a/types/feathersjs__socketio/index.d.ts b/types/feathersjs__socketio/index.d.ts
index 34b78eb749..7ba889dfbe 100644
--- a/types/feathersjs__socketio/index.d.ts
+++ b/types/feathersjs__socketio/index.d.ts
@@ -7,6 +7,6 @@
 /// <reference types="socket.io" />
 /// <reference types="feathersjs__socket-commons"/>
 
-export default function feathersSocketIO(callback: (io: SocketIO.Server) => void): () => void;
+export default function feathersSocketIO(callback?: (io: SocketIO.Server) => void): () => void;
 export default function feathersSocketIO(options: number | SocketIO.ServerOptions, callback?: (io: SocketIO.Server) => void): () => void;
 export default function feathersSocketIO(port: number, options?: SocketIO.ServerOptions, callback?: (io: SocketIO.Server) => void): () => void;

From 8617cbac9c3e11bcd0ce233bbca9a5d2220a9474 Mon Sep 17 00:00:00 2001
From: Thomas Gossmann <gossi@users.noreply.github.com>
Date: Mon, 26 Feb 2018 20:52:58 +0100
Subject: [PATCH 293/388] Make options hash optional on
 `DS.Model.destroyRecord()` (#23820)

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

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index f0bb87a00d..7b78770489 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -491,7 +491,7 @@ declare module 'ember-data' {
             /**
              * Same as `deleteRecord`, but saves the record immediately.
              */
-            destroyRecord(options: {}): RSVP.Promise<any>;
+            destroyRecord(options?: {}): RSVP.Promise<any>;
             /**
              * Unloads the record from the store. This will cause the record to be destroyed and freed up for garbage collection.
              */

From 61c2fa61d96857f4ee78fb48a6094e10dd1d9e3f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 26 Feb 2018 20:53:18 +0100
Subject: [PATCH 294/388] fix: `awaitWriteFinish` can also be a `boolean`
 (#23818)

https://www.npmjs.com/package/chokidar
---
 types/chokidar/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/chokidar/index.d.ts b/types/chokidar/index.d.ts
index 396ad10e0a..6acc9af265 100644
--- a/types/chokidar/index.d.ts
+++ b/types/chokidar/index.d.ts
@@ -149,7 +149,7 @@ export interface WatchOptions {
     /**
      * can be set to an object in order to adjust timing params:
      */
-    awaitWriteFinish?: AwaitWriteFinishOptions;
+    awaitWriteFinish?: AwaitWriteFinishOptions | boolean;
 }
 
 export interface AwaitWriteFinishOptions {

From 940de815c698e8f56ae8fcea39f6b18c4c3f80c0 Mon Sep 17 00:00:00 2001
From: Florian Keller <github@floriankeller.de>
Date: Sun, 18 Feb 2018 17:05:40 +0100
Subject: [PATCH 295/388] Add yauzl

---
 types/yauzl/index.d.ts     | 97 ++++++++++++++++++++++++++++++++++++++
 types/yauzl/tsconfig.json  | 23 +++++++++
 types/yauzl/tslint.json    |  1 +
 types/yauzl/yauzl-tests.ts | 28 +++++++++++
 4 files changed, 149 insertions(+)
 create mode 100644 types/yauzl/index.d.ts
 create mode 100644 types/yauzl/tsconfig.json
 create mode 100644 types/yauzl/tslint.json
 create mode 100644 types/yauzl/yauzl-tests.ts

diff --git a/types/yauzl/index.d.ts b/types/yauzl/index.d.ts
new file mode 100644
index 0000000000..c0e8b5dc88
--- /dev/null
+++ b/types/yauzl/index.d.ts
@@ -0,0 +1,97 @@
+// Type definitions for yauzl 2.9
+// Project: https://github.com/thejoshwolfe/yauzl
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+import { Readable } from 'stream';
+
+export abstract class RandomAccessReader extends EventEmitter {
+    _readStreamForRange(start: number, end: number): void;
+    createReadStream(options: { start: number; end: number }): void;
+    read(buffer: Buffer, offset: number, length: number, position: number, callback: (err?: Error) => void): void;
+    close(callback: (err?: Error) => void): void;
+}
+
+export class Entry {
+    comment: string;
+    compressedSize: number;
+    compressionMethod: number;
+    crc32: number;
+    externalFileAttributes: number;
+    extraFieldLength: number;
+    extraFields: Array<{ id: number; data: Buffer }>;
+    fileCommentLength: number;
+    fileName: string;
+    fileNameLength: number;
+    generalPurposeBitFlag: number;
+    internalFileAttributes: number;
+    lastModFileDate: number;
+    lastModFileTime: number;
+    relativeOffsetOfLocalHeader: number;
+    uncompressedSize: number;
+    versionMadeBy: number;
+    versionNeededToExtract: number;
+
+    getLastModDate(): Date;
+    isEncrypted(): boolean;
+    isCompressed(): boolean;
+}
+
+export interface ZipFileOptions {
+    decompress: boolean | null;
+    decrypt: boolean | null;
+    start: number | null;
+    end: number | null;
+}
+
+export class ZipFile extends EventEmitter {
+    autoClose: boolean;
+    comment: string;
+    decodeStrings: boolean;
+    emittedError: boolean;
+    entriesRead: number;
+    entryCount: number;
+    fileSize: number;
+    isOpen: boolean;
+    lazyEntries: boolean;
+    readEntryCursor: boolean;
+    validateEntrySizes: boolean;
+
+    constructor(
+        reader: RandomAccessReader,
+        centralDirectoryOffset: number,
+        fileSize: number,
+        entryCount: number,
+        comment: string,
+        autoClose: boolean,
+        lazyEntries: boolean,
+        decodeStrings: boolean,
+        validateEntrySizes: boolean,
+    );
+
+    openReadStream(entry: Entry, options: ZipFileOptions, callback: (err?: Error, stream?: Readable) => void): void;
+    openReadStream(entry: Entry, callback: (err?: Error, stream?: Readable) => void): void;
+    close(): void;
+    readEntry(): void;
+}
+
+export interface Options {
+    autoClose?: boolean;
+    lazyEntries?: boolean;
+    decodeStrings?: boolean;
+    validateEntrySizes?: boolean;
+}
+
+export function open(path: string, options: Options, callback?: (err?: Error, zipfile?: ZipFile) => void): void;
+export function open(path: string, callback?: (err?: Error, zipfile?: ZipFile) => void): void;
+export function fromFd(fd: number, options: Options, callback?: (err?: Error, zipfile?: ZipFile) => void): void;
+export function fromFd(fd: number, callback?: (err?: Error, zipfile?: ZipFile) => void): void;
+export function fromBuffer(buffer: Buffer, options: Options, callback?: (err?: Error, zipfile?: ZipFile) => void): void;
+export function fromBuffer(buffer: Buffer, callback?: (err?: Error, zipfile?: ZipFile) => void): void;
+export function fromRandomAccessReader(reader: RandomAccessReader, totalSize: number, options: Options, callback: (err?: Error, zipfile?: ZipFile) => void): void;
+export function fromRandomAccessReader(reader: RandomAccessReader, totalSize: number, callback: (err?: Error, zipfile?: ZipFile) => void): void;
+export function dosDateTimeToDate(date: number, time: number): Date;
+export function validateFileName(fileName: string): string | null;
diff --git a/types/yauzl/tsconfig.json b/types/yauzl/tsconfig.json
new file mode 100644
index 0000000000..4ed78c552b
--- /dev/null
+++ b/types/yauzl/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",
+        "yauzl-tests.ts"
+    ]
+}
diff --git a/types/yauzl/tslint.json b/types/yauzl/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/yauzl/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/yauzl/yauzl-tests.ts b/types/yauzl/yauzl-tests.ts
new file mode 100644
index 0000000000..89dc69df30
--- /dev/null
+++ b/types/yauzl/yauzl-tests.ts
@@ -0,0 +1,28 @@
+import * as yauzl from 'yauzl';
+import { Writable } from 'stream';
+
+yauzl.open('path/to/file.zip', {lazyEntries: true}, (err, zipfile) => {
+    if (err) {
+        throw err;
+    }
+    if (zipfile) {
+        zipfile.readEntry();
+        zipfile.on('entry', entry => {
+            if (/\/$/.test(entry.fileName)) {
+                zipfile.readEntry();
+            } else {
+                zipfile.openReadStream(entry, (err, readStream) => {
+                    if (err) {
+                        throw err;
+                    }
+                    if (readStream) {
+                        readStream.on('end', () => {
+                            zipfile.readEntry();
+                        });
+                        readStream.pipe(new Writable());
+                    }
+                });
+            }
+        });
+    }
+});

From 28cc2b953d08944f872b5a06114932d9282282af Mon Sep 17 00:00:00 2001
From: Konstantin Kai <kosyak46@gmail.com>
Date: Mon, 26 Feb 2018 21:54:24 +0200
Subject: [PATCH 296/388] [expo] update definitions to expo-sdk@25.0 (#23812)

* Fix LinearGradient props

* [expo] update definitions to expo-sdk@25.0

* [expo] add changes from PRs

* [expo] add test for BarcodeScanner s barCodeTypes prop

* [expo] fix conflict with fhelwanger:camera constants

* [expo] merge fhelwanger PR s (for conflict avoid)
---
 types/expo/expo-tests.tsx     |  138 ++-
 types/expo/index.d.ts         |  698 ++++++++++-
 types/expo/v24/expo-tests.tsx |  554 +++++++++
 types/expo/v24/index.d.ts     | 2101 +++++++++++++++++++++++++++++++++
 types/expo/v24/tsconfig.json  |   32 +
 types/expo/v24/tslint.json    |    7 +
 6 files changed, 3479 insertions(+), 51 deletions(-)
 create mode 100644 types/expo/v24/expo-tests.tsx
 create mode 100644 types/expo/v24/index.d.ts
 create mode 100644 types/expo/v24/tsconfig.json
 create mode 100644 types/expo/v24/tslint.json

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index 6a1f17ae3f..187d62b2ee 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -27,7 +27,10 @@ import {
     LinearGradient,
     Permissions,
     registerRootComponent,
-    ScreenOrientation
+    ScreenOrientation,
+    SQLite,
+    Calendar,
+    MailComposer
 } from 'expo';
 
 Accelerometer.addListener((obj) => {
@@ -207,7 +210,7 @@ const barcodeReadCallback = () => {};
     <BarCodeScanner
         type="front"
         torchMode="off"
-        barCodeTypes={['s']}
+        barCodeTypes={[BarCodeScanner.Constants.BarCodeType.aztec]}
         onBarCodeRead={barcodeReadCallback} />
 );
 
@@ -515,9 +518,13 @@ KeepAwake.deactivate();
 () => (
     <LinearGradient
         colors={['#fff']}
-        start={[1, 1]}
-        end={[3, 3]}
-        locations={[1, 2]} />
+        start={[1, 1]} />
+);
+
+() => (
+    <LinearGradient
+        colors={['#fff']}
+        style={{ flex: 1 }} />
 );
 
 Permissions.CAMERA === 'camera';
@@ -548,3 +555,124 @@ class __TestEntry__ extends React.Component {
     }
 }
 registerRootComponent(__TestEntry__);
+
+Calendar.EntityTypes.EVENT === 'event';
+Calendar.EntityTypes.REMINDER === 'reminder';
+
+Calendar.CalendarType.LOCAL === 'local';
+Calendar.CalendarType.CALDAV === 'caldav';
+Calendar.CalendarType.EXCHANGE === 'exchange';
+Calendar.CalendarType.SUBSCRIBED === 'subscribed';
+Calendar.CalendarType.BIRTHDAYS === 'birthdays';
+
+async () => {
+    const result = await Calendar.getCalendarsAsync(Calendar.EntityTypes.EVENT);
+    result.length;
+
+    const calendar = result[0];
+    calendar.id === '';
+    calendar.title === '';
+    calendar.sourceId === '';
+    calendar.type === Calendar.CalendarType.BIRTHDAYS;
+    calendar.color === '';
+    calendar.entityType === Calendar.EntityTypes.EVENT;
+    calendar.allowsModifications === true;
+    calendar.allowedAvailabilities === [''];
+    calendar.isPrimary === true;
+    calendar.name === '';
+    calendar.ownerAccount === '';
+    calendar.timeZone === '';
+    calendar.allowedReminders === [''];
+    calendar.allowedAttendeeTypes === [''];
+    calendar.isVisible === false;
+    calendar.isSynced === false;
+    calendar.accessLevel === Calendar.CalendarAccessLevel.CONTRIBUTOR;
+
+    if (calendar.source) {
+        calendar.source.id === '';
+        calendar.source.type === '';
+        calendar.source.name === '';
+        calendar.source.isLocalAccount === false;
+    }
+
+    const id1 =  await Calendar.createCalendarAsync({
+        accessLevel: Calendar.CalendarAccessLevel.EDITOR
+    });
+
+    id1 === '';
+
+    const id2 = await Calendar.updateCalendarAsync('1234', {
+        isVisible: false
+    });
+
+    id2 === '';
+
+    const id3 = await Calendar.updateCalendarAsync('1234', null);
+
+    await Calendar.deleteCalendarAsync('1234');
+
+    const events = await Calendar.getEventsAsync(
+        ['123', '124'],
+        new Date(),
+        new Date()
+    );
+
+    const event1 = events[0];
+
+    event1.accessLevel === Calendar.EventAccessLevel.CONFIDENTIAL;
+    event1.alarms === [];
+    event1.allDay === true;
+    event1.availability === Calendar.Availability.FREE;
+    event1.calendarId === '';
+    event1.creationDate === '';
+    event1.endDate === '';
+    event1.endTimeZone === '';
+    event1.guestsCanInviteOthers === true;
+    event1.guestsCanModify === true;
+    event1.guestsCanSeeGuests === false;
+    event1.id === '';
+    event1.instanceId === '';
+    event1.isDetached === false;
+
+    const event2 = await Calendar.getEventAsync('123', {
+        futureEvents: true
+    });
+
+    const eventId1 = await Calendar.createEventAsync('123');
+
+    const eventId2 = await Calendar.updateEventAsync('1234');
+
+    await Calendar.deleteEventAsync('1234');
+
+    const attendees = await Calendar.getAttendeesForEventAsync('123');
+
+    const aId1 = await Calendar.createAttendeeAsync('123');
+
+    const aId2 = await Calendar.updateAttendeeAsync('123');
+
+    await Calendar.deleteAttendeeAsync('123');
+
+    const reminders = await Calendar.getRemindersAsync(['123']);
+
+    const reminder = await Calendar.getReminderAsync('123');
+
+    const remId1 = await Calendar.createReminderAsync('123');
+
+    const remId2 = await Calendar.updateReminderAsync('123');
+
+    await Calendar.deleteReminderAsync('123');
+
+    const sources = await Calendar.getSourcesAsync();
+
+    const source = await Calendar.getSourceAsync('123');
+
+    Calendar.openEventInCalendar('123');
+};
+
+async () => {
+    const result = await MailComposer.composeAsync({
+        subject: 'sss'
+    });
+
+    result.status === 'saved';
+};
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index ae7e45841d..a747a881e6 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for expo 24.0
+// Type definitions for expo 25.0
 // Project: https://github.com/expo/expo-sdk
 // Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
 //                 Martynas Kadiša <https://github.com/martynaskadisa>
 //                 Jan Aagaard <https://github.com/janaagaard75>
 //                 Sergio Sánchez <https://github.com/ssanchezmarc>
+//                 Fernando Helwanger <https://github.com/fhelwanger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -632,7 +633,14 @@ export interface BarCodeScannerProps extends ViewProperties {
     onBarCodeRead?: BarCodeReadCallback;
 }
 
-export class BarCodeScanner extends Component<BarCodeScannerProps> { }
+export class BarCodeScanner extends Component<BarCodeScannerProps> {
+    static Constants: {
+        TorchMode: {
+            on: string;
+            off: string
+        }
+    } & CameraConstants;
+}
 // #endregion
 
 // #region BlurView
@@ -686,17 +694,21 @@ export class CameraObject {
 }
 
 export interface CameraProps extends ViewProperties {
-    flashMode?: string | number;
-    type?: string | number;
-    ratio?: string;
-    autoFocus?: string | number | boolean;
-    focusDepth?: FloatFromZeroToOne;
     zoom?: FloatFromZeroToOne;
-    whiteBalance?: string | number;
-    barCodeTypes?: string[];
+    ratio?: string;
+    focusDepth?: FloatFromZeroToOne;
+    type?: string | number;
     onCameraReady?: () => void;
-    onMountError?: () => void;
     onBarCodeRead?: BarCodeReadCallback;
+    faceDetectionMode?: number;
+    flashMode?: string | number;
+    barCodeTypes?: Array<string | number>;
+    whiteBalance?: string | number;
+    faceDetectionLandmarks?: number;
+    autoFocus?: string | number | boolean;
+    faceDetectionClassifications?: number;
+    onMountError?: () => void;
+    onFacesDetected?: (options: { faces: TrackedFaceFeature[] }) => void;
     ref?: Ref<CameraObject>;
 }
 
@@ -706,7 +718,28 @@ export interface CameraConstants {
     readonly AutoFocus: string;
     readonly WhiteBalance: string;
     readonly VideoQuality: string;
-    readonly BarCodeType: string;
+    readonly BarCodeType: {
+        aztec: string;
+        codabar: string;
+        code39: string;
+        code93: string;
+        code128: string;
+        code138: string;
+        code39mod43: string;
+        datamatrix: string;
+        ean13: string;
+        ean8: string;
+        interleaved2of5: string;
+        itf14: string;
+        maxicode: string;
+        pdf417: string;
+        rss14: string;
+        rssexpanded: string;
+        upc_a: string;
+        upc_e: string;
+        upc_ean: string;
+        qr: string;
+    };
 }
 
 export class Camera extends Component<CameraProps> {
@@ -726,10 +759,14 @@ export namespace Constants {
     const isDevice: boolean;
 
     interface Platform {
-        ios: {
+        ios?: {
             platform: string;
             model: string;
             userInterfaceIdiom: string;
+            buildNumber: string;
+        };
+        android?: {
+            versionCode: string;
         };
     }
     const platform: Platform;
@@ -1088,36 +1125,42 @@ export namespace FacebookAds {
 /**
  * FaceDetector
  */
+export interface Point {
+    x: Axis;
+    y: Axis;
+}
+
+export interface FaceFeature {
+    bounds: {
+        size: {
+            width: number;
+            height: number;
+        },
+        origin: Point;
+    };
+    smilingProbability?: number;
+    leftEarPosition?: Point;
+    rightEarPosition?: Point;
+    leftEyePosition?: Point;
+    leftEyeOpenProbability?: number;
+    rightEyePosition?: Point;
+    rightEyeOpenProbability?: number;
+    leftCheekPosition?: Point;
+    rightCheekPosition?: Point;
+    leftMouthPosition?: Point;
+    mouthPosition?: Point;
+    rightMouthPosition?: Point;
+    bottomMouthPosition?: Point;
+    noseBasePosition?: Point;
+    yawAngle?: number;
+    rollAngle?: number;
+}
+
+export interface TrackedFaceFeature extends FaceFeature {
+    faceID?: number;
+}
+
 export namespace FaceDetector {
-    interface Point {
-        x: Axis;
-        y: Axis;
-    }
-    interface FaceFeature {
-        bounds: {
-            size: {
-                width: number;
-                height: number;
-            },
-            origin: Point;
-        };
-        smilingProbability?: number;
-        leftEarPosition?: Point;
-        rightEarPosition?: Point;
-        leftEyePosition?: Point;
-        leftEyeOpenProbability?: number;
-        rightEyePosition?: Point;
-        rightEyeOpenProbability?: number;
-        leftCheekPosition?: Point;
-        rightCheekPosition?: Point;
-        leftMouthPosition?: Point;
-        mouthPosition?: Point;
-        rightMouthPosition?: Point;
-        bottomMouthPosition?: Point;
-        noseBasePosition?: Point;
-        yawAngle?: number;
-        rollAngle?: number;
-    }
     interface DetectFaceResult {
         faces: FaceFeature[];
         image: {
@@ -1153,7 +1196,6 @@ export namespace FaceDetector {
 
     function detectFaces(uri: string, options?: DetectionOptions): Promise<DetectFaceResult>;
 }
-
 /**
  * FileSystem
  */
@@ -1509,11 +1551,11 @@ export class KeepAwake extends Component {
 /**
  * LinearGradient
  */
-export interface LinearGradientProps {
+export interface LinearGradientProps extends ViewProperties {
     colors: string[];
-    start: [number, number];
-    end: [number, number];
-    locations: number[];
+    start?: [number, number];
+    end?: [number, number];
+    locations?: number[];
 }
 
 export class LinearGradient extends Component<LinearGradientProps> { }
@@ -1764,6 +1806,12 @@ export namespace Speech {
     function speak(text: string, options?: SpeechOptions): void;
     function stop(): void;
     function isSpeakingAsync(): Promise<boolean>;
+
+    /** Available on iOS only */
+    function pause(): void;
+
+    /** Available on iOS only */
+    function resume(): void;
 }
 
 /**
@@ -2070,3 +2118,561 @@ export namespace WebBrowser {
     function openAuthSessionAsync(url: string, redirectUrl?: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
     function dismissBrowser(): Promise<{ type: 'dismissed' }>;
 }
+
+// #region Calendar
+/**
+ * Calendar
+ *
+ * Provides an API for interacting with the device’s system calendars, events, reminders, and associated records.
+ */
+export namespace Calendar {
+    interface Calendar {
+        /** Internal ID that represents this calendar on the device */
+        id?: string;
+
+        /** Visible name of the calendar */
+        title?: string;
+
+        sourceId?: string; // iOS
+
+        /** Object representing the source to be used for the calendar */
+        source?: Source;
+
+        /** Type of calendar this object represents */
+        type?: CalendarType; // iOS
+
+        /** Color used to display this calendar’s events */
+        color?: string;
+
+        /** Whether the calendar is used in the Calendar or Reminders OS app */
+        entityType?: EntityTypes; // iOS
+
+        /** Boolean value that determines whether this calendar can be modified */
+        allowsModifications?: boolean;
+
+        /** Availability types that this calendar supports */
+        allowedAvailabilities?: Availability[];
+
+        /** Boolean value indicating whether this is the device’s primary calendar */
+        isPrimary?: boolean; // Android
+
+        /** Internal system name of the calendar */
+        name?: string; // Android
+
+        /** Name for the account that owns this calendar */
+        ownerAccount?: string; // Android
+
+        /** Time zone for the calendar	 */
+        timeZone?: string; // Android
+
+        /** Alarm methods that this calendar supports */
+        allowedReminders?: AlarmMethod[]; // Android
+
+        /** Attendee types that this calendar supports */
+        allowedAttendeeTypes?: AttendeeType[]; // Android
+
+        /** Indicates whether the OS displays events on this calendar */
+        isVisible?: boolean; // Android
+
+        /** Indicates whether this calendar is synced and its events stored on the device */
+        isSynced?: boolean; // Android
+
+        /** Level of access that the user has for the calendar */
+        accessLevel?: CalendarAccessLevel; // Android
+    }
+
+    interface Source {
+        /** Internal ID that represents this source on the device */
+        id?: string; // iOS only ??
+
+        /** Type of account that owns this calendar */
+        type?: string;
+
+        /** Name for the account that owns this calendar */
+        name?: string;
+
+        /** Whether this source is the local phone account */
+        isLocalAccount?: boolean; // Android
+    }
+
+    interface Event {
+        /** Internal ID that represents this event on the device */
+        id?: string;
+
+        /** ID of the calendar that contains this event */
+        calendarId?: string;
+
+        /** Visible name of the event */
+        title?: string;
+
+        /** Location field of the event	 */
+        location?: string;
+
+        /** Date when the event record was created */
+        creationDate?: string; // iOS
+
+        /** Date when the event record was last modified */
+        lastModifiedDate?: string; // iOS
+
+        /** Time zone the event is scheduled in */
+        timeZone?: string;
+
+        /** Time zone for the event end time */
+        endTimeZone?: string; // Android
+
+        /** URL for the event */
+        url?: string; // iOS
+
+        /** Description or notes saved with the event */
+        notes?: string;
+
+        /** Array of Alarm objects which control automated reminders to the user */
+        alarms?: Alarm[];
+
+        /** Object representing rules for recurring or repeating events. Null for one-time events. */
+        recurrenceRule?: RecurrenceRule;
+
+        /** Date object or string representing the time when the event starts */
+        startDate?: string;
+
+        /** Date object or string representing the time when the event ends */
+        endDate?: string;
+
+        /** For recurring events, the start date for the first (original) instance of the event */
+        originalStartDate?: string; // iOS
+
+        /** Boolean value indicating whether or not the event is a detached (modified) instance of a recurring event */
+        isDetached?: boolean; // iOS
+
+        /** Whether the event is displayed as an all-day event on the calendar */
+        allDay?: boolean;
+
+        /** The availability setting for the event */
+        availability?: Availability; // Availability
+
+        /** Status of the event */
+        status?: EventStatus; // Status
+
+        /** Organizer of the event, as an Attendee object */
+        organizer?: string; // Organizer - iOS
+
+        /** Email address of the organizer of the event */
+        organizerEmail?: string; // Android
+
+        /** User’s access level for the event */
+        accessLevel?: EventAccessLevel; // Android,
+
+        /** Whether invited guests can modify the details of the event */
+        guestsCanModify?: boolean; // Android,
+
+        /** Whether invited guests can invite other guests */
+        guestsCanInviteOthers?: boolean; // Android
+
+        /** Whether invited guests can see other guests */
+        guestsCanSeeGuests?: boolean; // Android
+
+        /** For detached (modified) instances of recurring events, the ID of the original recurring event */
+        originalId?: string; // Android
+
+        /** For instances of recurring events, volatile ID representing this instance; not guaranteed to always refer to the same instance */
+        instanceId?: string; // Android
+    }
+
+    interface Attendee {
+        /** Internal ID that represents this attendee on the device */
+        id?: string; // Android
+
+        /** Indicates whether or not this attendee is the current OS user */
+        isCurrentUser?: boolean; // iOS
+
+        /** Displayed name of the attendee */
+        name?: string;
+
+        /** Role of the attendee at the event */
+        role?: AttendeeRole;
+
+        /** Status of the attendee in relation to the event */
+        status?: AttendeeStatus;
+
+        /** Type of the attendee */
+        type?: AttendeeType;
+
+        /** URL for the attendee */
+        url?: string; // iOS
+
+        /** Email address of the attendee */
+        email?: string; // Android
+    }
+
+    interface Reminder {
+        /** Internal ID that represents this reminder on the device */
+        id?: string;
+
+        /** ID of the calendar that contains this reminder */
+        calendarId?: string;
+
+        /** Visible name of the reminder */
+        title?: string;
+
+        /** Location field of the reminder */
+        location?: string;
+
+        /** Date when the reminder record was created */
+        creationDate?: string;
+
+        /** Date when the reminder record was last modified */
+        lastModifiedDate?: string;
+
+        /** Time zone the reminder is scheduled in */
+        timeZone?: string;
+
+        /** URL for the reminder */
+        url?: string;
+
+        /** Description or notes saved with the reminder */
+        notes?: string;
+
+        /** Array of Alarm objects which control automated alarms to the user about the task */
+        alarms?: Alarm[];
+
+        /** Object representing rules for recurring or repeated reminders. Null for one-time tasks. */
+        recurrenceRule?: RecurrenceRule;
+
+        /** Date object or string representing the start date of the reminder task */
+        startDate?: string;
+
+        /** Date object or string representing the time when the reminder task is due */
+        dueDate?: string;
+
+        /** Indicates whether or not the task has been completed */
+        completed?: boolean;
+
+        /** Date object or string representing the date of completion, if completed is true */
+        completionDate?: string;
+    }
+
+    interface Alarm {
+        /** Date object or string representing an absolute time the alarm should occur; overrides relativeOffset and structuredLocation if specified alongside either */
+        absoluteDate?: string; // iOS
+
+        /** Number of minutes from the startDate of the calendar item that the alarm should occur; use negative values to have the alarm occur before the startDate */
+        relativeOffset?: string;
+        structuredLocation?: {
+            // iOS
+            title?: string;
+            proximity?: string; // Proximity
+            radius?: number;
+            coords?: {
+                latitude?: number;
+                longitude?: number;
+            };
+        };
+
+        /** Method of alerting the user that this alarm should use; on iOS this is always a notification */
+        method?: AlarmMethod; // Method, Android
+    }
+
+    interface RecurrenceRule {
+        /** How often the calendar item should recur */
+        frequency: Frequency; // Frequency
+
+        /** Interval at which the calendar item should recur. For example, an interval: 2 with frequency: DAILY would yield an event that recurs every other day. Defaults to 1 . */
+        interval?: number;
+
+        /** Date on which the calendar item should stop recurring; overrides occurrence if both are specified */
+        endDate?: string;
+
+        /** Number of times the calendar item should recur before stopping */
+        occurrence?: number;
+    }
+
+    enum EntityTypes {
+        EVENT = 'event',
+        REMINDER = 'reminder',
+    }
+
+    enum CalendarType {
+        LOCAL = 'local',
+        CALDAV = 'caldav',
+        EXCHANGE = 'exchange',
+        SUBSCRIBED = 'subscribed',
+        BIRTHDAYS = 'birthdays'
+    }
+
+    enum Availability {
+        NOT_SUPPORTED = 'notSupported', // iOS
+        BUSY = 'busy',
+        FREE = 'free',
+        TENTATIVE = 'tentative',
+        UNAVAILABLE = 'unavailable' // iOS
+    }
+
+    enum AlarmMethod {
+        ALARM = 'alarm',
+        ALERT = 'alert',
+        EMAIL = 'email',
+        SMS = 'sms',
+        DEFAULT = 'default',
+    }
+
+    enum AttendeeType {
+        UNKNOWN = 'unknown', // iOS
+        PERSON = 'person', // iOS
+        ROOM = 'room', // iOS
+        GROUP = 'group', // iOS
+        RESOURCE = 'resource',
+        OPTIONAL = 'optional', // Android
+        REQUIRED = 'required', // Android
+        NONE = 'none' // Android
+    }
+
+    enum CalendarAccessLevel {
+        CONTRIBUTOR = 'contributor',
+        EDITOR = 'editor',
+        FREEBUSY = 'freebusy',
+        OVERRIDE = 'override',
+        OWNER = 'owner',
+        READ = 'read',
+        RESPOND = 'respond',
+        ROOT = 'root',
+        NONE = 'none'
+    }
+
+    enum EventAccessLevel {
+        CONFIDENTIAL = 'confidential',
+        PRIVATE = 'private',
+        PUBLIC = 'public',
+        DEFAULT = 'default'
+    }
+
+    enum EventStatus {
+        NONE = 'none',
+        CONFIRMED = 'confirmed',
+        TENTATIVE = 'tentative',
+        CANCELED = 'canceled'
+    }
+
+    enum AttendeeRole {
+        UNKNOWN = 'unknown', // iOS
+        REQUIRED = 'required', // iOS
+        OPTIONAL = 'optional', // iOS
+        CHAIR = 'chair', // iOS
+        NON_PARTICIPANT = 'nonParticipant', // iOS
+        ATTENDEE = 'attendee', // Android
+        ORGANIZER = 'organizer', // Android
+        PERFORMER = 'performer', // Android
+        SPEAKER = 'speaker', // Android
+        NONE = 'none' // Android
+    }
+
+    enum AttendeeStatus {
+        UNKNOWN = 'unknown', // iOS
+        PENDING = 'pending', // iOS
+        ACCEPTED = 'accepted',
+        DECLINED = 'declined',
+        TENTATIVE = 'tentative',
+        DELEGATED = 'delegated', // iOS
+        COMPLETED = 'completed', // iOS
+        IN_PROCESS = 'inProcess', // iOS
+        INVITED = 'invited', // Android
+        NONE = 'none' // Android
+    }
+
+    enum Frequency {
+        DAILY = 'daily',
+        WEEKLY = 'weekly',
+        MONTHLY = 'monthly',
+        YEARLY = 'yearly'
+    }
+
+    enum ReminderStatus {
+        COMPLETED = 'completed',
+        INCOMPLETE = 'incomplete'
+    }
+
+    interface RecurringEventOptions {
+        futureEvents?: boolean;
+        instanceStartDate?: string;
+    }
+
+    /** Gets an array of calendar objects with details about the different calendars stored on the device. */
+    function getCalendarsAsync(
+        /** (iOS only) Not required, but if defined, filters the returned calendars to a specific entity type.  */
+        entityType?: EntityTypes
+    ): Promise<Calendar[]>;
+
+    /** Creates a new calendar on the device, allowing events to be added later and displayed. */
+    function createCalendarAsync(details: Calendar): Promise<string>;
+
+    /** Updates the provided details of an existing calendar stored on the device. To remove a property, explicitly set it to null in details */
+    function updateCalendarAsync(id: string, details?: Calendar | null): Promise<string>;
+
+    /** Deletes an existing calendar and all associated events/reminders/attendees from the device. Use with caution. */
+    function deleteCalendarAsync(id: string): Promise<void>;
+
+    /** Returns all events in a given set of calendars over a specified time period. */
+    function getEventsAsync(
+        /** Array of IDs of calendars to search for events in. Required. */
+        calendarIds: string[],
+
+        /** Beginning of time period to search for events in. Required. */
+        startDate: Date,
+
+        /** End of time period to search for events in. Required. */
+        endDate: Date
+    ): Promise<Event[]>;
+
+    /** Returns a specific event selected by ID. If a specific instance of a recurring event is desired, the start date of this instance must also be provided, as instances of recurring events do not have their own unique and stable IDs on either iOS or Android. */
+    function getEventAsync(
+        /** ID of the event to return. Required. */
+        id: string,
+
+        /** A map of options for recurring events */
+        recurringEventOptions?: RecurringEventOptions
+    ): Promise<Event>;
+
+    /** Creates a new event on the specified calendar. */
+    function createEventAsync(
+        /** ID of the calendar to create this event in. Required. */
+        calendarId: string,
+        details?: Event
+    ): Promise<string>;
+
+    /** Updates the provided details of an existing calendar stored on the device. To remove a property, explicitly set it to null in details */
+    function updateEventAsync(
+        /** ID of the event to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated  */
+        details?: Event | null,
+
+        /** A map of options for recurring events */
+        recurrentEventOptions?: RecurringEventOptions
+    ): Promise<string>;
+
+    /** Deletes an existing event from the device. Use with caution. */
+    function deleteEventAsync(
+        /** ID of the event to be deleted. Required. */
+        id: string,
+
+        /** A map of options for recurring events */
+        recurringEventOptions?: RecurringEventOptions
+    ): Promise<void>;
+
+    /** Gets all attendees for a given event (or instance of a recurring event). */
+    function getAttendeesForEventAsync(
+        /** ID of the event to return attendees for. Required. */
+        eventId: string,
+
+        /** A map of options for recurring events */
+        recurrentEventOptions?: RecurringEventOptions
+    ): Promise<Attendee[]>;
+
+    /** Available on Android only. Creates a new attendee record and adds it to the specified event. Note that if eventId specifies a recurring event, this will add the attendee to every instance of the event. */
+    function createAttendeeAsync(
+        /**  ID of the event to add this attendee to. Required. */
+        eventId: string,
+
+        /** A map of details for the attendee to be created  */
+        details?: Attendee
+    ): Promise<string>;
+
+    /** Available on Android only. Updates an existing attendee record. To remove a property, explicitly set it to null in details. */
+    function updateAttendeeAsync(
+        /** ID of the attendee record to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated  */
+        details?: Attendee | null
+    ): Promise<string>;
+
+    /** Available on Android only. Deletes an existing attendee record from the device. Use with caution. */
+    function deleteAttendeeAsync(id: string): Promise<void>;
+
+    /** Available on iOS only. Returns a list of reminders matching the provided criteria. */
+    function getRemindersAsync(
+        /**  Array of IDs of calendars to search for reminders in. Required. */
+        calendarIds: string[],
+
+        status?: ReminderStatus,
+
+        /** Beginning of time period to search for reminders in. Required if status is defined. */
+        startDate?: Date,
+
+        /** End of time period to search for reminders in. Required if status is defined. */
+        endDate?: Date
+    ): Promise<Reminder[]>;
+
+    /** Available on iOS only. Returns a specific reminder selected by ID. */
+    function getReminderAsync(id: string): Promise<Reminder>;
+
+    /** Available on iOS only. Creates a new reminder on the specified calendar. */
+    function createReminderAsync(
+        /** ID of the calendar to create this reminder in. Required. */
+        calendarId: string,
+
+        /** A map of details for the reminder to be created */
+        details?: Reminder
+    ): Promise<string>;
+
+    /** Available on iOS only. Updates the provided details of an existing reminder stored on the device. To remove a property, explicitly set it to null in details. */
+    function updateReminderAsync(
+        /** ID of the reminder to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated */
+        details?: Reminder | null
+    ): Promise<string>;
+
+    /** Available on iOS only. Deletes an existing reminder from the device. Use with caution. */
+    function deleteReminderAsync(id: string): Promise<void>;
+
+    /** Available on iOS only. */
+    function getSourcesAsync(): Promise<Source[]>;
+
+    /** Available on iOS only. Returns a specific source selected by ID. */
+    function getSourceAsync(id: string): Promise<Source>;
+
+    /** Available on Android only. Sends an intent to open the specified event in the OS Calendar app. */
+    function openEventInCalendar(
+        /** ID of the event to open. Required. */
+        id: string
+    ): void;
+}
+// #endregion
+
+// #region Calendar
+/**
+ * An API to compose mails using OS specific UI.
+ */
+export namespace MailComposer {
+    interface ComposeOptions {
+        /** An array of e-mail addressess of the recipients. */
+        recipients?: string[];
+
+        /** An array of e-mail addressess of the CC recipients. */
+        ccRecipients?: string[];
+
+        /** An array of e-mail addressess of the BCC recipients. */
+        bccRecipients?: string[];
+
+        /** Subject of the mail. */
+        subject?: string;
+
+        /** Body of the mail. */
+        body?: string;
+
+        /** Whether the body contains HTML tags so it could be formatted properly. Not working perfectly on Android. */
+        isHtml?: boolean;
+
+        /** An array of app’s internal file uris to attach. */
+        attachments?: string[];
+    }
+
+    /** Resolves to a promise with object containing status field that could be either sent, saved or cancelled. Android does not provide such info so it always resolves to sent. */
+    function composeAsync(
+        /** A map defining the data to fill the mail */
+        options: ComposeOptions
+    ): Promise<{ status: 'sent' | 'saved' | 'cancelled' }>;
+}
+// #endregion
diff --git a/types/expo/v24/expo-tests.tsx b/types/expo/v24/expo-tests.tsx
new file mode 100644
index 0000000000..77f9bbba87
--- /dev/null
+++ b/types/expo/v24/expo-tests.tsx
@@ -0,0 +1,554 @@
+import * as React from 'react';
+import { Text } from 'react-native';
+
+import {
+    Accelerometer,
+    Amplitude,
+    Asset,
+    AuthSession,
+    Audio,
+    AppLoading,
+    BarCodeScanner,
+    BlurViewProps,
+    BlurView,
+    Brightness,
+    Camera,
+    CameraObject,
+    DocumentPicker,
+    Facebook,
+    FacebookAds,
+    FileSystem,
+    ImagePicker,
+    ImageManipulator,
+    FaceDetector,
+    Svg,
+    IntentLauncherAndroid,
+    KeepAwake,
+    LinearGradient,
+    Permissions,
+    registerRootComponent,
+    ScreenOrientation
+} from 'expo';
+
+Accelerometer.addListener((obj) => {
+    obj.x;
+    obj.y;
+    obj.z;
+});
+Accelerometer.removeAllListeners();
+Accelerometer.setUpdateInterval(1000);
+
+Amplitude.initialize('key');
+Amplitude.setUserId('userId');
+Amplitude.setUserProperties({key: 1});
+Amplitude.clearUserProperties();
+Amplitude.logEvent('name');
+Amplitude.logEventWithProperties('event', {key: 'value'});
+Amplitude.setGroup('type', ['value']);
+
+const asset = Asset.fromModule(1);
+asset.downloadAsync();
+Asset.loadAsync(1);
+Asset.loadAsync([1, 2, 3]);
+const asset1 = new Asset({
+    uri: 'uri',
+    type: 'type',
+    name: 'name',
+    hash: 'hash',
+    width: 122,
+    height: 122
+});
+
+const url = AuthSession.getRedirectUrl();
+AuthSession.dismiss();
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: 'url2'
+}).then(result => {
+    switch (result.type) {
+        case 'success':
+            result.event;
+            result.params;
+            break;
+        case 'error':
+            result.errorCode;
+            result.params;
+            result.event;
+            break;
+        case 'dismissed':
+        case 'cancel':
+            result.type;
+            break;
+    }
+});
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: undefined
+});
+
+Audio.setAudioModeAsync({
+    shouldDuckAndroid: false,
+    playsInSilentModeIOS: true,
+    interruptionModeIOS: 2,
+    interruptionModeAndroid: 1,
+    allowsRecordingIOS: true
+});
+Audio.setIsEnabledAsync(true);
+
+Audio.INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS === 0;
+Audio.INTERRUPTION_MODE_IOS_DO_NOT_MIX === 1;
+Audio.INTERRUPTION_MODE_IOS_DUCK_OTHERS === 2;
+
+Audio.INTERRUPTION_MODE_ANDROID_DO_NOT_MIX === 1;
+Audio.INTERRUPTION_MODE_ANDROID_DUCK_OTHERS === 2;
+
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_DEFAULT === 0;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_THREE_GPP === 1;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG_4 === 2;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_NB === 3;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_WB === 4;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADIF === 5;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADTS === 6;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_RTP_AVP === 7;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG2TS === 8;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_WEBM === 9;
+
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_DEFAULT === 0;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_NB === 1;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_WB === 2;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC === 3;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_HE_AAC === 4;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC_ELD === 5;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_VORBIS === 6;
+
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_LINEARPCM === 'lpcm';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AC3 === 'ac-3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_60958AC3 === 'cac3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLEIMA4 === 'ima4';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC === 'aac ';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4CELP === 'celp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4HVXC === 'hvxc';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4TWINVQ === 'twvq';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE3 === 'MAC3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE6 === 'MAC6';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ULAW === 'ulaw';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ALAW === 'alaw';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN === 'QDMC';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN2 === 'QDM2';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QUALCOMM === 'Qclp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER1 === '.mp1';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER2 === '.mp2';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER3 === '.mp3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLELOSSLESS === 'alac';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE === 'aach';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_LD === 'aacl';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD === 'aace';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_SBR === 'aacf';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_V2 === 'aacg';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE_V2 === 'aacp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_SPATIAL === 'aacs';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR === 'samr';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR_WB === 'sawb';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AUDIBLE === 'AUDB';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ILBC === 'ilbc';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_DVIINTELIMA === 0x6d730011;
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MICROSOFTGSM === 0x6d730031;
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AES3 === 'aes3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ENHANCEDAC3 === 'ec-3';
+
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MIN === 0;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_LOW === 0x20;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MEDIUM === 0x40;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_HIGH === 0x60;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MAX === 0x7f;
+
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_CONSTANT === 0;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_LONG_TERM_AVERAGE === 1;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE_CONSTRAINED === 2;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE === 3;
+
+Audio.RECORDING_OPTIONS_PRESET_HIGH_QUALITY;
+Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY;
+async () => {
+    const result = await Audio.Sound.create({uri: 'uri'}, {
+        volume: 0.5,
+        rate: 0.6
+    }, null, true);
+
+    const sound = result.sound;
+    const status = result.status;
+
+    if (!status.isLoaded) {
+        status.error;
+    } else {
+        status.didJustFinish;
+        // etc.
+    }
+
+    const _status = await sound.getStatusAsync();
+    await sound.loadAsync({uri: 'uri'});
+};
+
+() => (
+    <AppLoading
+        startAsync={() => Promise.resolve()}
+        onFinish={() => {}}
+        onError={(error) => console.log(error)} />
+);
+() => (
+    <AppLoading
+        startAsync={null}
+        onFinish={null}
+        onError={null} />
+);
+
+const barcodeReadCallback = () => {};
+() => (
+    <BarCodeScanner
+        type="front"
+        torchMode="off"
+        barCodeTypes={[BarCodeScanner.Constants.BarCodeType.aztec]}
+        onBarCodeRead={barcodeReadCallback} />
+);
+
+() => (
+    <BlurView
+        tint="dark"
+        intensity={2} />
+);
+
+async () => {
+    await Brightness.setBrightnessAsync(.6);
+    await Brightness.setSystemBrightnessAsync(.7);
+    const br1 = await Brightness.getBrightnessAsync();
+    const br2 = await Brightness.getSystemBrightnessAsync();
+};
+
+Camera.Constants.AutoFocus;
+Camera.Constants.Type;
+Camera.Constants.FlashMode;
+Camera.Constants.WhiteBalance;
+Camera.Constants.VideoQuality;
+Camera.Constants.BarCodeType;
+() => {
+    return(<Camera ref={(component: any) => {
+        if (component) {
+            component.recordAsync();
+        }
+    }} />);
+};
+
+async () => {
+    const result = await DocumentPicker.getDocumentAsync();
+
+    if (result.type === 'success') {
+        result.name;
+        result.uri;
+        result.size;
+    }
+};
+
+async () => {
+    const { type, expires, token } = await Facebook.logInWithReadPermissionsAsync("appId");
+};
+
+() => (
+    <FacebookAds.BannerView
+        type="large"
+        placementId="str"
+        onPress={() => {}}
+        onError={() => {}} />
+);
+
+async () => {
+    const info = await FileSystem.getInfoAsync('file');
+
+    info.exists;
+    info.isDirectory;
+
+    if (info.exists) {
+        info.md5;
+        info.uri;
+        info.size;
+        info.modificationTime;
+    }
+
+    const string: string = await FileSystem.readAsStringAsync('file');
+    await FileSystem.writeAsStringAsync('file', 'content');
+    await FileSystem.deleteAsync('file');
+    await FileSystem.moveAsync({ from: 'from', to: 'to'});
+    await FileSystem.copyAsync({ from: 'from', to: 'to' });
+    await FileSystem.makeDirectoryAsync('dir');
+    const dirs: string[] = await FileSystem.readDirectoryAsync('dir');
+    const result = await FileSystem.downloadAsync('from', 'to');
+
+    result.headers;
+    result.status;
+    result.uri;
+    result.md5;
+};
+
+async () => {
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Videos
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+    }
+};
+
+async () => {
+    const result = await ImageManipulator.manipulate('url', {
+        rotate: 90
+    }, {
+        compress: 0.5
+    });
+
+    result.height;
+    result.uri;
+    result.width;
+};
+
+FaceDetector.Constants.Mode.fast;
+FaceDetector.Constants.Mode.accurate;
+FaceDetector.Constants.Landmarks.all;
+FaceDetector.Constants.Landmarks.none;
+FaceDetector.Constants.Classifications.all;
+FaceDetector.Constants.Classifications.none;
+async () => {
+    const result = await FaceDetector.detectFaces('url', {
+        mode: FaceDetector.Constants.Mode.fast,
+        detectLandmarks: FaceDetector.Constants.Landmarks.all,
+        runClassifications: FaceDetector.Constants.Classifications.none
+    });
+
+    result.faces[0];
+};
+
+() => (
+    <Svg width={100} height={50}>
+        <Svg.Rect
+            x={25}
+            y={5}
+            width={150}
+            height={50}
+            fill='rgb(0,0,255)'
+            strokeWidth={3}
+            stroke='rgb(0,0,0)'
+        />
+        <Svg.Circle
+            cx={50}
+            cy={50}
+            r={50}
+            fill="pink"
+        />
+        <Svg.Ellipse
+            cx={55}
+            cy={55}
+            rx={50}
+            ry={30}
+            stroke="purple"
+            strokeWidth={2}
+            fill="yellow"
+        />
+        <Svg.Line
+            x1={0}
+            y1={0}
+            x2={100}
+            y2={100}
+            stroke="red"
+            strokeWidth={2}
+        />
+        <Svg.Polygon
+            points="40,5 70,80 25,95"
+            fill="lime"
+            stroke="purple"
+            strokeWidth={1}
+        />
+        <Svg.Polyline
+            points="10,10 20,12 30,20 40,60 60,70 95,90"
+            fill="none"
+            stroke="black"
+            strokeWidth={3}
+        />
+        <Svg.Text
+            fill="none"
+            stroke="purple"
+            fontSize={20}
+            fontWeight="bold"
+            x={100}
+            y={20}
+            textAnchor="middle"
+        >
+            STROKED TEXT
+        </Svg.Text>
+        <Svg.Defs>
+            <Svg.Path
+                id="path"
+                d=""
+            />
+        </Svg.Defs>
+        <Svg.G y={20}>
+            <Svg.Text fill="blue"        >
+                <Svg.TextPath href="#path" startOffset="-10%">
+                    We go up and down,
+                    <Svg.TSpan fill="red" dy="5,5,5">then up again</Svg.TSpan>
+                </Svg.TextPath>
+            </Svg.Text>
+            <Svg.Path
+                d=""
+                fill="none"
+                stroke="red"
+                strokeWidth={1}
+            />
+        </Svg.G>
+        <Svg.Use href="#shape" x="20" y="0" />
+        <Svg.Symbol id="symbol" viewBox="0 0 150 110" width="100" height="50">
+            <Svg.Circle cx="50" cy="50" r="40" strokeWidth="8" stroke="red" fill="red"/>
+            <Svg.Circle cx="90" cy="60" r="40" strokeWidth="8" stroke="green" fill="white"/>
+        </Svg.Symbol>
+        <Svg.Defs>
+            <Svg.ClipPath id="clip">
+                <Svg.Circle cx="50%" cy="50%" r="40%"/>
+            </Svg.ClipPath>
+            <Svg.RadialGradient id="grad" cx="50%" cy="50%" rx="50%" ry="50%" fx="50%" fy="50%" gradientUnits="userSpaceOnUse">
+                <Svg.Stop
+                    offset="0%"
+                    stopColor="#ff0"
+                    stopOpacity="1"
+                />
+            </Svg.RadialGradient>
+            <Svg.LinearGradient id="grad" x1="0" y1="0" x2="170" y2="0">
+                <Svg.Stop offset="1" stopColor="red" stopOpacity="1" />
+            </Svg.LinearGradient>
+        </Svg.Defs>
+    </Svg>
+);
+
+IntentLauncherAndroid.ACTION_ACCESSIBILITY_SETTINGS === 'android.settings.ACCESSIBILITY_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_NOTIFICATION_REDACTION === 'android.settings.ACTION_APP_NOTIFICATION_REDACTION';
+IntentLauncherAndroid.ACTION_CONDITION_PROVIDER_SETTINGS === 'android.settings.ACTION_CONDITION_PROVIDER_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_LISTENER_SETTINGS === 'android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS';
+IntentLauncherAndroid.ACTION_PRINT_SETTINGS === 'android.settings.ACTION_PRINT_SETTINGS';
+IntentLauncherAndroid.ACTION_ADD_ACCOUNT_SETTINGS === 'android.settings.ADD_ACCOUNT_SETTINGS';
+IntentLauncherAndroid.ACTION_AIRPLANE_MODE_SETTINGS === 'android.settings.AIRPLANE_MODE_SETTINGS';
+IntentLauncherAndroid.ACTION_APN_SETTINGS === 'android.settings.APN_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_DETAILS_SETTINGS === 'android.settings.APPLICATION_DETAILS_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_DEVELOPMENT_SETTINGS === 'android.settings.APPLICATION_DEVELOPMENT_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_SETTINGS === 'android.settings.APPLICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_NOTIFICATION_SETTINGS === 'android.settings.APP_NOTIFICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_OPS_SETTINGS === 'android.settings.APP_OPS_SETTINGS';
+IntentLauncherAndroid.ACTION_BATTERY_SAVER_SETTINGS === 'android.settings.BATTERY_SAVER_SETTINGS';
+IntentLauncherAndroid.ACTION_BLUETOOTH_SETTINGS === 'android.settings.BLUETOOTH_SETTINGS';
+IntentLauncherAndroid.ACTION_CAPTIONING_SETTINGS === 'android.settings.CAPTIONING_SETTINGS';
+IntentLauncherAndroid.ACTION_CAST_SETTINGS === 'android.settings.CAST_SETTINGS';
+IntentLauncherAndroid.ACTION_DATA_ROAMING_SETTINGS === 'android.settings.DATA_ROAMING_SETTINGS';
+IntentLauncherAndroid.ACTION_DATE_SETTINGS === 'android.settings.DATE_SETTINGS';
+IntentLauncherAndroid.ACTION_DEVICE_INFO_SETTINGS === 'android.settings.DEVICE_INFO_SETTINGS';
+IntentLauncherAndroid.ACTION_DEVICE_NAME === 'android.settings.DEVICE_NAME';
+IntentLauncherAndroid.ACTION_DISPLAY_SETTINGS === 'android.settings.DISPLAY_SETTINGS';
+IntentLauncherAndroid.ACTION_DREAM_SETTINGS === 'android.settings.DREAM_SETTINGS';
+IntentLauncherAndroid.ACTION_HARD_KEYBOARD_SETTINGS === 'android.settings.HARD_KEYBOARD_SETTINGS';
+IntentLauncherAndroid.ACTION_HOME_SETTINGS === 'android.settings.HOME_SETTINGS';
+IntentLauncherAndroid.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS === 'android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS === 'android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS';
+IntentLauncherAndroid.ACTION_INPUT_METHOD_SETTINGS === 'android.settings.INPUT_METHOD_SETTINGS';
+IntentLauncherAndroid.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS === 'android.settings.INPUT_METHOD_SUBTYPE_SETTINGS';
+IntentLauncherAndroid.ACTION_INTERNAL_STORAGE_SETTINGS === 'android.settings.INTERNAL_STORAGE_SETTINGS';
+IntentLauncherAndroid.ACTION_LOCALE_SETTINGS === 'android.settings.LOCALE_SETTINGS';
+IntentLauncherAndroid.ACTION_LOCATION_SOURCE_SETTINGS === 'android.settings.LOCATION_SOURCE_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS === 'android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_APPLICATIONS_SETTINGS === 'android.settings.MANAGE_APPLICATIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_DEFAULT_APPS_SETTINGS === 'android.settings.MANAGE_DEFAULT_APPS_SETTINGS';
+IntentLauncherAndroid.ACTION_MEMORY_CARD_SETTINGS === 'android.settings.MEMORY_CARD_SETTINGS';
+IntentLauncherAndroid.ACTION_MONITORING_CERT_INFO === 'android.settings.MONITORING_CERT_INFO';
+IntentLauncherAndroid.ACTION_NETWORK_OPERATOR_SETTINGS === 'android.settings.NETWORK_OPERATOR_SETTINGS';
+IntentLauncherAndroid.ACTION_NFCSHARING_SETTINGS === 'android.settings.NFCSHARING_SETTINGS';
+IntentLauncherAndroid.ACTION_NFC_PAYMENT_SETTINGS === 'android.settings.NFC_PAYMENT_SETTINGS';
+IntentLauncherAndroid.ACTION_NFC_SETTINGS === 'android.settings.NFC_SETTINGS';
+IntentLauncherAndroid.ACTION_NIGHT_DISPLAY_SETTINGS === 'android.settings.NIGHT_DISPLAY_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS === 'android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_SETTINGS === 'android.settings.NOTIFICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_PAIRING_SETTINGS === 'android.settings.PAIRING_SETTINGS';
+IntentLauncherAndroid.ACTION_PRIVACY_SETTINGS === 'android.settings.PRIVACY_SETTINGS';
+IntentLauncherAndroid.ACTION_QUICK_LAUNCH_SETTINGS === 'android.settings.QUICK_LAUNCH_SETTINGS';
+IntentLauncherAndroid.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS === 'android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS';
+IntentLauncherAndroid.ACTION_SECURITY_SETTINGS === 'android.settings.SECURITY_SETTINGS';
+IntentLauncherAndroid.ACTION_SETTINGS === 'android.settings.SETTINGS';
+IntentLauncherAndroid.ACTION_SHOW_ADMIN_SUPPORT_DETAILS === 'android.settings.SHOW_ADMIN_SUPPORT_DETAILS';
+IntentLauncherAndroid.ACTION_SHOW_INPUT_METHOD_PICKER === 'android.settings.SHOW_INPUT_METHOD_PICKER';
+IntentLauncherAndroid.ACTION_SHOW_REGULATORY_INFO === 'android.settings.SHOW_REGULATORY_INFO';
+IntentLauncherAndroid.ACTION_SHOW_REMOTE_BUGREPORT_DIALOG === 'android.settings.SHOW_REMOTE_BUGREPORT_DIALOG';
+IntentLauncherAndroid.ACTION_SOUND_SETTINGS === 'android.settings.SOUND_SETTINGS';
+IntentLauncherAndroid.ACTION_STORAGE_MANAGER_SETTINGS === 'android.settings.STORAGE_MANAGER_SETTINGS';
+IntentLauncherAndroid.ACTION_SYNC_SETTINGS === 'android.settings.SYNC_SETTINGS';
+IntentLauncherAndroid.ACTION_SYSTEM_UPDATE_SETTINGS === 'android.settings.SYSTEM_UPDATE_SETTINGS';
+IntentLauncherAndroid.ACTION_TETHER_PROVISIONING_UI === 'android.settings.TETHER_PROVISIONING_UI';
+IntentLauncherAndroid.ACTION_TRUSTED_CREDENTIALS_USER === 'android.settings.TRUSTED_CREDENTIALS_USER';
+IntentLauncherAndroid.ACTION_USAGE_ACCESS_SETTINGS === 'android.settings.USAGE_ACCESS_SETTINGS';
+IntentLauncherAndroid.ACTION_USER_DICTIONARY_INSERT === 'android.settings.USER_DICTIONARY_INSERT';
+IntentLauncherAndroid.ACTION_USER_DICTIONARY_SETTINGS === 'android.settings.USER_DICTIONARY_SETTINGS';
+IntentLauncherAndroid.ACTION_USER_SETTINGS === 'android.settings.USER_SETTINGS';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_AIRPLANE_MODE === 'android.settings.VOICE_CONTROL_AIRPLANE_MODE';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE === 'android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE === 'android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE';
+IntentLauncherAndroid.ACTION_VOICE_INPUT_SETTINGS === 'android.settings.VOICE_INPUT_SETTINGS';
+IntentLauncherAndroid.ACTION_VPN_SETTINGS === 'android.settings.VPN_SETTINGS';
+IntentLauncherAndroid.ACTION_VR_LISTENER_SETTINGS === 'android.settings.VR_LISTENER_SETTINGS';
+IntentLauncherAndroid.ACTION_WEBVIEW_SETTINGS === 'android.settings.WEBVIEW_SETTINGS';
+IntentLauncherAndroid.ACTION_WIFI_IP_SETTINGS === 'android.settings.WIFI_IP_SETTINGS';
+IntentLauncherAndroid.ACTION_WIFI_SETTINGS === 'android.settings.WIFI_SETTINGS';
+IntentLauncherAndroid.ACTION_WIRELESS_SETTINGS === 'android.settings.WIRELESS_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_AUTOMATION_SETTINGS === 'android.settings.ZEN_MODE_AUTOMATION_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_EVENT_RULE_SETTINGS === 'android.settings.ZEN_MODE_EVENT_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS === 'android.settings.ZEN_MODE_EXTERNAL_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_PRIORITY_SETTINGS === 'android.settings.ZEN_MODE_PRIORITY_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS === 'android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_SETTINGS === 'android.settings.ZEN_MODE_SETTINGS';
+
+KeepAwake.activate();
+KeepAwake.deactivate();
+
+() => (
+    <LinearGradient
+        colors={['#fff']}
+        start={[1, 1]} />
+);
+
+() => (
+    <LinearGradient
+        colors={['#fff']}
+        style={{ flex: 1 }} />
+);
+
+Permissions.CAMERA === 'camera';
+Permissions.CAMERA_ROLL === 'cameraRoll';
+Permissions.AUDIO_RECORDING === 'audioRecording';
+Permissions.CONTACTS === 'contacts';
+Permissions.NOTIFICATIONS === 'remoteNotifications';
+Permissions.REMOTE_NOTIFICATIONS === 'remoteNotifications';
+Permissions.SYSTEM_BRIGHTNESS === 'systemBrightness';
+async () => {
+    const result = await Permissions.askAsync(Permissions.CAMERA);
+
+    result.status === 'granted';
+    result.status === 'denied';
+    result.status === 'undetermined';
+
+    result.expires === 'never';
+};
+
+ScreenOrientation.Orientation.ALL;
+ScreenOrientation.allow(ScreenOrientation.Orientation.ALL);
+
+class __TestEntry__ extends React.Component {
+    render() {
+        return(
+            <Text>test</Text>
+        );
+    }
+}
+registerRootComponent(__TestEntry__);
diff --git a/types/expo/v24/index.d.ts b/types/expo/v24/index.d.ts
new file mode 100644
index 0000000000..4bf5e48dc9
--- /dev/null
+++ b/types/expo/v24/index.d.ts
@@ -0,0 +1,2101 @@
+// Type definitions for expo 24.0
+// Project: https://github.com/expo/expo-sdk
+// Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
+//                 Martynas Kadiša <https://github.com/martynaskadisa>
+//                 Jan Aagaard <https://github.com/janaagaard75>
+//                 Sergio Sánchez <https://github.com/ssanchezmarc>
+//                 Fernando Helwanger <https://github.com/fhelwanger>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { EventSubscription } from 'fbemitter';
+import { Component, ComponentClass, Ref, ComponentType } from 'react';
+import {
+    ColorPropType,
+    ImageRequireSource,
+    ImageURISource,
+    NativeEventEmitter,
+    ViewProperties,
+    ViewStyle,
+    Permission
+} from 'react-native';
+
+export type Axis = number;
+export type BarCodeReadCallback = (params: { type: string; data: string; }) => void;
+export type FloatFromZeroToOne = 0 | 0.1 | 0.2 | 0.3 | 0.4 | 0.5 | 0.6 | 0.7 | 0.8 | 0.9 | 1;
+export type Md5 = string;
+export type Orientation = 'portrait' | 'landscape';
+export type RequireSource = ImageRequireSource;
+export type ResizeModeContain = 'contain';
+export type ResizeModeCover = 'cover';
+export type ResizeModeStretch = 'stretch';
+export type URISource = ImageURISource;
+
+export interface HashMap { [key: string]: any; }
+
+/** Access the device accelerometer sensor(s) to respond to changes in acceleration in 3d space. */
+export namespace Accelerometer {
+    interface AccelerometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    /**
+     * Subscribe for updates to the accelerometer.
+     * @param listener A callback that is invoked when an accelerometer update is available. When invoked, the listener is provided a single argumument that is an object containing keys x, y, z.
+     * @returns An EventSubscription object that you can call remove() on when you would like to unsubscribe the listener.
+     */
+    function addListener(listener: (obj: AccelerometerObject) => any): EventSubscription;
+
+    /** Remove all listeners. */
+    function removeAllListeners(): void;
+
+    /**
+     * Subscribe for updates to the accelerometer.
+     * @param intervalMs Desired interval in milliseconds between accelerometer updates.
+     */
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Provides access to Amplitude mobile analytics which basically lets you log various events to the Cloud. This module wraps Amplitude’s iOS and Android SDKs.
+ *
+ * Note: Session tracking may not work correctly when running Experiences in the main Expo app. It will work correctly if you create a standalone app.
+ */
+export namespace Amplitude {
+    /** Initializes Amplitude with your Amplitude API key. */
+    function initialize(apiKey: string): void;
+
+    /** Assign a user ID to the current user. If you don’t have a system for user IDs you don’t need to call this. */
+    function setUserId(userId: string): void;
+
+    /** Set properties for the current user. */
+    function setUserProperties(userProperties: HashMap): void;
+
+    /** Clear properties set by `setUserProperties()`. */
+    function clearUserProperties(): void;
+
+    /** Log an event to Amplitude. */
+    function logEvent(eventName: string): void;
+
+    /** Log an event to Amplitude with custom properties. */
+    function logEventWithProperties(
+        eventName: string,
+
+        /** A map of custom properties. */
+        properties: HashMap
+    ): void;
+
+    /** Add the current user to a group. */
+    function setGroup(
+        /** The group name, e.g. `'sports'`. */
+        groupType: string,
+
+        /** An array of group names, e.g. `['tennis', 'soccer']`. */
+        groupNames: string[]
+    ): void;
+}
+
+// #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 = {
+    /** A `function` that returns a `Promise`. The `Promise` should resolve when the app is done loading data and assets. */
+    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;
+
+    /** 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.
+ *
+ * This is incredibly useful to let you download and cache fonts, logo and icon images and other assets that you want to be sure the user has on their device for an optimal experience before rendering they start using the app.
+ */
+export class AppLoading extends Component<AppLoadingProps> { }
+// #endregion AppLoading
+
+/** This module provides an interface to Expo’s asset system. An asset is any file that lives alongside the source code of your app that the app needs at runtime. Examples include images, fonts and sounds. Expo’s asset system integrates with React Native’s, so that you can refer to files with require('path/to/file'). This is how you refer to static image files in React Native for use in an Image component, for example. */
+export class Asset {
+    constructor({ name, type, hash, uri, width, height }: {
+        name: string;
+        type: string;
+        hash: string;
+        uri: string;
+        width?: number;
+        height?: number;
+    });
+
+    /** The MD5 hash of the asset’s data. */
+    hash: Md5;
+
+    /** The name of the asset file without the extension. Also without the part from @ onward in the filename (used to specify scale factor for images). */
+    name: string;
+
+    /** The extension of the asset filename. */
+    type: string;
+
+    /** A URI that points to the asset’s data on the remote server. When running the published version of your app, this refers to the the location on Expo’s asset server where Expo has stored your asset. When running the app from XDE during development, this URI points to XDE’s server running on your computer and the asset is served directly from your computer. */
+    uri: string;
+
+    /** If the asset has been downloaded (by calling `downloadAsync()`), the `file://` URI pointing to the local file on the device that contains the asset data. */
+    localUri: string;
+
+    /** If the asset is an image, the width of the image data divided by the scale factor. The scale factor is the number after `@` in the filename, or `1` if not present. */
+    width?: number;
+
+    /** If the asset is an image, the height of the image data divided by the scale factor. The scale factor is the number after `@` in the filename, or `1` if not present. */
+    height?: number;
+
+    downloading: boolean;
+    downloaded: boolean;
+    downloadCallbacks: Array<{ resolve: () => any, reject: (e?: any) => any }>;
+
+    /** Downloads the asset data to a local file in the device’s cache directory. Once the returned promise is fulfilled without error, the localUri field of this asset points to a local file containing the asset data. The asset is only downloaded if an up-to-date local file for the asset isn’t already present due to an earlier download. */
+    downloadAsync(): Promise<void>;
+
+    /** Returns the `Expo.Asset` instance representing an asset given its module. */
+    static fromModule(module: RequireSource): Asset;
+
+    /**
+     * A helper that wraps `Expo.Asset.fromModule(module).downloadAsync` for convenience.
+     * @param moduleIds An array of `require('path/to/file')`. Can also be just one module without an Array.
+     */
+    static loadAsync(module: RequireSource[] | RequireSource): Promise<void>;
+}
+
+/**
+ * Provides basic sample playback and recording.
+ *
+ * Note that Expo does not yet support backgrounding, so audio is not available to play in the background of your experience. Audio also automatically stops if headphones / bluetooth audio devices are disconnected.
+ */
+export namespace Audio {
+    enum InterruptionModeIos {
+        /** This is the default option. If this option is set, your experience’s audio is mixed with audio playing in background apps. */
+        INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS = 0,
+
+        /** If this option is set, your experience’s audio interrupts audio from other apps. */
+        INTERRUPTION_MODE_IOS_DO_NOT_MIX = 1,
+
+        /** If this option is set, your experience’s audio lowers the volume ("ducks") of audio from other apps while your audio plays. */
+        INTERRUPTION_MODE_IOS_DUCK_OTHERS = 2
+    }
+
+    const INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS: 0;
+    const INTERRUPTION_MODE_IOS_DO_NOT_MIX: 1;
+    const INTERRUPTION_MODE_IOS_DUCK_OTHERS: 2;
+
+    enum InterruptionModeAndroid {
+        /** If this option is set, your experience’s audio interrupts audio from other apps. */
+        INTERRUPTION_MODE_ANDROID_DO_NOT_MIX = 1,
+
+        /** This is the default option. If this option is set, your experience’s audio lowers the volume ("ducks") of audio from other apps while your audio plays. */
+        INTERRUPTION_MODE_ANDROID_DUCK_OTHERS = 2
+    }
+
+    const INTERRUPTION_MODE_ANDROID_DO_NOT_MIX: 1;
+    const INTERRUPTION_MODE_ANDROID_DUCK_OTHERS: 2;
+
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_DEFAULT: 0;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_THREE_GPP: 1;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG_4: 2;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_NB: 3;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_WB: 4;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADIF: 5;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADTS: 6;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_RTP_AVP: 7;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG2TS: 8;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_WEBM: 9;
+
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_DEFAULT: 0;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_NB: 1;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_WB: 2;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC: 3;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_HE_AAC: 4;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC_ELD: 5;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_VORBIS: 6;
+
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_LINEARPCM: 'lpcm';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AC3: 'ac-3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_60958AC3: 'cac3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLEIMA4: 'ima4';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC: 'aac ';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4CELP: 'celp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4HVXC: 'hvxc';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4TWINVQ: 'twvq';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE3: 'MAC3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE6: 'MAC6';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ULAW: 'ulaw';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ALAW: 'alaw';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN: 'QDMC';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN2: 'QDM2';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QUALCOMM: 'Qclp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER1: '.mp1';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER2: '.mp2';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER3: '.mp3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLELOSSLESS: 'alac';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE: 'aach';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_LD: 'aacl';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD: 'aace';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_SBR: 'aacf';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_V2: 'aacg';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE_V2: 'aacp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_SPATIAL: 'aacs';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR: 'samr';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR_WB: 'sawb';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AUDIBLE: 'AUDB';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ILBC: 'ilbc';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_DVIINTELIMA: 0x6d730011;
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MICROSOFTGSM: 0x6d730031;
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AES3: 'aes3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ENHANCEDAC3: 'ec-3';
+
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MIN: 0;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_LOW: 0x20;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MEDIUM: 0x40;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_HIGH: 0x60;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MAX: 0x7f;
+
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_CONSTANT: 0;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_LONG_TERM_AVERAGE: 1;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE_CONSTRAINED: 2;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE: 3;
+
+    type RecordingStatus = {
+        canRecord: false,
+        isDoneRecording: false
+    } | {
+        canRecord: true,
+        isRecording: boolean,
+        durationMillis: number
+    } | {
+        canRecord: false,
+        isDoneRecording: true,
+        durationMillis: number
+    };
+
+    const RECORDING_OPTIONS_PRESET_HIGH_QUALITY: RecordingOptions;
+    const RECORDING_OPTIONS_PRESET_LOW_QUALITY: RecordingOptions;
+
+    interface RecordingOptions {
+        android: {
+            extension: string;
+            outputFormat: number;
+            audioEncoder: number;
+            sampleRate?: number;
+            numberOfChannels?: number;
+            bitRate?: number;
+            maxFileSize?: number;
+        };
+        ios: {
+            extension: string;
+            outputFormat?: string | number;
+            audioQuality: number;
+            sampleRate: number;
+            numberOfChannels: number;
+            bitRate: number;
+            bitRateStrategy?: number;
+            bitDepthHint?: number;
+            linearPCMBitDepth?: number;
+            linearPCMIsBigEndian?: boolean;
+            linearPCMIsFloat?: boolean;
+        };
+    }
+
+    interface AudioMode {
+        /** Boolean selecting if your experience’s audio should play in silent mode on iOS. This value defaults to `false`. */
+        playsInSilentModeIOS: boolean;
+
+        /** Boolean selecting if recording is enabled on iOS. This value defaults to `false`. NOTE: when this flag is set to true, playback may be routed to the phone receiver instead of to the speaker. */
+        allowsRecordingIOS: boolean;
+
+        /** Enum selecting how your experience’s audio should interact with the audio from other apps on iOS. */
+        interruptionModeIOS: InterruptionModeIos;
+
+        /** Boolean selecting if your experience’s audio should automatically be lowered in volume ("duck") if audio from another app interrupts your experience. This value defaults to true. If false, audio from other apps will pause your audio. */
+        shouldDuckAndroid: boolean;
+
+        /** an enum selecting how your experience’s audio should interact with the audio from other apps on Android: */
+        interruptionModeAndroid: InterruptionModeAndroid;
+    }
+
+    function setIsEnabledAsync(value: boolean): Promise<void>;
+    function setAudioModeAsync(mode: AudioMode): Promise<void>;
+
+    /** This class represents a sound corresponding to an Asset or URL. */
+    class Sound extends PlaybackObject {
+        constructor();
+
+        /**
+         * Creates and loads a sound from source, with optional `initialStatus`, `onPlaybackStatusUpdate`, and `downloadFirst`.
+         *
+         * @returns A `Promise` that is rejected if creation failed, or fulfilled with the following dictionary if creation succeeded:
+         * - `sound`: The newly created and loaded Sound object.
+         * - `status`: The PlaybackStatus of the Sound object. See the AV documentation for further information.
+         */
+        static create(
+            /**
+             * The source of the sound. The following forms are supported:
+             *
+             * - A dictionary of the form `{ uri: 'http://path/to/file' }` with a network URL pointing to an audio file on the web.
+             * - `require('path/to/file')` for an audio file asset in the source code directory.
+             * - An `Expo.Asset` object for an audio file asset.
+             */
+            source: PlaybackSource,
+
+            /** The initial intended PlaybackStatusToSet of the sound, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. */
+            initialStatus?: PlaybackStatusToSet,
+
+            /** A function taking a single parameter PlaybackStatus. This value defaults to `null` if no parameter is passed. */
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null,
+
+            /** If set to true, the system will attempt to download the resource to the device before loading. This value defaults to `true`. Note that at the moment, this will only work for `source`s of the form `require('path/to/file')` or `Asset` objects. */
+            downloadFirst?: boolean
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+
+    class Recording {
+        constructor();
+
+        /** Gets the `status` of the `Recording`. */
+        getStatusAsync(): Promise<RecordingStatus>;
+
+        /** Sets a function to be called regularly with the `status` of the `Recording`. */
+        setOnRecordingStatusUpdate(onRecordingStatusUpdate?: (status: RecordingStatus) => void): void;
+
+        /** Sets the interval with which onRecordingStatusUpdate is called while the recording can record. This value defaults to 500 milliseconds. */
+        setProgressUpdateInterval(progressUpdateIntervalMillis: number): void;
+
+        /** Loads the recorder into memory and prepares it for recording. This must be called before calling `startAsync()`. This method can only be called if the `Recording` instance has never yet been prepared. */
+        prepareToRecordAsync(
+            /** Options for the recording, including sample rate, bitrate, channels, format, encoder, and extension. If no options are passed to `prepareToRecordAsync()`, the recorder will be created with options `Expo.Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY`. */
+            options?: RecordingOptions
+        ): Promise<RecordingStatus>;
+
+        /** Begins recording. This method can only be called if the `Recording` has been prepared. */
+        startAsync(): Promise<RecordingStatus>;
+
+        /**
+         * Pauses recording. This method can only be called if the Recording has been prepared.
+         *
+         * NOTE: This is only available on Android API version 24 and later.
+         */
+        pauseAsync(): Promise<RecordingStatus>;
+
+        /** Stops the recording and deallocates the recorder from memory. This reverts the Recording instance to an unprepared state, and another Recording instance must be created in order to record again. This method can only be called if the `Recording` has been prepared. */
+        stopAndUnloadAsync(): Promise<RecordingStatus>;
+
+        /**
+         * Gets the local URI of the Recording. Note that this will only succeed once the Recording is prepared to record.
+         *
+         * @returns A string with the local URI of the `Recording`, or `null` if the `Recording` is not prepared to record.
+         */
+        getURI(): string | null | undefined;
+
+        /**
+         * Creates and loads a new `Sound` object to play back the `Recording`. Note that this will only succeed once the `Recording` is done recording (once `stopAndUnloadAsync()` has been called).
+         *
+         * @returns A Promise that is rejected if creation failed, or fulfilled with the following dictionary if creation succeeded:
+         * - `sound`: the newly created and loaded Sound object.
+         * - `status`: the PlaybackStatus of the Sound object.
+         */
+        createNewLoadedSound(
+            /** The initial intended `PlaybackStatusToSet` of the sound, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. */
+            initialStatus?: PlaybackStatusToSet,
+
+            /** A function taking a single parameter `PlaybackStatus`. This value defaults to `null` if no parameter is passed. */
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+}
+
+/**
+ * AuthSession
+ */
+export namespace AuthSession {
+    type StartAsyncResponse = {
+        type: 'cancel';
+    } | {
+        type: 'dismissed';
+    } | {
+        type: 'success';
+        params: HashMap;
+        event: HashMap;
+    } | {
+        type: 'error';
+        params: HashMap;
+        errorCode: string;
+        event: HashMap;
+    };
+
+    function startAsync(options: { authUrl: string; returnUrl?: string; }): Promise<StartAsyncResponse>;
+    function dismiss(): void;
+    function getRedirectUrl(): string;
+}
+
+// #region AV
+/**
+ * AV
+ */
+export type PlaybackStatus = {
+    isLoaded: false;
+    androidImplementation?: string;
+
+    /** Populated exactly once when an error forces the object to unload. */
+    error?: string;
+} | {
+    isLoaded: true;
+    androidImplementation?: string;
+    uri: string;
+    progressUpdateIntervalMillis: number;
+    durationMillis?: number;
+    positionMillis: number;
+    playableDurationMillis?: number;
+    shouldPlay: boolean;
+    isPlaying: boolean;
+    isBuffering: boolean;
+    rate: number;
+    shouldCorrectPitch: boolean;
+    volume: number;
+    isMuted: boolean;
+    isLooping: boolean;
+
+    /** True exactly once when the track plays to finish. */
+    didJustFinish: boolean;
+};
+
+export interface PlaybackStatusToSet {
+    androidImplementation?: string;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: FloatFromZeroToOne;
+    shouldCorrectPitch?: boolean;
+    volume?: FloatFromZeroToOne;
+    isMuted?: boolean;
+    isLooping?: boolean;
+}
+
+export type PlaybackSource = RequireSource | { uri: string } | Asset;
+
+export class PlaybackObject {
+    /**
+     * Gets the `PlaybackStatus` of the `playbackObject`.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject`.
+     */
+    getStatusAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * Loads the media from source into memory and prepares it for playing. This must be called before calling setStatusAsync() or any of the convenience set status methods. This method can only be called if the playbackObject is in an unloaded state.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once it is loaded, or rejects if loading failed. The `Promise` will also reject if the `playbackObject` was already loaded. See below for details on `PlaybackStatus`.
+     */
+    loadAsync(
+        /**
+         * The source of the media. The following forms are supported:
+         * - A dictionary of the form `{ uri: 'http://path/to/file' }` with a network URL pointing to a media file on the web.
+         * - `require('path/to/file')` for a media file asset in the source code directory.
+         * - An `Expo.Asset object` for a media file asset.
+         */
+        source: PlaybackSource,
+
+        /** The initial intended `PlaybackStatusToSet` of the `playbackObject`, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. See below for details on `PlaybackStatusToSet` and the default initial playback status. */
+        initialStatus?: PlaybackStatusToSet,
+
+        /** If set to `true`, the system will attempt to download the resource to the device before loading. This value defaults to true. Note that at the moment, this will only work for sources of the form `require('path/to/file')` or `Expo.Asset` objects. */
+        downloadFirst?: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: false })`. */
+    pauseAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: true })`.
+     *
+     * Playback may not start immediately after calling this function for reasons such as buffering. Make sure to update your UI based on the `isPlaying` and `isBuffering` properties of the `PlaybackStatus`.
+     */
+    playAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: true, positionMillis: millis })`.
+     *
+     * Playback may not start immediately after calling this function for reasons such as buffering. Make sure to update your UI based on the isPlaying and `isBuffering` properties of the `PlaybackStatus`.
+     */
+    playFromPositionAsync(
+        /** The desired position of playback in milliseconds. */
+        positionMillis: number,
+
+        /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis, seekMillisToleranceBefore: toleranceMillisBefore, seekMillisToleranceAfter: toleranceMillisAfter })`. The tolerances are used only on iOS. */
+        tolerances?: {
+            toleranceMillisBefore: number,
+            toleranceMillisAfter: number
+        }
+    ): Promise<PlaybackStatus>;
+
+    /**
+     * Replays the item. When using `playFromPositionAsync(0)` the item is seeked to the position at `0` ms. On iOS this method uses internal implementation of the player and is able to play the item from the beginning immediately.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once the new status has been set successfully, or rejects if setting the new status failed.
+     */
+    replayAsync(
+        /** The new `PlaybackStatusToSet` of the `playbackObject`, whose values will override the current playback status. */
+        status: PlaybackStatusToSet
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ isLooping: value })`. */
+    setIsLoopingAsync(
+        /** A boolean describing if the media should play once (`false`) or loop indefinitely (`true`). */
+        isLooping: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ isMuted: value })`. */
+    setIsMutedAsync(
+        /**  A boolean describing if the audio of this media should be muted. */
+        isMuted: boolean
+    ): Promise<PlaybackStatus>;
+
+    /**
+     * Sets a function to be called regularly with the `PlaybackStatus` of the `playbackObject`. See below for details on `PlaybackStatus` and an example use case of this function.
+     *
+     * `onPlaybackStatusUpdate` will be called whenever a call to the API for this `playbackObject` completes (such as `setStatusAsync()`, `getStatusAsync()`, or `unloadAsync()`), and will also be called at regular intervals while the media is in the loaded state. Set `progressUpdateIntervalMillis` via `setStatusAsync()` or `setProgressUpdateIntervalAsync()` to modify the interval with which `onPlaybackStatusUpdate` is called while loaded.
+     */
+    setOnPlaybackStatusUpdate(
+        /** A function taking a single parameter `PlaybackStatus`. */
+        onPlaybackStatusUpdate?: (status: PlaybackStatus) => void
+    ): void;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis })`. */
+    setPositionAsync(
+        positionMillis: number,
+
+        /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis, seekMillisToleranceBefore: toleranceMillisBefore, seekMillisToleranceAfter: toleranceMillisAfter })`. The tolerances are used only on iOS. */
+        tolerances?: {
+            toleranceMillisBefore: number,
+            toleranceMillisAfter: number
+        }
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ progressUpdateIntervalMillis: millis })`. */
+    setProgressUpdateIntervalAsync(
+        /** The new minimum interval in milliseconds between calls of `onPlaybackStatusUpdate`. */
+        progressUpdateIntervalMillis: number
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ rate: value, shouldCorrectPitch: shouldCorrectPitch })`. */
+    setRateAsync(
+        /** The desired playback rate of the media. This value must be between `0.0` and `32.0`. Only available on Android API version 23 and later and iOS. */
+        rate: number,
+
+        /** A boolean describing if we should correct the pitch for a changed rate. If set to `true`, the pitch of the audio will be corrected (so a rate different than `1.0` will timestretch the audio). */
+        shouldCorrectPitch: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** Sets a new `PlaybackStatusToSet` on the `playbackObject`. This method can only be called if the media has been loaded. Return a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once the new status has been set successfully, or rejects if setting the new status failed. */
+    setStatusAsync(
+        /** The new `PlaybackStatusToSet` of the `playbackObject`, whose values will override the current playback status. */
+        status: PlaybackStatusToSet
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ volume: value })`. */
+    setVolumeAsync(
+        /** A number between `0.0` (silence) and `1.0` (maximum volume). */
+        volume: number
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: false, positionMillis: 0 })`. */
+    stopAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * Unloads the media from memory. `loadAsync()` must be called again in order to be able to play the media.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once it is unloaded, or rejects if unloading failed. See below for details on `PlaybackStatus`.
+     */
+    unloadAsync(): Promise<PlaybackStatus>;
+}
+// #endregion
+
+// #region BarCodeScanner
+/**
+ * BarCodeScanner
+ */
+export interface BarCodeScannerProps extends ViewProperties {
+    type?: 'front' | 'back';
+    torchMode?: 'on' | 'off';
+    barCodeTypes?: string[];
+    onBarCodeRead?: BarCodeReadCallback;
+}
+
+export class BarCodeScanner extends Component<BarCodeScannerProps> {
+    static Constants: {
+        TorchMode: {
+            on: string;
+            off: string
+        }
+    } & CameraConstants;
+}
+// #endregion
+
+// #region BlurView
+/**
+ * BlurView
+ */
+export interface BlurViewProps extends ViewProperties {
+    tint: 'light' | 'default' | 'dark';
+    intensity: number;
+}
+export class BlurView extends Component<BlurViewProps> { }
+// #endregion
+
+/**
+ * Brightness
+ */
+export namespace Brightness {
+    function setBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+    function getBrightnessAsync(): Promise<FloatFromZeroToOne>;
+    function getSystemBrightnessAsync(): Promise<FloatFromZeroToOne>;
+    function setSystemBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+}
+
+// #region Camera
+/**
+ * Camera
+ */
+export interface PictureOptions {
+    quality?: number;
+}
+
+export interface PictureResponse {
+    uri: string;
+    width: number;
+    height: number;
+    exif: string;
+    base64: string;
+}
+
+export interface RecordingOptions {
+    quality?: string | number;
+    maxDuration?: number;
+    maxFileSize?: number;
+}
+
+export class CameraObject {
+    takePictureAsync(options: PictureOptions): Promise<PictureResponse>;
+    recordAsync(options: RecordingOptions): Promise<{ uri: string; }>;
+    stopRecording(): void;
+    getSupportedRatiosAsync(): Promise<string[]>; // Android only
+}
+
+export interface CameraProps extends ViewProperties {
+    flashMode?: string | number;
+    type?: string | number;
+    ratio?: string;
+    autoFocus?: string | number | boolean;
+    focusDepth?: FloatFromZeroToOne;
+    zoom?: FloatFromZeroToOne;
+    whiteBalance?: string | number;
+    barCodeTypes?: string[];
+    onCameraReady?: () => void;
+    onMountError?: () => void;
+    onBarCodeRead?: BarCodeReadCallback;
+    ref?: Ref<CameraObject>;
+}
+
+export interface CameraConstants {
+    readonly Type: string;
+    readonly FlashMode: string;
+    readonly AutoFocus: string;
+    readonly WhiteBalance: string;
+    readonly VideoQuality: string;
+    readonly BarCodeType: {
+        aztec: string;
+        codabar: string;
+        code39: string;
+        code93: string;
+        code128: string;
+        code138: string;
+        code39mod43: string;
+        datamatrix: string;
+        ean13: string;
+        ean8: string;
+        interleaved2of5: string;
+        itf14: string;
+        maxicode: string;
+        pdf417: string;
+        rss14: string;
+        rssexpanded: string;
+        upc_a: string;
+        upc_e: string;
+        upc_ean: string;
+        qr: string;
+    };
+}
+
+export class Camera extends Component<CameraProps> {
+    static readonly Constants: CameraConstants;
+}
+// #endregion
+
+/**
+ * Constants
+ */
+export namespace Constants {
+    const appOwnership: 'expo' | 'standalone' | 'guest';
+    const expoVersion: string;
+    const deviceId: string;
+    const deviceName: string;
+    const deviceYearClass: number;
+    const isDevice: boolean;
+
+    interface Platform {
+        ios: {
+            platform: string;
+            model: string;
+            userInterfaceIdiom: string;
+        };
+    }
+    const platform: Platform;
+    const sessionId: string;
+    const statusBarHeight: number;
+    const systemFonts: string[];
+
+    interface Manifest {
+        name: string;
+        description?: string;
+        slug?: string;
+        sdkVersion?: string;
+        version?: string;
+        orientation?: Orientation;
+        primaryColor?: string;
+        privacy?: 'public' | 'unlisted';
+        scheme?: string;
+        icon?: string;
+        platforms?: string[];
+        githubUrl?: string;
+        notification?: {
+            icon?: string,
+            color?: string,
+            androidMode?: 'default' | 'collapse',
+            androidCollapsedTitle?: string
+        };
+        loading?: {
+            icon?: string,
+            exponentIconColor?: 'white' | 'blue',
+            exponentIconGrayscale?: 1 | 0,
+            backgroundImage?: string,
+            backgroundColor?: string,
+            hideExponentText?: boolean
+        };
+        appKey?: string;
+        androidStatusBar?: {
+            barStyle?: 'lignt-content' | 'dark-content',
+            backgroundColor?: string
+        };
+        androidShowExponentNotificationInShellApp?: boolean;
+        extra?: {
+            [propName: string]: any
+        };
+        rnCliPath?: any;
+        entryPoint?: string;
+        packagerOpts?: {
+            hostType?: string,
+            dev?: boolean,
+            strict?: boolean,
+            minify?: boolean,
+            urlType?: string,
+            urlRandomness?: string,
+            lanType?: string,
+            [propName: string]: any
+        };
+        ignoreNodeModulesValidation?: any;
+        nodeModulesPath?: string;
+        ios?: {
+            bundleIdentifier?: string,
+            buildNumber?: string,
+            config?: {
+                usesNonExemptEncryption?: boolean,
+                googleSignIn?: {
+                    reservedClientId: string
+                }
+            },
+            supportsTablet?: boolean,
+            infoPlist?: any
+        };
+        android?: {
+            package?: string,
+            versionCode?: string,
+            config?: {
+                fabric?: {
+                    apiKey: string,
+                    buildSecret: string
+                },
+                googleMaps?: {
+                    apiKey: string
+                },
+                googleSignIn?: {
+                    apiKey: string,
+                    certificateHash: string
+                }
+            }
+        };
+        facebookScheme?: any;
+        facebookAppId?: string;
+        facebookDisplayName?: string;
+        splash?: {
+            backgroundColor?: string;
+            resizeMode?: ResizeModeContain | ResizeModeCover;
+            image?: string;
+        };
+        assetBundlePatterns?: string[];
+        releaseChannel: string;
+        [propName: string]: any;
+    }
+    const manifest: Manifest;
+    const linkingUri: string;
+}
+
+/**
+ * Contacts
+ */
+export namespace Contacts {
+    type PhoneNumbers = 'phoneNumbers';
+    type Emails = 'emails';
+    type Addresses = 'addresses';
+    type Image = 'image';
+    type Thumbnail = 'thumbnail';
+    type Note = 'note';
+    type Birthday = 'birthday';
+    type NonGregorianBirthday = 'nonGregorianBirthday';
+    type NamePrefix = 'namePrefix';
+    type NameSuffix = 'nameSuffix';
+    type PhoneticFirstName = 'phoneticFirstName';
+    type PhoneticMiddleName = 'phoneticMiddleName';
+    type PhoneticLastName = 'phoneticLastName';
+    type SocialProfiles = 'socialProfiles';
+    type InstantMessageAddresses = 'instantMessageAddresses';
+    type UrlAddresses = 'urlAddresses';
+    type Dates = 'dates';
+    type Relationships = 'relationships';
+
+    const PHONE_NUMBERS: PhoneNumbers;
+    const EMAILS: Emails;
+    const ADDRESSES: Addresses;
+    const IMAGE: Image;
+    const THUMBNAIL: Thumbnail;
+    const NOTE: Note;
+    const BIRTHDAY: Birthday;
+    const NON_GREGORIAN_BIRTHDAY: NonGregorianBirthday;
+    const NAME_PREFIX: NamePrefix;
+    const NAME_SUFFIX: NameSuffix;
+    const PHONETIC_FIRST_NAME: PhoneticFirstName;
+    const PHONETIC_MIDDLE_NAME: PhoneticMiddleName;
+    const PHONETIC_LAST_NAME: PhoneticLastName;
+    const SOCIAL_PROFILES: SocialProfiles;
+    const IM_ADDRESSES: InstantMessageAddresses;
+    const URLS: UrlAddresses;
+    const DATES: Dates;
+    const RELATIONSHIPS: Relationships;
+
+    type FieldType = PhoneNumbers | Emails | Addresses | Image | Thumbnail |
+        Note | Birthday | NonGregorianBirthday | NamePrefix | NameSuffix |
+        PhoneticFirstName | PhoneticMiddleName | PhoneticLastName | SocialProfiles |
+        InstantMessageAddresses | UrlAddresses | Dates | Relationships;
+
+    interface Options {
+        pageSize?: number;
+        pageOffset?: number;
+        fields?: FieldType[];
+    }
+
+    interface Contact {
+        id: string;
+        contactType: string;
+        name: string;
+        firstName?: string;
+        middleName?: string;
+        lastName?: string;
+        previousLastName?: string;
+        namePrefix?: string;
+        nameSuffix?: string;
+        nickname?: string;
+        phoneticFirstName?: string;
+        phoneticMiddleName?: string;
+        phoneticLastName?: string;
+        emails?: Array<{
+            email?: string;
+            primary?: boolean;
+            label: string;
+            id: string;
+        }>;
+        phoneNumbers?: Array<{
+            number?: string;
+            primary?: boolean;
+            digits?: string;
+            countryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        addresses?: Array<{
+            street?: string;
+            city?: string;
+            country?: string;
+            region?: string;
+            neighborhood?: string;
+            postalCode?: string;
+            poBox?: string;
+            isoCountryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        socialProfiles?: Array<{
+            service?: string;
+            localizedProfile?: string;
+            url?: string;
+            username?: string;
+            userId?: string;
+            label: string;
+            id: string;
+        }>;
+        instantMessageAddresses?: Array<{
+            service?: string;
+            username?: string;
+            localizedService?: string;
+            label: string;
+            id: string;
+        }>;
+        urls?: {
+            label: string;
+            url?: string;
+            id: string;
+        };
+        company?: string;
+        jobTitle?: string;
+        department?: string;
+        imageAvailable?: boolean;
+        image?: {
+            uri?: string;
+        };
+        thumbnail?: {
+            uri?: string;
+        };
+        note?: string;
+        dates?: Array<{
+            day?: number;
+            month?: number;
+            year?: number;
+            id: string;
+            label: string;
+        }>;
+        relationships?: Array<{
+            label: string;
+            name?: string;
+            id: string;
+        }>;
+    }
+
+    interface Response {
+        data: Contact[];
+        total: number;
+        hasNextPage: boolean;
+        hasPreviousPage: boolean;
+    }
+
+    function getContactsAsync(options: Options): Promise<Response>;
+    function getContactByIdAsync(options: { id?: string; fields?: FieldType[] }): Promise<Contact>;
+}
+
+/**
+ * DocumentPicker
+ */
+export namespace DocumentPicker {
+    interface Options {
+        type?: string;
+    }
+
+    type Response = {
+        type: 'success';
+        uri: string;
+        name: string;
+        size: number;
+    } | {
+        type: 'cancel';
+    };
+
+    function getDocumentAsync(options?: Options): Promise<Response>;
+}
+
+/**
+ * ErrorRecovery
+ */
+export namespace ErrorRecovery {
+    function setRecoveryProps(props: HashMap): void;
+}
+
+/**
+ * Facebook
+ */
+export namespace Facebook {
+    interface Options {
+        permissions?: string[];
+        behavior?: 'web' | 'native' | 'browser' | 'system';
+    }
+    interface Response {
+        type: 'cancel' | 'success';
+        token?: string;
+        expires?: number;
+    }
+    function logInWithReadPermissionsAsync(appId: string, options?: Options): Promise<Response>;
+}
+
+/**
+ * Facebook Ads
+ */
+export namespace FacebookAds {
+    /**
+     * Interstitial Ads
+     */
+    namespace InterstitialAdManager {
+        function showAd(placementId: string): Promise<boolean>;
+    }
+
+    /**
+     * Native Ads
+     */
+    type MediaCachePolicy = 'none' | 'icon' | 'image' | 'all';
+    class NativeAdsManager {
+        constructor(placementId: string, numberOfAdsToRequest?: number);
+        disableAutoRefresh(): void;
+        setMediaCachePolicy(cachePolicy: MediaCachePolicy): void;
+    }
+
+    function withNativeAd(component: Component<{
+        icon?: string;
+        coverImage?: string;
+        title?: string;
+        subtitle?: string;
+        description?: string;
+        callToActionText?: string;
+        socialContext?: string;
+    }>): Component<{ adsManager: NativeAdsManager }, { ad: any, canRequestAds: boolean }>;
+
+    /**
+     * Banner View
+     */
+    type AdType = 'large' | 'rectangle' | 'standard';
+
+    interface BannerViewProps {
+        type: AdType;
+        placementId: string;
+        onPress: () => void;
+        onError: () => void;
+    }
+
+    class BannerView extends Component<BannerViewProps> { }
+
+    /**
+     * Ad Settings
+     */
+    namespace AdSettings {
+        const currentDeviceHash: string;
+        function addTestDevice(device: string): void;
+        function clearTestDevices(): void;
+        type SDKLogLevel = 'none' | 'debug' | 'verbose' | 'warning' | 'error' | 'notification';
+        function setLogLevel(logLevel: SDKLogLevel): void;
+        function setIsChildDirected(isDirected: boolean): void;
+        function setMediationService(mediationService: string): void;
+        function setUrlPrefix(urlPrefix: string): void;
+    }
+}
+
+/**
+ * FaceDetector
+ */
+export namespace FaceDetector {
+    interface Point {
+        x: Axis;
+        y: Axis;
+    }
+    interface FaceFeature {
+        bounds: {
+            size: {
+                width: number;
+                height: number;
+            },
+            origin: Point;
+        };
+        smilingProbability?: number;
+        leftEarPosition?: Point;
+        rightEarPosition?: Point;
+        leftEyePosition?: Point;
+        leftEyeOpenProbability?: number;
+        rightEyePosition?: Point;
+        rightEyeOpenProbability?: number;
+        leftCheekPosition?: Point;
+        rightCheekPosition?: Point;
+        leftMouthPosition?: Point;
+        mouthPosition?: Point;
+        rightMouthPosition?: Point;
+        bottomMouthPosition?: Point;
+        noseBasePosition?: Point;
+        yawAngle?: number;
+        rollAngle?: number;
+    }
+    interface DetectFaceResult {
+        faces: FaceFeature[];
+        image: {
+            uri: string;
+            width: number;
+            height: number;
+            orientation: number;
+        };
+    }
+    interface Mode {
+        fast: 'fast';
+        accurate: 'accurate';
+    }
+    interface _Shared {
+        all: 'all';
+        none: 'none';
+    }
+    type Landmarks = _Shared;
+    type Classifications = _Shared;
+    interface _Constants {
+        Mode: Mode;
+        Landmarks: Landmarks;
+        Classifications: Classifications;
+    }
+
+    const Constants: _Constants;
+
+    interface DetectionOptions {
+        mode?: keyof Mode;
+        detectLandmarks?: keyof Landmarks;
+        runClassifications?: keyof Classifications;
+    }
+
+    function detectFaces(uri: string, options?: DetectionOptions): Promise<DetectFaceResult>;
+}
+
+/**
+ * FileSystem
+ */
+export namespace FileSystem {
+    type FileInfo = {
+        exists: true;
+        isDirectory: boolean;
+        uri: string;
+        size: number;
+        modificationTime: number;
+        md5?: Md5;
+    } | {
+        exists: false;
+        isDirectory: false;
+    };
+
+    interface DownloadResult {
+        uri: string;
+        status: number;
+        headers: { [name: string]: string };
+        md5?: Md5;
+    }
+
+    const documentDirectory: string;
+    const cacheDirectory: string;
+
+    function getInfoAsync(fileUri: string, options?: { md5?: string, size?: boolean; }): Promise<FileInfo>;
+    function readAsStringAsync(fileUri: string): Promise<string>;
+    function writeAsStringAsync(fileUri: string, contents: string): Promise<void>;
+    function deleteAsync(fileUri: string, options?: { idempotent: boolean; }): Promise<void>;
+    function moveAsync(options: { from: string, to: string; }): Promise<void>;
+    function copyAsync(options: { from: string, to: string; }): Promise<void>;
+    function makeDirectoryAsync(dirUri: string, options?: { intermediates: boolean }): Promise<void>;
+    function readDirectoryAsync(dirUri: string): Promise<string[]>;
+    function downloadAsync(uri: string, fileUri: string, options?: { md5?: boolean; }): Promise<DownloadResult>;
+    function createDownloadResumable(
+        uri: string,
+        fileUri: string,
+        options?: DownloadOptions,
+        callback?: (totalBytesWritten: number, totalBytesExpectedToWrite: number) => void,
+        resumeData?: string | null
+    ): DownloadResumable;
+
+    interface PauseResult {
+        url: string;
+        fileUri: string;
+        options: { md5: boolean; };
+        resumeData: string;
+    }
+
+    interface DownloadOptions {
+        md5?: boolean;
+        headers?: { [name: string]: string };
+    }
+
+    interface DownloadProgressData {
+        totalBytesWritten: number;
+        totalBytesExpectedToWrite: number;
+    }
+
+    type DownloadProgressCallback = (data: DownloadProgressData) => void;
+
+    class DownloadResumable {
+        constructor(
+            url: string,
+            fileUri: string,
+            options: DownloadOptions,
+            callback?: DownloadProgressCallback,
+            resumeData?: string
+        );
+
+        downloadAsync(): Promise<DownloadResult>;
+        pauseAsync(): Promise<PauseResult>;
+        resumeAsync(): Promise<DownloadResult>;
+        savable(): PauseResult;
+    }
+}
+
+/** Use TouchID/FaceID (iOS) or the Fingerprint API (Android) to authenticate the user with a fingerprint scan. */
+export namespace Fingerprint {
+    type FingerprintAuthenticationResult = {
+        success: true
+    } | {
+        success: false,
+
+        /** Error code in the case where authentication fails. */
+        error: string
+    };
+
+    /** Determine whether the Fingerprint scanner is available on the device. */
+    function hasHardwareAsync(): Promise<boolean>;
+
+    /** Determine whether the device has saved fingerprints to use for authentication. */
+    function isEnrolledAsync(): Promise<boolean>;
+
+    /**
+     * Attempts to authenticate via Fingerprint. Android: When using the fingerprint module on Android, you need to provide a UI component to prompt the user to scan their fingerprint, as the OS has no default alert for it.
+     *
+     * @param promptMessage A message that is shown alongside the TouchID/FaceID prompt. (iOS only)
+     */
+    function authenticateAsync(promptMessageIOS?: string): Promise<FingerprintAuthenticationResult>;
+
+    /** Cancels the fingerprint authentication flow. (Android only) */
+    function cancelAuthenticate(): void;
+}
+
+/**
+ * Font
+ */
+export namespace Font {
+    interface FontMap {
+        [name: string]: RequireSource;
+    }
+
+    function loadAsync(name: string, url: string): Promise<void>;
+    function loadAsync(map: FontMap): Promise<void>;
+}
+
+// #region GLView
+/**
+ * GLView
+ */
+export interface GLViewProps extends ViewProperties {
+    onContextCreate(): void;
+    msaaSamples: number;
+}
+
+export class GLView extends Component<GLViewProps, { msaaSamples: number }> { }
+// #endregion
+
+/**
+ * Google
+ */
+export namespace Google {
+    interface LogInConfig {
+        androidClientId?: string;
+        androidStandaloneAppClientId?: string;
+        iosClientId?: string;
+        iosStandaloneAppClientId?: string;
+        webClientId?: string;
+        behavior?: 'system' | 'web';
+        scopes?: string[];
+    }
+
+    type LogInResult = {
+        type: 'cancel';
+    } | {
+        type: 'success';
+        accessToken: string;
+        idToken?: string;
+        refreshToken?: string;
+        serverAuthCode?: string;
+        user: {
+            id: string;
+            name: string;
+            givenName: string;
+            familyName: string;
+            photoUrl?: string;
+            email?: string;
+        }
+    };
+
+    function logInAsync(config: LogInConfig): Promise<LogInResult>;
+}
+
+/** Access the device gyroscope sensor to respond to changes in rotation in 3d space. */
+export namespace Gyroscope {
+    interface GyroscopeObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    /** A callback that is invoked when an gyroscope update is available. */
+    function addListener(listener: (obj: GyroscopeObject) => any): EventSubscription;
+
+    /** Remove all listeners. */
+    function removeAllListeners(): void;
+
+    /** Subscribe for updates to the gyroscope. */
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * ImageManipulator
+ */
+export namespace ImageManipulator {
+    interface ImageResult {
+        uri: string;
+        width: number;
+        height: number;
+        base64?: string;
+    }
+
+    interface SaveOptions {
+        base64?: boolean;
+        compress?: FloatFromZeroToOne;
+        format?: 'jpeg' | 'png';
+    }
+
+    interface CropParameters {
+        originX: number;
+        originY: number;
+        width: number;
+        height: number;
+    }
+
+    interface ImageManipulationOptions {
+        resize?: { width?: number; height?: number };
+        rotate?: number;
+        flip?: { vertical?: boolean; horizontal?: boolean };
+        crop?: CropParameters;
+    }
+
+    function manipulate(uri: string, actions: ImageManipulationOptions, saveOptions?: SaveOptions): Promise<ImageResult>;
+}
+
+/**
+ * Image Picker
+ */
+export namespace ImagePicker {
+    interface ImageInfo {
+        uri: string;
+        width: number;
+        height: number;
+    }
+
+    type ImageResult = { cancelled: true } | ({ cancelled: false } & ImageInfo);
+
+    interface _MediaTypeOptions {
+        All: 'All';
+        Videos: 'Videos';
+        Images: 'Images';
+    }
+
+    const MediaTypeOptions: _MediaTypeOptions;
+
+    interface ImageLibraryOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+        mediaTypes?: keyof _MediaTypeOptions;
+    }
+
+    function launchImageLibraryAsync(options?: ImageLibraryOptions): Promise<ImageResult>;
+
+    interface CameraOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+    }
+
+    function launchCameraAsync(options?: CameraOptions): Promise<ImageResult>;
+}
+
+/**
+ * IntentLauncherAndroid
+ */
+export namespace IntentLauncherAndroid {
+    const ACTION_ACCESSIBILITY_SETTINGS: 'android.settings.ACCESSIBILITY_SETTINGS';
+    const ACTION_APP_NOTIFICATION_REDACTION: 'android.settings.ACTION_APP_NOTIFICATION_REDACTION';
+    const ACTION_CONDITION_PROVIDER_SETTINGS: 'android.settings.ACTION_CONDITION_PROVIDER_SETTINGS';
+    const ACTION_NOTIFICATION_LISTENER_SETTINGS: 'android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS';
+    const ACTION_PRINT_SETTINGS: 'android.settings.ACTION_PRINT_SETTINGS';
+    const ACTION_ADD_ACCOUNT_SETTINGS: 'android.settings.ADD_ACCOUNT_SETTINGS';
+    const ACTION_AIRPLANE_MODE_SETTINGS: 'android.settings.AIRPLANE_MODE_SETTINGS';
+    const ACTION_APN_SETTINGS: 'android.settings.APN_SETTINGS';
+    const ACTION_APPLICATION_DETAILS_SETTINGS: 'android.settings.APPLICATION_DETAILS_SETTINGS';
+    const ACTION_APPLICATION_DEVELOPMENT_SETTINGS: 'android.settings.APPLICATION_DEVELOPMENT_SETTINGS';
+    const ACTION_APPLICATION_SETTINGS: 'android.settings.APPLICATION_SETTINGS';
+    const ACTION_APP_NOTIFICATION_SETTINGS: 'android.settings.APP_NOTIFICATION_SETTINGS';
+    const ACTION_APP_OPS_SETTINGS: 'android.settings.APP_OPS_SETTINGS';
+    const ACTION_BATTERY_SAVER_SETTINGS: 'android.settings.BATTERY_SAVER_SETTINGS';
+    const ACTION_BLUETOOTH_SETTINGS: 'android.settings.BLUETOOTH_SETTINGS';
+    const ACTION_CAPTIONING_SETTINGS: 'android.settings.CAPTIONING_SETTINGS';
+    const ACTION_CAST_SETTINGS: 'android.settings.CAST_SETTINGS';
+    const ACTION_DATA_ROAMING_SETTINGS: 'android.settings.DATA_ROAMING_SETTINGS';
+    const ACTION_DATE_SETTINGS: 'android.settings.DATE_SETTINGS';
+    const ACTION_DEVICE_INFO_SETTINGS: 'android.settings.DEVICE_INFO_SETTINGS';
+    const ACTION_DEVICE_NAME: 'android.settings.DEVICE_NAME';
+    const ACTION_DISPLAY_SETTINGS: 'android.settings.DISPLAY_SETTINGS';
+    const ACTION_DREAM_SETTINGS: 'android.settings.DREAM_SETTINGS';
+    const ACTION_HARD_KEYBOARD_SETTINGS: 'android.settings.HARD_KEYBOARD_SETTINGS';
+    const ACTION_HOME_SETTINGS: 'android.settings.HOME_SETTINGS';
+    const ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS: 'android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS';
+    const ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS: 'android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS';
+    const ACTION_INPUT_METHOD_SETTINGS: 'android.settings.INPUT_METHOD_SETTINGS';
+    const ACTION_INPUT_METHOD_SUBTYPE_SETTINGS: 'android.settings.INPUT_METHOD_SUBTYPE_SETTINGS';
+    const ACTION_INTERNAL_STORAGE_SETTINGS: 'android.settings.INTERNAL_STORAGE_SETTINGS';
+    const ACTION_LOCALE_SETTINGS: 'android.settings.LOCALE_SETTINGS';
+    const ACTION_LOCATION_SOURCE_SETTINGS: 'android.settings.LOCATION_SOURCE_SETTINGS';
+    const ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS: 'android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS';
+    const ACTION_MANAGE_APPLICATIONS_SETTINGS: 'android.settings.MANAGE_APPLICATIONS_SETTINGS';
+    const ACTION_MANAGE_DEFAULT_APPS_SETTINGS: 'android.settings.MANAGE_DEFAULT_APPS_SETTINGS';
+    const ACTION_MEMORY_CARD_SETTINGS: 'android.settings.MEMORY_CARD_SETTINGS';
+    const ACTION_MONITORING_CERT_INFO: 'android.settings.MONITORING_CERT_INFO';
+    const ACTION_NETWORK_OPERATOR_SETTINGS: 'android.settings.NETWORK_OPERATOR_SETTINGS';
+    const ACTION_NFCSHARING_SETTINGS: 'android.settings.NFCSHARING_SETTINGS';
+    const ACTION_NFC_PAYMENT_SETTINGS: 'android.settings.NFC_PAYMENT_SETTINGS';
+    const ACTION_NFC_SETTINGS: 'android.settings.NFC_SETTINGS';
+    const ACTION_NIGHT_DISPLAY_SETTINGS: 'android.settings.NIGHT_DISPLAY_SETTINGS';
+    const ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS: 'android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS';
+    const ACTION_NOTIFICATION_SETTINGS: 'android.settings.NOTIFICATION_SETTINGS';
+    const ACTION_PAIRING_SETTINGS: 'android.settings.PAIRING_SETTINGS';
+    const ACTION_PRIVACY_SETTINGS: 'android.settings.PRIVACY_SETTINGS';
+    const ACTION_QUICK_LAUNCH_SETTINGS: 'android.settings.QUICK_LAUNCH_SETTINGS';
+    const ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS: 'android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS';
+    const ACTION_SECURITY_SETTINGS: 'android.settings.SECURITY_SETTINGS';
+    const ACTION_SETTINGS: 'android.settings.SETTINGS';
+    const ACTION_SHOW_ADMIN_SUPPORT_DETAILS: 'android.settings.SHOW_ADMIN_SUPPORT_DETAILS';
+    const ACTION_SHOW_INPUT_METHOD_PICKER: 'android.settings.SHOW_INPUT_METHOD_PICKER';
+    const ACTION_SHOW_REGULATORY_INFO: 'android.settings.SHOW_REGULATORY_INFO';
+    const ACTION_SHOW_REMOTE_BUGREPORT_DIALOG: 'android.settings.SHOW_REMOTE_BUGREPORT_DIALOG';
+    const ACTION_SOUND_SETTINGS: 'android.settings.SOUND_SETTINGS';
+    const ACTION_STORAGE_MANAGER_SETTINGS: 'android.settings.STORAGE_MANAGER_SETTINGS';
+    const ACTION_SYNC_SETTINGS: 'android.settings.SYNC_SETTINGS';
+    const ACTION_SYSTEM_UPDATE_SETTINGS: 'android.settings.SYSTEM_UPDATE_SETTINGS';
+    const ACTION_TETHER_PROVISIONING_UI: 'android.settings.TETHER_PROVISIONING_UI';
+    const ACTION_TRUSTED_CREDENTIALS_USER: 'android.settings.TRUSTED_CREDENTIALS_USER';
+    const ACTION_USAGE_ACCESS_SETTINGS: 'android.settings.USAGE_ACCESS_SETTINGS';
+    const ACTION_USER_DICTIONARY_INSERT: 'android.settings.USER_DICTIONARY_INSERT';
+    const ACTION_USER_DICTIONARY_SETTINGS: 'android.settings.USER_DICTIONARY_SETTINGS';
+    const ACTION_USER_SETTINGS: 'android.settings.USER_SETTINGS';
+    const ACTION_VOICE_CONTROL_AIRPLANE_MODE: 'android.settings.VOICE_CONTROL_AIRPLANE_MODE';
+    const ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE: 'android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE';
+    const ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE: 'android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE';
+    const ACTION_VOICE_INPUT_SETTINGS: 'android.settings.VOICE_INPUT_SETTINGS';
+    const ACTION_VPN_SETTINGS: 'android.settings.VPN_SETTINGS';
+    const ACTION_VR_LISTENER_SETTINGS: 'android.settings.VR_LISTENER_SETTINGS';
+    const ACTION_WEBVIEW_SETTINGS: 'android.settings.WEBVIEW_SETTINGS';
+    const ACTION_WIFI_IP_SETTINGS: 'android.settings.WIFI_IP_SETTINGS';
+    const ACTION_WIFI_SETTINGS: 'android.settings.WIFI_SETTINGS';
+    const ACTION_WIRELESS_SETTINGS: 'android.settings.WIRELESS_SETTINGS';
+    const ACTION_ZEN_MODE_AUTOMATION_SETTINGS: 'android.settings.ZEN_MODE_AUTOMATION_SETTINGS';
+    const ACTION_ZEN_MODE_EVENT_RULE_SETTINGS: 'android.settings.ZEN_MODE_EVENT_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS: 'android.settings.ZEN_MODE_EXTERNAL_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_PRIORITY_SETTINGS: 'android.settings.ZEN_MODE_PRIORITY_SETTINGS';
+    const ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS: 'android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_SETTINGS: 'android.settings.ZEN_MODE_SETTINGS';
+
+    function startActivityAsync(activity: string, data?: HashMap): Promise<boolean>;
+}
+
+/**
+ * KeepAwake
+ */
+export class KeepAwake extends Component {
+    static activate(): void;
+    static deactivate(): void;
+}
+
+// #region LinearGradient
+/**
+ * LinearGradient
+ */
+export interface LinearGradientProps extends ViewProperties {
+    colors: string[];
+    start?: [number, number];
+    end?: [number, number];
+    locations?: number[];
+}
+
+export class LinearGradient extends Component<LinearGradientProps> { }
+// #endregion
+
+/**
+ * Location
+ */
+export namespace Location {
+    interface LocationOptions {
+        enableHighAccuracy?: boolean;
+        timeInterval?: number;
+        distanceInterval?: number;
+    }
+
+    interface LocationProps {
+        latitude: number;
+        longitude: number;
+    }
+
+    interface Coords extends LocationProps {
+        altitude: number;
+        accuracy: number;
+    }
+
+    interface LocationData {
+        coords: {
+            heading: number;
+            speed: number
+        } & Coords;
+        timestamp: number;
+    }
+
+    interface ProviderStatus {
+        locationServicesEnabled: boolean;
+        gpsAvailable?: boolean;
+        networkAvailable?: boolean;
+        passiveAvailable?: boolean;
+    }
+
+    interface HeadingStatus {
+        magHeading: number;
+        trueHeading: number;
+        accuracy: number;
+    }
+
+    interface GeocodeData {
+        city: string;
+        street: string;
+        region: string;
+        postalCode: string;
+        country: string;
+        name: string;
+    }
+
+    type LocationCallback = (data: LocationData) => void;
+
+    function getCurrentPositionAsync(options: LocationOptions): Promise<LocationData>;
+    function watchPositionAsync(options: LocationOptions, callback: LocationCallback): EventSubscription;
+    function getProviderStatusAsync(): Promise<ProviderStatus>;
+    function getHeadingAsync(): Promise<HeadingStatus>;
+    function watchHeadingAsync(callback: (status: HeadingStatus) => void): EventSubscription;
+    function geocodeAsync(address: string): Promise<Coords>;
+    function reverseGeocodeAsync(location: LocationProps): Promise<GeocodeData>;
+    function setApiKey(key: string): void;
+}
+
+/**
+ * Magnetometer
+ */
+export namespace Magnetometer {
+    interface MagnetometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: MagnetometerObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Notifications
+ */
+export namespace Notifications {
+    interface Notification {
+        origin: 'selected' | 'received';
+        data: any;
+        remote: boolean;
+        isMultiple: boolean;
+    }
+
+    interface LocalNotification {
+        title: string;
+        body?: string;
+        data?: any;
+        ios?: {
+            sound?: boolean
+        };
+        android?: {
+            sound?: boolean;
+            icon?: string;
+            color?: string;
+            priority?: 'min' | 'low' | 'high' | 'max';
+            sticky?: boolean;
+            vibrate?: boolean | number[];
+            link?: string;
+        };
+    }
+
+    type LocalNotificationId = string | number;
+
+    function addListener(listener: (notification: Notification) => any): EventSubscription;
+    function getExpoPushTokenAsync(): Promise<string>;
+    function presentLocalNotificationAsync(localNotification: LocalNotification): Promise<LocalNotificationId>;
+    function scheduleLocalNotificationAsync(
+        localNotification: LocalNotification,
+        schedulingOptions: { time: Date | number, repeat?: 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year' }
+    ): Promise<LocalNotificationId>;
+    function dismissNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function dismissAllNotificationsAsync(): Promise<void>;
+    function cancelScheduledNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function cancelAllScheduledNotificationsAsync(): Promise<void>;
+    function getBadgeNumberAsync(): Promise<number>;
+    function setBadgeNumberAsync(number: number): Promise<void>;
+}
+
+/**
+ * Pedometer
+ */
+export namespace Pedometer {
+    function isAvailableAsync(): Promise<boolean>;
+    function getStepCountAsync(start: Date, end: Date): Promise<{ steps: number; }>;
+    function watchStepCount(callback: (params: { steps: number; }) => void): EventSubscription;
+}
+
+/**
+ * Permissions
+ */
+export namespace Permissions {
+    type PermissionType = 'remoteNotifications' | 'location' |
+        'camera' | 'contacts' | 'audioRecording';
+    type PermissionStatus = 'undetermined' | 'granted' | 'denied';
+    type PermissionExpires = 'never';
+
+    interface PermissionDetailsLocationIOS {
+        scope: 'whenInUse' | 'always';
+    }
+
+    interface PermissionDetailsLocationAndroid {
+        scope: 'fine' | 'coarse' | 'none';
+    }
+
+    interface PermissionResponse {
+        status: PermissionStatus;
+        expires: PermissionExpires;
+        ios?: PermissionDetailsLocationIOS;
+        android?: PermissionDetailsLocationAndroid;
+    }
+
+    function getAsync(type: PermissionType): Promise<PermissionResponse>;
+    function askAsync(type: PermissionType): Promise<PermissionResponse>;
+
+    type RemoteNotificationPermission = 'remoteNotifications';
+
+    const CAMERA: 'camera';
+    const CAMERA_ROLL: 'cameraRoll';
+    const AUDIO_RECORDING: 'audioRecording';
+    const LOCATION: 'location';
+    const REMOTE_NOTIFICATIONS: RemoteNotificationPermission;
+    const NOTIFICATIONS: RemoteNotificationPermission;
+    const CONTACTS: 'contacts';
+    const SYSTEM_BRIGHTNESS: 'systemBrightness';
+}
+
+/**
+ * Register Root Component
+ */
+export function registerRootComponent(component: ComponentType): void;
+
+/**
+ * ScreenOrientation
+ */
+export namespace ScreenOrientation {
+    interface Orientations {
+        ALL: 'ALL';
+        ALL_BUT_UPSIDE_DOWN: 'ALL_BUT_UPSIDE_DOWN';
+        PORTRAIT: 'PORTRAIT';
+        PORTRAIT_UP: 'PORTRAIT_UP';
+        PORTRAIT_DOWN: 'PORTRAIT_DOWN';
+        LANDSCAPE: 'LANDSCAPE';
+        LANDSCAPE_LEFT: 'LANDSCAPE_LEFT';
+        LANDSCAPE_RIGHT: 'LANDSCAPE_RIGHT';
+    }
+
+    const Orientation: Orientations;
+
+    function allow(orientation: keyof Orientations): void;
+}
+
+/**
+ * SecureStore
+ */
+export namespace SecureStore {
+    interface SecureStoreOptions {
+        keychainService?: string;
+        keychainAccessible?: number;
+    }
+
+    function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
+    function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
+    function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
+}
+
+/**
+ * Segment
+ */
+export namespace Segment {
+    function initialize(keys: {
+        androidWriteKey: string;
+        iosWriteKey: string;
+    }): void;
+    function identify(userId: string): void;
+    function identifyWithTraits(userId: string, traits: object): void;
+    function track(event: string): void;
+    function reset(): void;
+    function trackWithProperties(event: string, properties: object): void;
+    function screen(screenName: string): void;
+    function screenWithProperties(screenName: string, properties: object): void;
+    function flush(): void;
+}
+
+/**
+ * Speech
+ */
+export namespace Speech {
+    interface SpeechOptions {
+        language?: string;
+        pitch?: number;
+        rate?: number;
+        onStart?: () => void;
+        onStopped?: () => void;
+        onDone?: () => void;
+        onError?: (error: string) => void;
+    }
+
+    function speak(text: string, options?: SpeechOptions): void;
+    function stop(): void;
+    function isSpeakingAsync(): Promise<boolean>;
+}
+
+/**
+ * SQLite
+ */
+export namespace SQLite {
+    type Error = any;
+
+    interface Database {
+        transaction(
+            callback: (transaction: Transaction) => any,
+            error?: (error: Error) => any,     // TODO def of error
+            success?: () => any
+        ): void;
+    }
+
+    interface Transaction {
+        executeSql(
+            sqlStatement: string,
+            arguments?: string[] | number[],
+            success?: (transaction: Transaction, resultSet: ResultSet) => any,
+            error?: (transaction: Transaction, error: Error) => any
+        ): void;
+    }
+
+    interface ResultSet {
+        insertId: number;
+        rowAffected: number;
+        rows: {
+            length: number;
+            item: (index: number) => any;
+            _array: HashMap[];
+        };
+    }
+
+    function openDatabase(
+        name: string | {
+            name: string,
+            version?: string,
+            description?: string,
+            size?: number,
+            callback?: () => any
+        },
+        version?: string,
+        description?: string,
+        size?: number,
+        callback?: () => any
+    ): any;
+}
+
+// #region Svg
+/**
+ * Svg
+ */
+export interface SvgCommonProps {
+    fill?: string;
+    fillOpacity?: number | string;
+    stroke?: string;
+    strokeWidth?: number | string;
+    strokeOpacity?: number | string;
+    strokeLinecap?: string;
+    strokeLineJoin?: string;
+    strokeDasharray?: any[];
+    strokeDashoffset?: any;
+    x?: number | string;
+    y?: number | string;
+    rotate?: number | string;
+    scale?: number | string;
+    origin?: number | string;
+    originX?: number | string;
+    originY?: number | string;
+    id?: string;
+    disabled?: boolean;
+    onPress?: () => any;
+    onPressIn?: () => any;
+    onPressOut?: () => any;
+    onLongPress?: () => any;
+    delayPressIn?: number;
+    delayPressOut?: number;
+    delayLongPress?: number;
+}
+
+export interface SvgRectProps extends SvgCommonProps {
+    width: number | string;
+    height: number | string;
+}
+
+export interface SvgCircleProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    r: number | string;
+}
+
+export interface SvgEllipseProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    rx: number | string;
+    ry: number | string;
+}
+
+export interface SvgLineProps extends SvgCommonProps {
+    x1: number | string;
+    y1: number | string;
+    x2: number | string;
+    y2: number | string;
+}
+
+export interface SvgPolyProps extends SvgCommonProps {
+    points: string;
+}
+
+export interface SvgPathProps extends SvgCommonProps {
+    d: string;
+}
+
+export interface SvgTextProps extends SvgCommonProps {
+    textAnchor?: string;
+    fontSize?: number | string;
+    fontWeight?: string;
+}
+
+export interface SvgTSpanProps extends SvgTextProps {
+    dx?: string;
+    dy?: string;
+}
+
+export interface SvgTextPathProps extends SvgCommonProps {
+    href?: string;
+    startOffset?: string;
+}
+
+export interface SvgUseProps extends SvgCommonProps {
+    href: string;
+    x: number | string;
+    y: number | string;
+}
+
+export interface SvgSymbolProps extends SvgCommonProps {
+    viewBox: string;
+    width: number | string;
+    height: number | string;
+}
+
+export interface SvgLinearGradientProps extends SvgCommonProps {
+    x1: number | string;
+    x2: number | string;
+    y1: number | string;
+    y2: number | string;
+}
+
+export interface SvgRadialGradientProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    rx: number | string;
+    ry: number | string;
+    fx: number | string;
+    fy: number | string;
+    gradientUnits?: string;
+}
+
+export interface SvgStopProps extends SvgCommonProps {
+    offset?: string;
+    stopColor?: string;
+    stopOpacity?: string;
+}
+
+export class Svg extends Component<{ width: number, height: number }> {
+    static Circle: ComponentClass<SvgCircleProps>;
+    static ClipPath: ComponentClass<SvgCommonProps>;
+    static Defs: ComponentClass;
+    static Ellipse: ComponentClass<SvgEllipseProps>;
+    static G: ComponentClass<SvgCommonProps>;
+    static Line: ComponentClass<SvgLineProps>;
+    static LinearGradient: ComponentClass<SvgLinearGradientProps>;
+    static Path: ComponentClass<SvgPathProps>;
+    static Polygon: ComponentClass<SvgPolyProps>;
+    static Polyline: ComponentClass<SvgPolyProps>;
+    static RadialGradient: ComponentClass<SvgRadialGradientProps>;
+    static Rect: ComponentClass<SvgRectProps>;
+    static Stop: ComponentClass<SvgStopProps>;
+    static Symbol: ComponentClass<SvgSymbolProps>;
+    static Text: ComponentClass<SvgTextProps>;
+    static TextPath: ComponentClass<SvgTextPathProps>;
+    static TSpan: ComponentClass<SvgTSpanProps>;
+    static Use: ComponentClass<SvgUseProps>;
+}
+// #endregion
+
+/**
+ * Take Snapshot
+ */
+export function takeSnapshotAsync(
+    view?: (number | React.ReactElement<any>),
+    options?: {
+        width?: number,
+        height?: number,
+        format?: 'png' | 'jpg' | 'jpeg' | 'webm',
+        quality?: number,
+        result?: 'file' | 'base64' | 'data-uri',
+    }
+): Promise<string>;
+
+/** Helpful utility functions that don’t fit anywhere else, including some localization and internationalization methods. */
+export namespace Util {
+    /** Returns the current device country code. */
+    function getCurrentDeviceCountryAsync(): Promise<string>;
+
+    /** Returns the current device locale as a string. */
+    function getCurrentLocaleAsync(): Promise<string>;
+
+    /** Returns the current device time zone name. */
+    function getCurrentTimeZoneAsync(): Promise<string>;
+
+    /** Reloads the current experience. This will fetch and load the newest available JavaScript supported by the device’s Expo environment. This is useful for triggering an update of your experience if you have published a new version. */
+    function reload(): void;
+
+    /** _Android only_. Invokes a callback when a new version of your app is successfully downloaded in the background. */
+    function addNewVersionListenerExperimental(listener: (event: {
+        manifest: object;
+    }) => void): { remove(): void; };
+}
+
+// #region Video
+/**
+ * Expo Video
+ */
+export interface NaturalSize {
+    width: number;
+    height: number;
+    orientation: Orientation;
+}
+
+export interface ReadyForDisplayEvent {
+    naturalSize: NaturalSize;
+    status: PlaybackStatus;
+}
+
+export enum FullscreenUpdateVariants {
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT = 0,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT = 1,
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS = 2,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS = 3
+}
+
+export interface FullscreenUpdateEvent {
+    fullscreenUpdate: FullscreenUpdateVariants;
+    status: PlaybackStatus;
+}
+
+export interface VideoProps {
+    source?: PlaybackSource | null;
+    posterSource?: URISource | RequireSource;
+
+    resizeMode?: ResizeModeContain | ResizeModeCover | ResizeModeStretch;
+    useNativeControls?: boolean;
+    usePoster?: boolean;
+
+    onPlaybackStatusUpdate?: (status: PlaybackStatus) => void;
+    onReadyForDisplay?: (event: ReadyForDisplayEvent) => void;
+    onIOSFullscreenUpdate?: (event: FullscreenUpdateEvent) => void;
+
+    onLoadStart?: () => void;
+    onLoad?: (status: PlaybackStatus) => void;
+    onError?: (error: string) => void;
+
+    status?: PlaybackStatusToSet;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: number;
+    shouldCorrectPitch?: boolean;
+    volume?: number;
+    isMuted?: boolean;
+    isLooping?: boolean;
+
+    scaleX?: number;
+    scaleY?: number;
+    translateX?: number;
+    translateY?: number;
+    rotation?: number;
+    ref?: Ref<PlaybackObject>;
+}
+
+export interface VideoState {
+    showPoster: boolean;
+}
+
+export class Video extends Component<VideoProps, VideoState> {
+    static RESIZE_MODE_CONTAIN: ResizeModeContain;
+    static RESIZE_MODE_COVER: ResizeModeCover;
+    static RESIZE_MODE_STRETCH: ResizeModeStretch;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS;
+}
+// #endregion
+
+/**
+ * Web Browser
+ */
+export namespace WebBrowser {
+    function openBrowserAsync(url: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function openAuthSessionAsync(url: string, redirectUrl?: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function dismissBrowser(): Promise<{ type: 'dismissed' }>;
+}
diff --git a/types/expo/v24/tsconfig.json b/types/expo/v24/tsconfig.json
new file mode 100644
index 0000000000..87b7b33224
--- /dev/null
+++ b/types/expo/v24/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "expo": [
+                "expo/v24"
+            ],
+            "expo/*": [
+                "expo/v24/*"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "expo-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/expo/v24/tslint.json b/types/expo/v24/tslint.json
new file mode 100644
index 0000000000..8270136207
--- /dev/null
+++ b/types/expo/v24/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "void-return": false,
+        "max-line-length": false
+    }
+}

From 89ded17f34ec409ff8f2a3e5b1697e7362c35f48 Mon Sep 17 00:00:00 2001
From: Aleksei Tsikov <alexey.tsikov@gmail.com>
Date: Mon, 26 Feb 2018 21:56:03 +0200
Subject: [PATCH 297/388] [events] Set removeAllListeners argument as optional
 (#23828)

* Set removeAllListeners argument as optional

* Update version properly
---
 types/events/events-tests.ts | 6 ++++++
 types/events/index.d.ts      | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/types/events/events-tests.ts b/types/events/events-tests.ts
index ccf89c1402..67fe352225 100644
--- a/types/events/events-tests.ts
+++ b/types/events/events-tests.ts
@@ -53,6 +53,12 @@ setTimeout(() => {
   emitter.removeAllListeners('send');
 }, 3000);
 
+setTimeout(() => {
+  console.log('\n');
+  emitter.emit('send', 'params1');
+  emitter.removeAllListeners();
+}, 3000);
+
 setTimeout(() => {
   console.log('\n');
   emitter.emit(1);
diff --git a/types/events/index.d.ts b/types/events/index.d.ts
index 85ce0a7b0e..c9b08a4575 100644
--- a/types/events/index.d.ts
+++ b/types/events/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for events 1.1
+// Type definitions for events 1.2
 // Project: https://github.com/Gozala/events
 // Definitions by: Yasunori Ohoka <https://github.com/yasupeke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -15,7 +15,7 @@ export class EventEmitter {
   on(type: string | number, listener: Listener): this;
   once(type: string | number, listener: Listener): this;
   removeListener(type: string | number, listener: Listener): this;
-  removeAllListeners(type: string | number): this;
+  removeAllListeners(type?: string | number): this;
   listeners(type: string | number): Listener[];
   listenerCount(type: string | number): number;
 }

From fe34804ed7a3ecd9a9dcc32b6f6ba35bf906137b Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 26 Feb 2018 11:58:17 -0800
Subject: [PATCH 298/388] remove unnecessary comment

---
 types/single-line-log/single-line-log-tests.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/single-line-log/single-line-log-tests.ts b/types/single-line-log/single-line-log-tests.ts
index 3814c64400..cb1ac0d7c6 100644
--- a/types/single-line-log/single-line-log-tests.ts
+++ b/types/single-line-log/single-line-log-tests.ts
@@ -1,4 +1,3 @@
-// @ts-check
 /// <reference types="node"/>
 
 import singleLineLog = require('single-line-log');

From c9749a4f65137fa4d98ca64307bfe05301720113 Mon Sep 17 00:00:00 2001
From: David <github@davidhayden.email>
Date: Mon, 26 Feb 2018 19:59:10 +0000
Subject: [PATCH 299/388] [aws-lambda] Include CloudFrontRequest in
 CloudFrontRequestResult union type (#23882)

A request is a valid callback result type. See example: https://docs.aws.amazon.com/lambda/latest/dg/lambda-edge.html#lambda-edge-authoring-functions-example-ab-testing
---
 types/aws-lambda/aws-lambda-tests.ts | 10 +++++++++-
 types/aws-lambda/index.d.ts          |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index bd29160912..2b7b375576 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -631,7 +631,15 @@ let apiGtwProxyHandler: AWSLambda.APIGatewayProxyHandler = (event: AWSLambda.API
 let proxyHandler: AWSLambda.ProxyHandler = (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.ProxyCallback) => { };
 apiGtwProxyHandler = proxyHandler;
 
-let cloudFrontRequestHandler: AWSLambda.CloudFrontRequestHandler = (event: AWSLambda.CloudFrontRequestEvent, context: AWSLambda.Context, cb: AWSLambda.CloudFrontRequestCallback) => { };
+let cloudFrontRequestHandler: AWSLambda.CloudFrontRequestHandler = (event: AWSLambda.CloudFrontRequestEvent, context: AWSLambda.Context, cb: AWSLambda.CloudFrontRequestCallback) => {
+    cb();
+    cb(null);
+    cb(new Error(''));
+    cb(null, { clientIp: str, method: str, uri: str, querystring: str, headers: { } });
+    cb(null, { status: str });
+    // $ExpectError
+    cb(null, { });
+};
 
 let cloudFrontResponseHandler: AWSLambda.CloudFrontResponseHandler = (event: AWSLambda.CloudFrontResponseEvent, context: AWSLambda.Context, cb: AWSLambda.CloudFrontResponseCallback) => { };
 
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index 03910b108c..eccc96ba3e 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -15,6 +15,7 @@
 //                 Palmi Valgeirsson <https://github.com/palmithor>
 //                 Danilo Raisi <https://github.com/daniloraisi>
 //                 Simon Buchan <https://github.com/simonbuchan>
+//                 David Hayden <https://github.com/Haydabase>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -516,7 +517,7 @@ export interface CloudFrontResponseEvent {
     }>;
 }
 
-export type CloudFrontRequestResult = undefined | null | CloudFrontResultResponse;
+export type CloudFrontRequestResult = undefined | null | CloudFrontResultResponse | CloudFrontRequest;
 
 export interface CloudFrontRequestEvent {
     Records: Array<{

From c37774d139d876b29373722c3c1ac4424835b78c Mon Sep 17 00:00:00 2001
From: Roberto Huertas <roberto.huertas@outlook.com>
Date: Mon, 26 Feb 2018 21:32:41 +0100
Subject: [PATCH 300/388] fixes issue #23759 (#23824)

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 7cc0dc3d63..531a18e9e5 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -12,6 +12,7 @@
 //                 Qibang Sun <https://github.com/bang88>
 //                 Sergei Butko: <https://github.com/svbutko>
 //                 Veit Lehmann: <https://github.com/levito>
+//                 Roberto Huertas: <https://github.com/robertohuertasm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -166,10 +167,9 @@ export interface NavigationScreenConfigProps {
 
 export type NavigationScreenConfig<Options> =
   Options
-  | (NavigationScreenConfigProps &
-    ((navigationOptionsContainer: {
+  | ((navigationOptionsContainer: NavigationScreenConfigProps & {
       navigationOptions: NavigationScreenProp<NavigationRoute>,
-    }) => Options));
+    }) => Options);
 
 export type NavigationComponent =
   NavigationScreenComponent<any, any>

From 35cb910717f1cd6f79eaf8452bc0cba68be4bcd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guilherme=20H=C3=BCbner=20Franco?=
 <guilherme_hubner@msn.com>
Date: Mon, 26 Feb 2018 17:33:11 -0300
Subject: [PATCH 301/388] Add react-text-mask definitions (#23871)

---
 types/react-text-mask/index.d.ts    | 36 +++++++++++++++++++++++++++++
 types/react-text-mask/tsconfig.json | 22 ++++++++++++++++++
 types/react-text-mask/tslint.json   |  3 +++
 3 files changed, 61 insertions(+)
 create mode 100644 types/react-text-mask/index.d.ts
 create mode 100644 types/react-text-mask/tsconfig.json
 create mode 100644 types/react-text-mask/tslint.json

diff --git a/types/react-text-mask/index.d.ts b/types/react-text-mask/index.d.ts
new file mode 100644
index 0000000000..f4c46bea58
--- /dev/null
+++ b/types/react-text-mask/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for react-text-mask 16.0
+// Project: https://github.com/text-mask/text-mask
+// Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from "react";
+
+export type maskArray = Array<string | RegExp>;
+
+export interface MaskedInputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+    mask?: maskArray | ((input: HTMLInputElement) => maskArray);
+
+    guide?: boolean;
+
+    placeholderChar?: string;
+
+    keepCharPositions?: boolean;
+
+    pipe?: (conformedValue: string, config: any) => false | string | { value: string, indexesOfPipedChars: number[] };
+
+    onReject?: (infos: { conformedValue: string, maskRejection: boolean, pipeRejection: boolean }) => void;
+
+    onAccept?: () => void;
+}
+
+export interface conformToMaskResult {
+    conformedValue: string;
+    meta: {
+        someCharsRejected: boolean
+    };
+}
+
+export default class MaskedInput extends React.Component<MaskedInputProps, any> {}
+
+export function conformToMask(text: string, mask: maskArray, config: any): conformToMaskResult;
diff --git a/types/react-text-mask/tsconfig.json b/types/react-text-mask/tsconfig.json
new file mode 100644
index 0000000000..ca4a35b1cb
--- /dev/null
+++ b/types/react-text-mask/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "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-text-mask/tslint.json b/types/react-text-mask/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/react-text-mask/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}

From 27be94dcba26ac2f350cb88ef87dd2cf5a8d164e Mon Sep 17 00:00:00 2001
From: Moritz Gunz <moritz.gunz@gmail.com>
Date: Mon, 26 Feb 2018 21:38:51 +0100
Subject: [PATCH 302/388] [spotify-web-playback-sdk] Reflect new changes
 (#23819)

* Introduce new addListener / removeListener methods

* Add definition creators

* Add expected handler types
---
 types/spotify-web-playback-sdk/index.d.ts     | 20 +++++++++++--
 .../spotify-web-playback-sdk-tests.ts         | 30 +++++++++++--------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/types/spotify-web-playback-sdk/index.d.ts b/types/spotify-web-playback-sdk/index.d.ts
index 95d8375b56..ee3086e40e 100644
--- a/types/spotify-web-playback-sdk/index.d.ts
+++ b/types/spotify-web-playback-sdk/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for spotify-web-playback-sdk 0.1
 // Project: https://beta.developer.spotify.com/documentation/web-playback-sdk/reference/
 // Definitions by: Festify Dev Team <https://github.com/Festify>
+//                 Marcus Weiner <https://github.com/mraerino>
+//                 Moritz Gunz <https://github.com/NeoLegends>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface Window {
@@ -86,6 +88,10 @@ declare namespace Spotify {
         FULL_REPEAT = 2,
     }
 
+    type ErrorListener = (err: Error) => void;
+    type PlaybackInstanceListener = (inst: WebPlaybackInstance) => void;
+    type PlaybackStateListener = (s: PlaybackState) => void;
+
     class SpotifyPlayer {
         constructor(options: PlayerInit);
 
@@ -95,9 +101,17 @@ declare namespace Spotify {
         getVolume(): Promise<number>;
         nextTrack(): Promise<void>;
 
-        on(event: 'ready', cb: (pb: WebPlaybackInstance) => void): void;
-        on(event: 'player_state_changed', cb: (pb: PlaybackState) => void): void;
-        on(event: ErrorTypes, cb: (err: Error) => void): void;
+        addListener(event: 'ready', cb: PlaybackInstanceListener): void;
+        addListener(event: 'player_state_changed', cb: PlaybackStateListener): void;
+        addListener(event: ErrorTypes, cb: ErrorListener): void;
+        on(event: 'ready', cb: PlaybackInstanceListener): void;
+        on(event: 'player_state_changed', cb: PlaybackStateListener): void;
+        on(event: ErrorTypes, cb: ErrorListener): void;
+
+        removeListener(
+            event: 'ready' | 'player_state_changed' | ErrorTypes,
+            cb?: ErrorListener | PlaybackInstanceListener | PlaybackStateListener,
+        ): void;
 
         pause(): Promise<void>;
         previousTrack(): Promise<void>;
diff --git a/types/spotify-web-playback-sdk/spotify-web-playback-sdk-tests.ts b/types/spotify-web-playback-sdk/spotify-web-playback-sdk-tests.ts
index afb82ef994..8f2c27f33d 100644
--- a/types/spotify-web-playback-sdk/spotify-web-playback-sdk-tests.ts
+++ b/types/spotify-web-playback-sdk/spotify-web-playback-sdk-tests.ts
@@ -5,14 +5,14 @@
 
 const player = new Spotify.Player({
     name: "Carly Rae Jepsen Player",
-    getOAuthToken: (callback) => {
+    getOAuthToken: (callback: (t: string) => void) => {
         // Run code to get a fresh access token
         callback("access token here");
     },
     volume: 0.5
 });
 
-player.connect().then((success) => {
+player.connect().then((success: boolean) => {
     if (success) {
         console.log("The Web Playback SDK successfully connected to Spotify!");
     }
@@ -20,11 +20,11 @@ player.connect().then((success) => {
 
 player.disconnect();
 
-player.on("ready", (data) => {
+player.addListener("ready", (data) => {
     console.log("The Web Playback SDK is ready to play music!");
 });
 
-player.getCurrentState().then((playbackState) => {
+player.getCurrentState().then((playbackState: Spotify.PlaybackState | null) => {
     if (playbackState) {
         const { current_track, next_tracks } = playbackState.track_window;
 
@@ -35,7 +35,7 @@ player.getCurrentState().then((playbackState) => {
     }
 });
 
-player.getVolume().then((volume) => {
+player.getVolume().then((volume: number) => {
     const volume_percentage = (volume * 100);
     console.log(`The volume of the player is ${volume_percentage}%`);
 });
@@ -68,12 +68,12 @@ player.nextTrack().then(() => {
     console.log("Skipped to next track!");
 });
 
-player.on("ready", (data) => {
+player.on("ready", (data: Spotify.WebPlaybackInstance) => {
     const { device_id } = data;
     console.log("Connected with Device ID", device_id);
 });
 
-player.on("player_state_changed", (playbackState) => {
+player.on("player_state_changed", (playbackState: Spotify.PlaybackState) => {
     const { position, duration } = playbackState;
     const { current_track } = playbackState.track_window;
 
@@ -82,18 +82,24 @@ player.on("player_state_changed", (playbackState) => {
     console.log("Duration of Song", duration);
 });
 
-player.on('initialization_error', (e) => {
+player.addListener('initialization_error', (e: Spotify.Error) => {
     console.error("Failed to initialize", e.message);
 });
 
-player.on('authentication_error', (e) => {
+player.addListener('authentication_error', (e: Spotify.Error) => {
     console.error("Failed to authenticate", e.message);
 });
 
-player.on('account_error', (e) => {
+player.addListener('account_error', (e: Spotify.Error) => {
     console.error("Failed to validate Spotify account", e.message);
 });
 
-player.on('playback_error', (e) => {
+const listener = (e: Spotify.Error) => {
     console.error("Failed to perform playback", e.message);
-});
+};
+player.addListener('playback_error', listener);
+player.addListener('playback_error', () => {});
+player.removeListener('playback_error', () => {});
+
+player.removeListener('playback_error');
+player.removeListener('playback_error', listener);

From bd8ace8ec9f4ec63dee0b9af1f2eb1b7a5fd7d0e Mon Sep 17 00:00:00 2001
From: Theron Cross <theroncross@gmail.com>
Date: Mon, 26 Feb 2018 14:46:41 -0600
Subject: [PATCH 303/388] Fix Enumerable#isAny second param type (#23827)

* Fix Enumerable#isAny param type

https://emberjs.com/api/ember/3.0/classes/Ember.NativeArray/methods/isAny?anchor=isAny

* Update Enum#isAny and #isEvery params to any
---
 types/ember/index.d.ts          | 4 ++--
 types/ember/test/array.ts       | 2 +-
 types/ember/test/ember-tests.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index bb268646be..8a47f00476 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1182,7 +1182,7 @@ declare module 'ember' {
              * argument for all items in the enumerable. This method is often simpler/faster
              * than using a callback.
              */
-            isEvery(key: string, value: boolean): boolean;
+            isEvery(key: string, value: any): boolean;
             /**
              * Returns `true` if the passed function returns true for any item in the
              * enumeration.
@@ -1193,7 +1193,7 @@ declare module 'ember' {
              * argument for any item in the enumerable. This method is often simpler/faster
              * than using a callback.
              */
-            isAny(key: string, value?: boolean): boolean;
+            isAny(key: string, value?: any): boolean;
             /**
              * This will combine the values of the enumerator into a single value. It
              * is a useful way to collect a summary value from an enumeration. This
diff --git a/types/ember/test/array.ts b/types/ember/test/array.ts
index 38f0fad5c6..8416a4a9ec 100755
--- a/types/ember/test/array.ts
+++ b/types/ember/test/array.ts
@@ -15,7 +15,7 @@ const people = Ember.A([
 assertType<number>(people.get('length'));
 assertType<Person>(people.get('lastObject'));
 assertType<boolean>(people.isAny('isHappy'));
-assertType<boolean>(people.isAny('isHappy', false));
+assertType<boolean>(people.isAny('isHappy', 'false'));
 assertType<Ember.Enumerable<Person>>(people.filterBy('isHappy'));
 assertType<Ember.Enumerable<Person>>(people.rejectBy('isHappy'));
 assertType<Ember.Enumerable<Person>>(people.filter((person) => person.get('name') === 'Yehuda'));
diff --git a/types/ember/test/ember-tests.ts b/types/ember/test/ember-tests.ts
index 94de3bf259..f0aff2478c 100755
--- a/types/ember/test/ember-tests.ts
+++ b/types/ember/test/ember-tests.ts
@@ -131,7 +131,7 @@ const isHappy = (person: typeof Person3.prototype): boolean => {
 people2.every(isHappy);
 people2.any(isHappy);
 people2.isEvery('isHappy', true);
-people2.isAny('isHappy', true);
+people2.isAny('isHappy', 'true');
 people2.isAny('isHappy');
 
 // Examples taken from http://emberjs.com/api/classes/Em.RSVP.Promise.html

From ce73af4e00eb928d1410bdc06f94e06e37c488f6 Mon Sep 17 00:00:00 2001
From: Steven <YourGamesBeOver@users.noreply.github.com>
Date: Mon, 26 Feb 2018 13:35:23 -0800
Subject: [PATCH 304/388] fixed error in react-navigation preventing declaring
 navigationOptions as a function (#23879)

---
 types/react-navigation/index.d.ts             |  1 +
 .../react-navigation-tests.tsx                | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 531a18e9e5..c4e396783f 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -13,6 +13,7 @@
 //                 Sergei Butko: <https://github.com/svbutko>
 //                 Veit Lehmann: <https://github.com/levito>
 //                 Roberto Huertas: <https://github.com/robertohuertasm>
+//                 Steven Miller <https://github.com/YourGamesBeOver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index a7eaad092b..017a9b9153 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -199,6 +199,26 @@ function renderBasicStackNavigator(): JSX.Element {
     );
 }
 
+const stackNavigatorConfigWithNavigationOptionsAsFunction: StackNavigatorConfig = {
+    mode: "card",
+    headerMode: "screen",
+    navigationOptions: ({navigationOptions, navigation, screenProps}) => (stackNavigatorScreenOptions),
+};
+
+const AdvancedStackNavigator = StackNavigator(
+    routeConfigMap,
+    stackNavigatorConfigWithNavigationOptionsAsFunction
+);
+
+function renderAdvancedStackNavigator(): JSX.Element {
+    return (
+        <AdvancedStackNavigator
+            ref={(ref: any) => { }}
+            style={viewStyle}
+        />
+    );
+}
+
 /**
  * Drawer navigator.
  */

From 3eee1e6123bb1a0b18b68e1d73f7b7dd9b50112b Mon Sep 17 00:00:00 2001
From: Jorge Rocha Gualtieri <jorge@jrg.com.br>
Date: Mon, 26 Feb 2018 18:41:25 -0300
Subject: [PATCH 305/388] added definitions for PrecisionModel, GeometryFactory
 (partial), GeometryFactory, OL3Parser, WKTWriter

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

diff --git a/types/jsts/index.d.ts b/types/jsts/index.d.ts
index 0d7f182e77..c18a70bfde 100644
--- a/types/jsts/index.d.ts
+++ b/types/jsts/index.d.ts
@@ -1,12 +1,88 @@
 // Type definitions for jsts 0.16.0
 // Project: https://github.com/bjornharrtell/jsts
-// Definitions by: Stephane Alie <https://github.com/StephaneAlie>
+// Definitions by: Stephane Alie <https://github.com/StephaneAlie>, Jorge Rocha Gualtieri <https://github.com/jrocha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace jsts {
     export var version: string;
 
     namespace geom {
+
+
+
+        /**
+         * Specifies the precision model of the Coordinates in a Geometry. In other words, specifies the grid of allowable points for all Geometrys.
+         * The makePrecise method allows rounding a coordinate to a "precise" value; that is, one whose precision is known exactly.
+         *
+         * Coordinates are assumed to be precise in geometries. That is, the coordinates are assumed to be rounded to the precision model given for the geometry. JTS input routines automatically round coordinates to the precision model before creating Geometries. All internal operations assume that coordinates are rounded to the precision model. Constructive methods (such as boolean operations) always round computed coordinates to the appropriate precision model.
+         * 
+         * Currently one type of precision model are supported:
+         *
+         * FLOATING - represents full double precision floating point.
+         * Coordinates are represented internally as Java double-precision values. Since Java uses the IEEE-754 floating point standard, this provides 53 bits of precision.
+         * 
+         * JSTS methods currently do not handle inputs with different precision models.
+         *
+         */
+        export class PrecisionModel {
+
+
+            static FIXED: string;
+            static FLOATING: string;
+            static FLOATING_SINGLE: string;
+
+            /**
+             * 
+             * @param modelType
+             */
+            constructor(modelType?: number|string);
+        }
+
+        /**
+         * Supplies a set of utility methods for building Geometry objects from lists
+         * of Coordinates.
+         *
+         * Note that the factory constructor methods do <b>not</b> change the input
+         * coordinates in any way.
+         *
+         * In particular, they are not rounded to the supplied <tt>PrecisionModel</tt>.
+         * It is assumed that input Coordinates meet the given precision.
+         */
+        export class GeometryFactory {
+
+            /**
+             * Constructs a GeometryFactory that generates Geometries having a floating PrecisionModel and a spatial-reference ID of 0.
+             */
+            constructor(precisionModel?: PrecisionModel);
+
+
+            /**
+             * Creates a LineString using the given Coordinates; a null or empty array will
+             * create an empty LineString. Consecutive points must not be equal.
+             *
+             * @param {Coordinate[]}
+             *          coordinates an array without null elements, or an empty array, or
+             *          null.
+             * @return {LineString} A new LineString.
+             */
+            createLineString(coordinates: Array<Coordinate>): LineString;
+            /**
+             * Creates a Point using the given Coordinate; a null Coordinate will create an
+             * empty Geometry.
+             *
+             * @param {Coordinate}
+             *          coordinate Coordinate to base this Point on.
+             * @return {Point} A new Point.
+             */
+            createPoint(coordinates: Coordinate): Point;
+
+        }
+
+        export class GeometryCollection extends jsts.geom.Geometry {
+
+            constructor(geometries?: Array<Geometry>, factory?: GeometryFactory);
+        }
+
         /**
          * A lightweight class used to store coordinates on the 2-dimensional
          * Cartesian plane. It is distinct from {@link Point}, which is a subclass of
@@ -560,7 +636,7 @@ declare namespace jsts {
              * @return {PrecisionModel} the specification of the grid of allowable points, for this
              * <code>Geometry</code> and all other <code>Geometry</code>s.
              */
-            getPrecisionModel(): any;
+            getPrecisionModel(): PrecisionModel;
 
             /**
              * Returns a vertex of this <code>Geometry</code> (usually, but not
@@ -1602,6 +1678,17 @@ declare namespace jsts {
     }
 
     namespace io {
+
+
+        /**
+         * OpenLayers 3 Geometry parser and writer
+         */
+        export class OL3Parser {
+            constructor(geometryFactory?: jsts.geom.GeometryFactory);
+            read(geometry: ol.geom.Geometry): jsts.geom.Geometry;
+            write(geometry: jsts.geom.Geometry): ol.geom.Geometry;
+        }
+
         export class GeoJSONReader {
             constructor();
 
@@ -1659,7 +1746,7 @@ declare namespace jsts {
             /**
              * @constructor
              */
-            constructor(geometryFactory?: any);
+            constructor(geometryFactory?: jsts.geom.GeometryFactory);
 
             /**
              * Reads a Well-Known Text representation of a {@link Geometry}
@@ -1674,6 +1761,16 @@ declare namespace jsts {
 
             reducePrecision(geometry: geom.Geometry): void;
         }
+
+
+
+        export class WKTWriter {
+            /**
+             * @constructor
+             */
+            constructor(geometryFactory?: jsts.geom.GeometryFactory);
+            
+        }
     }
 }
 
diff --git a/types/jsts/jsts-tests.ts b/types/jsts/jsts-tests.ts
index 20c536ce89..0c17341cad 100644
--- a/types/jsts/jsts-tests.ts
+++ b/types/jsts/jsts-tests.ts
@@ -14,6 +14,9 @@ var lr: jsts.geom.LinearRing = new jsts.geom.LinearRing([c]);
 var ls: jsts.geom.LineString = new jsts.geom.LineString([c]);
 var p: jsts.geom.Point = new jsts.geom.Point(c);
 var poly: jsts.geom.Polygon = new jsts.geom.Polygon(lr);
+var precisionModel = new jsts.geom.PrecisionModel();
+var factory = new jsts.geom.GeometryFactory(this.precisionModel);
+var wktWriter = new jsts.io.WKTWriter(this.factory);
 
 str = jsts.version;
 

From c6614dd157bd8364265070150c0b68d41025b1be Mon Sep 17 00:00:00 2001
From: Ben Grynhaus <bengr6@gmail.com>
Date: Mon, 26 Feb 2018 23:45:54 +0200
Subject: [PATCH 306/388] Added types for 'ipcheck' (#23813)

* Added types for 'ipcheck'

* Fixed tests got be according to linting guidelines

* Made tsconfig stricter

* Standard tslint file

* Standartize ipcheck.d.ts

* tslint disable in .d.ts file

* disabled interface-name rule
---
 types/ipcheck/index.d.ts       | 29 +++++++++++++++++++++++++++++
 types/ipcheck/ipcheck-tests.ts | 19 +++++++++++++++++++
 types/ipcheck/tsconfig.json    | 16 ++++++++++++++++
 types/ipcheck/tslint.json      |  6 ++++++
 4 files changed, 70 insertions(+)
 create mode 100644 types/ipcheck/index.d.ts
 create mode 100644 types/ipcheck/ipcheck-tests.ts
 create mode 100644 types/ipcheck/tsconfig.json
 create mode 100644 types/ipcheck/tslint.json

diff --git a/types/ipcheck/index.d.ts b/types/ipcheck/index.d.ts
new file mode 100644
index 0000000000..2eca10280b
--- /dev/null
+++ b/types/ipcheck/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for ipcheck 0.1
+// Project: https://github.com/gosquared/ipcheck
+// Definitions by: Ben Grynhaus <https://github.com/bengry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare const ipcheck: ipcheck.IPCheckStatic;
+export = ipcheck;
+export as namespace ipcheck;
+
+declare namespace ipcheck {
+    interface IPCheck {
+        address: number[];
+        input: string;
+        ipv: 4 | 6 | 0;
+        mask: number;
+        valid: boolean;
+
+        match(cidr: IPCheck | string): boolean;
+    }
+
+    interface IPCheckConstructor {
+        new (input: string): IPCheck;
+    }
+
+    interface IPCheckStatic extends IPCheckConstructor {
+        match(ip: IPCheck | string, cidr: IPCheck | string): boolean;
+    }
+}
diff --git a/types/ipcheck/ipcheck-tests.ts b/types/ipcheck/ipcheck-tests.ts
new file mode 100644
index 0000000000..e54d396652
--- /dev/null
+++ b/types/ipcheck/ipcheck-tests.ts
@@ -0,0 +1,19 @@
+import * as ipcheck from "ipcheck";
+
+ipcheck.match(1, 1); // $ExpectError
+ipcheck.match("", 1); // $ExpectError
+ipcheck.match(1, ""); // $ExpectError
+
+new ipcheck(1); // $ExpectError
+
+const ip = new ipcheck("");
+
+// $ExpectError
+if (ip.ipv === 1) {
+}
+
+// $ExpectError
+if (ip.ipv === 1) {
+}
+
+ip.match(1); // $ExpectError
diff --git a/types/ipcheck/tsconfig.json b/types/ipcheck/tsconfig.json
new file mode 100644
index 0000000000..18470e3333
--- /dev/null
+++ b/types/ipcheck/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "ipcheck-tests.ts"]
+}
diff --git a/types/ipcheck/tslint.json b/types/ipcheck/tslint.json
new file mode 100644
index 0000000000..2c7c1bed53
--- /dev/null
+++ b/types/ipcheck/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "interface-name": false
+    }
+}

From ec693b51de44f80e2debeae3d4591e3dbedb9d7b Mon Sep 17 00:00:00 2001
From: Jorge Rocha Gualtieri <jorge@jrg.com.br>
Date: Mon, 26 Feb 2018 18:41:25 -0300
Subject: [PATCH 307/388] added definitions for PrecisionModel, GeometryFactory
 (partial), GeometryFactory, OL3Parser, WKTWriter

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

diff --git a/types/jsts/index.d.ts b/types/jsts/index.d.ts
index 0d7f182e77..5f1ff3fd94 100644
--- a/types/jsts/index.d.ts
+++ b/types/jsts/index.d.ts
@@ -1,12 +1,88 @@
-// Type definitions for jsts 0.16.0
+// Type definitions for jsts 0.17.0
 // Project: https://github.com/bjornharrtell/jsts
-// Definitions by: Stephane Alie <https://github.com/StephaneAlie>
+// Definitions by: Stephane Alie <https://github.com/StephaneAlie>, Jorge Rocha Gualtieri <https://github.com/jrocha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace jsts {
     export var version: string;
 
     namespace geom {
+
+
+
+        /**
+         * Specifies the precision model of the Coordinates in a Geometry. In other words, specifies the grid of allowable points for all Geometrys.
+         * The makePrecise method allows rounding a coordinate to a "precise" value; that is, one whose precision is known exactly.
+         *
+         * Coordinates are assumed to be precise in geometries. That is, the coordinates are assumed to be rounded to the precision model given for the geometry. JTS input routines automatically round coordinates to the precision model before creating Geometries. All internal operations assume that coordinates are rounded to the precision model. Constructive methods (such as boolean operations) always round computed coordinates to the appropriate precision model.
+         * 
+         * Currently one type of precision model are supported:
+         *
+         * FLOATING - represents full double precision floating point.
+         * Coordinates are represented internally as Java double-precision values. Since Java uses the IEEE-754 floating point standard, this provides 53 bits of precision.
+         * 
+         * JSTS methods currently do not handle inputs with different precision models.
+         *
+         */
+        export class PrecisionModel {
+
+
+            static FIXED: string;
+            static FLOATING: string;
+            static FLOATING_SINGLE: string;
+
+            /**
+             * 
+             * @param modelType
+             */
+            constructor(modelType?: number|string);
+        }
+
+        /**
+         * Supplies a set of utility methods for building Geometry objects from lists
+         * of Coordinates.
+         *
+         * Note that the factory constructor methods do <b>not</b> change the input
+         * coordinates in any way.
+         *
+         * In particular, they are not rounded to the supplied <tt>PrecisionModel</tt>.
+         * It is assumed that input Coordinates meet the given precision.
+         */
+        export class GeometryFactory {
+
+            /**
+             * Constructs a GeometryFactory that generates Geometries having a floating PrecisionModel and a spatial-reference ID of 0.
+             */
+            constructor(precisionModel?: PrecisionModel);
+
+
+            /**
+             * Creates a LineString using the given Coordinates; a null or empty array will
+             * create an empty LineString. Consecutive points must not be equal.
+             *
+             * @param {Coordinate[]}
+             *          coordinates an array without null elements, or an empty array, or
+             *          null.
+             * @return {LineString} A new LineString.
+             */
+            createLineString(coordinates: Array<Coordinate>): LineString;
+            /**
+             * Creates a Point using the given Coordinate; a null Coordinate will create an
+             * empty Geometry.
+             *
+             * @param {Coordinate}
+             *          coordinate Coordinate to base this Point on.
+             * @return {Point} A new Point.
+             */
+            createPoint(coordinates: Coordinate): Point;
+
+        }
+
+        export class GeometryCollection extends jsts.geom.Geometry {
+
+            constructor(geometries?: Array<Geometry>, factory?: GeometryFactory);
+        }
+
         /**
          * A lightweight class used to store coordinates on the 2-dimensional
          * Cartesian plane. It is distinct from {@link Point}, which is a subclass of
@@ -560,7 +636,7 @@ declare namespace jsts {
              * @return {PrecisionModel} the specification of the grid of allowable points, for this
              * <code>Geometry</code> and all other <code>Geometry</code>s.
              */
-            getPrecisionModel(): any;
+            getPrecisionModel(): PrecisionModel;
 
             /**
              * Returns a vertex of this <code>Geometry</code> (usually, but not
@@ -1602,6 +1678,17 @@ declare namespace jsts {
     }
 
     namespace io {
+
+
+        /**
+         * OpenLayers 3 Geometry parser and writer
+         */
+        export class OL3Parser {
+            constructor(geometryFactory?: jsts.geom.GeometryFactory);
+            read(geometry: ol.geom.Geometry): jsts.geom.Geometry;
+            write(geometry: jsts.geom.Geometry): ol.geom.Geometry;
+        }
+
         export class GeoJSONReader {
             constructor();
 
@@ -1659,7 +1746,7 @@ declare namespace jsts {
             /**
              * @constructor
              */
-            constructor(geometryFactory?: any);
+            constructor(geometryFactory?: jsts.geom.GeometryFactory);
 
             /**
              * Reads a Well-Known Text representation of a {@link Geometry}
@@ -1674,6 +1761,16 @@ declare namespace jsts {
 
             reducePrecision(geometry: geom.Geometry): void;
         }
+
+
+
+        export class WKTWriter {
+            /**
+             * @constructor
+             */
+            constructor(geometryFactory?: jsts.geom.GeometryFactory);
+            
+        }
     }
 }
 
diff --git a/types/jsts/jsts-tests.ts b/types/jsts/jsts-tests.ts
index 20c536ce89..0c17341cad 100644
--- a/types/jsts/jsts-tests.ts
+++ b/types/jsts/jsts-tests.ts
@@ -14,6 +14,9 @@ var lr: jsts.geom.LinearRing = new jsts.geom.LinearRing([c]);
 var ls: jsts.geom.LineString = new jsts.geom.LineString([c]);
 var p: jsts.geom.Point = new jsts.geom.Point(c);
 var poly: jsts.geom.Polygon = new jsts.geom.Polygon(lr);
+var precisionModel = new jsts.geom.PrecisionModel();
+var factory = new jsts.geom.GeometryFactory(this.precisionModel);
+var wktWriter = new jsts.io.WKTWriter(this.factory);
 
 str = jsts.version;
 

From a62421c6e1a2c613cb6b616946e1f4d65c95a95c Mon Sep 17 00:00:00 2001
From: s0m3on3 <amedvedev@ciferox.com>
Date: Tue, 27 Feb 2018 00:27:15 +0200
Subject: [PATCH 308/388] [adone] add vault

---
 types/adone/glosses/vault.d.ts    | 204 ++++++++++++++++++++++++++++++
 types/adone/index.d.ts            |   1 +
 types/adone/test/glosses/vault.ts | 203 +++++++++++++++++++++++++++++
 types/adone/tsconfig.json         |   2 +
 4 files changed, 410 insertions(+)
 create mode 100644 types/adone/glosses/vault.d.ts
 create mode 100644 types/adone/test/glosses/vault.ts

diff --git a/types/adone/glosses/vault.d.ts b/types/adone/glosses/vault.d.ts
new file mode 100644
index 0000000000..2fc39c0c3b
--- /dev/null
+++ b/types/adone/glosses/vault.d.ts
@@ -0,0 +1,204 @@
+declare namespace adone {
+    namespace vault {
+        namespace I {
+            interface VaultConstructorOptions {
+                // TODO: leveldb options
+                location: string;
+                ValuableClass?: object;
+            }
+
+            interface VaultClearOptions {
+                hosts?: boolean;
+                tags?: boolean;
+            }
+
+            interface VaultToJSONOptions {
+                valuable?: ValuableToJSONOptions;
+                includeStats?: boolean;
+            }
+
+            interface ValuableToJSONOptions {
+                includeId?: boolean;
+                includeEntryId?: boolean;
+                entriesAsArray?: boolean;
+                tags?: "normal" | "onlyName" | "onlyId" | "none";
+            }
+
+            interface VaultJSONStats {
+                location: string;
+                created: number;
+                updated: number;
+            }
+        }
+
+        class Vault<T extends Valuable = Valuable> {
+            constructor(options: I.VaultConstructorOptions);
+
+            open(): Promise<void>;
+
+            close(): Promise<void>;
+
+            location(): string;
+
+            create(name: string, tags?: string[]): Promise<T>;
+
+            get(name: string): Promise<T>;
+
+            release(name: string): void;
+
+            delete(name: string): Promise<void>;
+
+            clear(options?: I.VaultClearOptions): Promise<number>;
+
+            has(name: string): boolean;
+
+            keys(): string[];
+
+            values(): Promise<any[]>;
+
+            entries(): Promise<{ [key: string]: any }>;
+
+            toJSON(options: I.VaultToJSONOptions & { valuable: object, includeStats: true }): Promise<{
+                valuables: object[],
+                stats: I.VaultJSONStats
+            }>;
+            toJSON(options: I.VaultToJSONOptions & { valuable: object }): Promise<{
+                valuables: object[]
+            }>;
+            toJSON(options: I.VaultToJSONOptions & { includeStats: true }): Promise<{
+                stats: I.VaultJSONStats
+            }>;
+            toJSON(): {};
+
+            addTag(tag: string, vid?: number): Promise<number| null>;
+
+            deleteTag(tag: string): Promise<boolean>;
+
+            tags(ids?: number[], opts?: { privateProps?: boolean }): object[];
+
+            tagNames(ids?: number[]): string[];
+
+            getNotes(): string;
+
+            setNotes(notes: string): Promise<void>;
+        }
+
+        namespace I {
+            interface ValueableEntriesOptions {
+                entriesAsArray?: boolean;
+                includeEntryId?: boolean;
+            }
+
+            interface ValuableEntry {
+                name: string;
+                value: any;
+                type: string;
+            }
+
+            interface ValuableClearOptions {
+                includeNotes?: boolean;
+                includeTags?: boolean;
+            }
+
+            interface ValuableJSON {
+                name: string;
+                notes: string;
+                entries: I.ValuableEntry[];
+            }
+        }
+
+        class Valuable {
+            constructor(vaule: Vault, id: number, metaData: object, tags: object[]);
+
+            name(): string;
+
+            internalId(): number;
+
+            getNotes(): string;
+
+            setNotes(notes: string): Promise<void>;
+
+            set(name: string, value: any, type?: string): Promise<number>;
+
+            setMulti(entries: object): Promise<void>;
+
+            get(name: string): Promise<any>;
+
+            type(name: string): any;
+
+            has(name: string): boolean;
+
+            keys(): string[];
+
+            entries(opts: I.ValueableEntriesOptions & { entriesAsArray: true }): Promise<I.ValuableEntry[]>;
+            entries(opts: I.ValueableEntriesOptions & { entriesAsArray: true, includeEntryId: true }): Promise<Array<I.ValuableEntry & { id: number }>>;
+            entries(opts?: I.ValueableEntriesOptions): Promise<object>;
+
+            delete(name: string): Promise<number>;
+
+            clear(opts?: I.ValuableClearOptions): Promise<number>;
+
+            toJSON(opts?: I.ValuableToJSONOptions): object; // TODO
+
+            fromJSON(json: object): Promise<number>;
+
+            addTag(tag: string): Promise<void>;
+
+            hasTag(tag: string): boolean;
+
+            deleteTag(tag: string): Promise<boolean>;
+
+            deleteAllTags(): Promise<void>;
+
+            tags(): object[];
+        }
+
+        function open(options?: I.VaultConstructorOptions): Promise<Vault>;
+
+        namespace I {
+            interface SlicedValuable {
+                name(): string;
+
+                internalId(): number;
+
+                getNotes(): string;
+
+                setNotes(notes: string): Promise<number>;
+
+                set(name: string, value: any, type?: string): Promise<number>;
+
+                setMulti(entries: object): Promise<void>;
+
+                get(name: string): Promise<any>;
+
+                type(name: string): any;
+
+                has(name: string): boolean;
+
+                keys(): string[];
+
+                entries(opts: I.ValueableEntriesOptions & { entriesAsArray: true }): Promise<I.ValuableEntry[]>;
+                entries(opts: I.ValueableEntriesOptions & { entriesAsArray: true, includeEntryId: true }): Promise<Array<I.ValuableEntry & { id: number }>>;
+                entries(opts?: I.ValueableEntriesOptions): Promise<object>;
+
+                delete(name: string): Promise<number>;
+
+                toJSON(opts?: I.ValuableToJSONOptions): object;
+
+                fromJSON(json: object): Promise<number>;
+
+                addTag(tag: string): Promise<void>;
+
+                hasTag(tag: string): boolean;
+
+                deleteTag(tag: string): Promise<boolean>;
+
+                deleteAllTags(): Promise<void>;
+
+                tags(): object[];
+            }
+        }
+
+        function slice(valuable: Valuable, prefix: string | string[], separator?: string): I.SlicedValuable;
+    }
+}
diff --git a/types/adone/index.d.ts b/types/adone/index.d.ts
index e0ddfec26b..a74641c4df 100644
--- a/types/adone/index.d.ts
+++ b/types/adone/index.d.ts
@@ -34,6 +34,7 @@
 /// <reference path="./glosses/templating/index.d.ts" />
 /// <reference path="./glosses/text/index.d.ts" />
 /// <reference path="./glosses/utils.d.ts" />
+/// <reference path="./glosses/vault.d.ts" />
 
 declare const _adone: typeof adone;
 
diff --git a/types/adone/test/glosses/vault.ts b/types/adone/test/glosses/vault.ts
new file mode 100644
index 0000000000..1423a46715
--- /dev/null
+++ b/types/adone/test/glosses/vault.ts
@@ -0,0 +1,203 @@
+namespace adoneTests.vault {
+    const {
+        is,
+        vault
+    } = adone;
+
+    let num: number;
+    let bool: boolean;
+    let obj: object;
+    let str: string;
+
+    namespace Vault {
+        const {
+            Vault
+        } = vault;
+
+        new Vault({
+            location: "a"
+        });
+        new Vault({
+            location: "a",
+            ValuableClass: vault.Valuable
+        });
+
+        const v = new Vault({
+            location: "a"
+        });
+
+        v.addTag("hello").then((x) => {
+            if (!is.null(x)) {
+                num = x;
+            }
+        });
+        v.clear().then((x) => {
+            num = x;
+        });
+        v.close().then();
+        v.create("hello").then((x) => {
+            x.set("a", "b");
+        });
+        v.create("hello", ["a", "b"]).then((x) => {
+            x.set("a", "b");
+        });
+        v.delete("a").then();
+        v.deleteTag("a").then((x) => {
+            bool = x;
+        });
+        v.entries().then((x) => {
+            obj = x;
+        });
+        v.get("a").then((x) => {
+            x.set("a", "b");
+        });
+        str = v.getNotes();
+        bool = v.has("a");
+        str = v.keys()[0];
+        str = v.location();
+        v.open().then(() => {});
+        v.release("name");
+        v.setNotes("asd").then();
+        str = v.tagNames()[0];
+        str = v.tagNames([1])[0];
+        obj = v.tags()[0];
+        obj = v.toJSON();
+        v.toJSON({ valuable: { includeId: true } }).then((x) => {
+            obj = x.valuables[0];
+        });
+        v.toJSON({ includeStats: true }).then((x) => {
+            num = x.stats.created;
+            num = x.stats.updated;
+            str = x.stats.location;
+        });
+        v.values().then((x) => {
+            x[0];
+        });
+    }
+
+    namespace Valuable {
+        new vault.Vault({ location: "a" }).get("a").then((v) => {
+            v.addTag("a").then();
+            v.clear().then((x) => {
+                num = x;
+            });
+            v.clear({ includeNotes: true }).then((x) => {
+                num = x;
+            });
+            v.clear({ includeTags: true }).then((x) => {
+                num = x;
+            });
+            v.delete("a").then((x) => {
+                num = x;
+            });
+            v.deleteAllTags();
+            v.entries().then((x) => {
+                obj = x;
+            });
+            v.entries({ entriesAsArray: true }).then((x) => {
+                obj = x;
+            });
+            v.entries({ includeEntryId: true }).then((x) => {
+                obj = x;
+            });
+            v.fromJSON({}).then((x) => {
+                num = x;
+            });
+            v.get("a").then();
+            str = v.getNotes();
+            bool = v.has("a");
+            bool = v.hasTag("a");
+            num = v.internalId();
+            str = v.keys()[0];
+            str = v.name();
+            v.set("a", "b").then((x) => {
+                num = x;
+            });
+            v.set("a", "b", "wtf").then((x) => {
+                num = x;
+            });
+            v.setMulti({ a: "1", b: "2" }).then();
+            v.setNotes("a").then();
+            obj = v.tags();
+            obj = v.toJSON();
+            obj = v.toJSON({ entriesAsArray: true });
+            obj = v.toJSON({ includeEntryId: true });
+            obj = v.toJSON({ includeId: false });
+            obj = v.toJSON({ tags: "normal" });
+            obj = v.toJSON({ tags: "none" });
+            obj = v.toJSON({ tags: "onlyId" });
+            obj = v.toJSON({ tags: "onlyName" });
+            v.type("a");
+        });
+    }
+
+    namespace slice {
+        new vault.Vault({ location: "a" }).get("a").then((valuable) => {
+            vault.slice(valuable, "s");
+            vault.slice(valuable, ["s"]);
+            vault.slice(valuable, ["s"], "a");
+            vault.slice(valuable, ["s"], "a");
+            const v = vault.slice(valuable, "s");
+            v.addTag("a").then();
+            v.delete("a").then((x) => {
+                num = x;
+            });
+            v.deleteAllTags().then();
+            v.deleteTag("a").then((x) => {
+                bool = x;
+            });
+            v.entries().then((x) => {
+                obj = x;
+            });
+            v.entries({}).then((x) => {
+                obj = x;
+            });
+            v.entries({ entriesAsArray: true }).then((x) => {
+                obj = x;
+            });
+            v.entries({ includeEntryId: true }).then((x) => {
+                obj = x;
+            });
+            v.fromJSON({}).then((x) => {
+                num = x;
+            });
+            v.get("a").then();
+            str = v.getNotes();
+            bool = v.has("a");
+            bool = v.hasTag("a");
+            num = v.internalId();
+            str = v.keys()[0];
+            str = v.name();
+            v.set("a", "b").then((x) => {
+                num = x;
+            });
+            v.set("a", "b", "wtf").then((x) => {
+                num = x;
+            });
+            v.setMulti({}).then();
+            v.setNotes("a").then((x) => {
+                num = x;
+            });
+            obj = v.tags()[0];
+            obj = v.toJSON();
+            obj = v.toJSON({});
+            obj = v.toJSON({ entriesAsArray: true });
+            obj = v.toJSON({ includeEntryId: true });
+            obj = v.toJSON({ includeId: true });
+            obj = v.toJSON({ tags: "none" });
+            obj = v.toJSON({ tags: "normal" });
+            obj = v.toJSON({ tags: "onlyId" });
+            obj = v.toJSON({ tags: "onlyName" });
+            v.type("a");
+        });
+    }
+
+    namespace open {
+        vault.open({ location: "a" }).then((x) => {
+            x.get("a").then((x) => x.setMulti({}));
+        });
+        vault.open({ location: "a", ValuableClass: vault.Valuable }).then((x) => {
+            x.get("a").then((x) => x.setMulti({}));
+        });
+    }
+}
diff --git a/types/adone/tsconfig.json b/types/adone/tsconfig.json
index 729fb82734..6e6b3fe1c3 100644
--- a/types/adone/tsconfig.json
+++ b/types/adone/tsconfig.json
@@ -87,6 +87,7 @@
         "glosses/text/table.d.ts",
         "glosses/text/unicode.d.ts",
         "glosses/utils.d.ts",
+        "glosses/vault.d.ts",
         "index.d.ts",
         "test/glosses/application.ts",
         "test/glosses/archives.ts",
@@ -148,6 +149,7 @@
         "test/glosses/text/table.ts",
         "test/glosses/text/unicode.ts",
         "test/glosses/utils.ts",
+        "test/glosses/vault.ts",
         "test/index-import.ts",
         "test/index.ts"
     ]

From a506bd087942b7d87ed0cf6e2d51c313e6bfd30f Mon Sep 17 00:00:00 2001
From: Jorge Rocha Gualtieri <jorge@jrg.com.br>
Date: Mon, 26 Feb 2018 20:18:16 -0300
Subject: [PATCH 309/388] Removed OpenLayers dependency

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

diff --git a/types/jsts/index.d.ts b/types/jsts/index.d.ts
index 5f1ff3fd94..070a6a33f1 100644
--- a/types/jsts/index.d.ts
+++ b/types/jsts/index.d.ts
@@ -1685,8 +1685,8 @@ declare namespace jsts {
          */
         export class OL3Parser {
             constructor(geometryFactory?: jsts.geom.GeometryFactory);
-            read(geometry: ol.geom.Geometry): jsts.geom.Geometry;
-            write(geometry: jsts.geom.Geometry): ol.geom.Geometry;
+            read(geometry: any /* ol.geom.Geometry */): jsts.geom.Geometry;
+            write(geometry: jsts.geom.Geometry): any /* ol.geom.Geometry */;
         }
 
         export class GeoJSONReader {

From 7738ba037669f3bbf14b46bfc020600a65721398 Mon Sep 17 00:00:00 2001
From: Jorge Rocha Gualtieri <jorge@jrg.com.br>
Date: Mon, 26 Feb 2018 21:36:26 -0300
Subject: [PATCH 310/388] Fixed reference to openlayers Fixed tests

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

diff --git a/types/jsts/index.d.ts b/types/jsts/index.d.ts
index 070a6a33f1..07e3e0f12f 100644
--- a/types/jsts/index.d.ts
+++ b/types/jsts/index.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Stephane Alie <https://github.com/StephaneAlie>, Jorge Rocha Gualtieri <https://github.com/jrocha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="openlayers" />
+
 declare namespace jsts {
     export var version: string;
 
diff --git a/types/jsts/jsts-tests.ts b/types/jsts/jsts-tests.ts
index 0c17341cad..4d4c1353b4 100644
--- a/types/jsts/jsts-tests.ts
+++ b/types/jsts/jsts-tests.ts
@@ -15,8 +15,8 @@ var ls: jsts.geom.LineString = new jsts.geom.LineString([c]);
 var p: jsts.geom.Point = new jsts.geom.Point(c);
 var poly: jsts.geom.Polygon = new jsts.geom.Polygon(lr);
 var precisionModel = new jsts.geom.PrecisionModel();
-var factory = new jsts.geom.GeometryFactory(this.precisionModel);
-var wktWriter = new jsts.io.WKTWriter(this.factory);
+var factory = new jsts.geom.GeometryFactory(precisionModel);
+var wktWriter = new jsts.io.WKTWriter(factory);
 
 str = jsts.version;
 
diff --git a/types/jsts/tsconfig.json b/types/jsts/tsconfig.json
index ac8ce72682..e866fea4b6 100644
--- a/types/jsts/tsconfig.json
+++ b/types/jsts/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,

From e9cfa5ee4b6b321e70fd50bc737a58f11fceea93 Mon Sep 17 00:00:00 2001
From: steven-joyce <wedgeline@gmail.com>
Date: Tue, 27 Feb 2018 13:50:11 +1300
Subject: [PATCH 311/388] GPT v105 - added getSlots API on Service

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

diff --git a/types/doubleclick-gpt/doubleclick-gpt-tests.ts b/types/doubleclick-gpt/doubleclick-gpt-tests.ts
index 4bf01bf6e8..5eadd36861 100644
--- a/types/doubleclick-gpt/doubleclick-gpt-tests.ts
+++ b/types/doubleclick-gpt/doubleclick-gpt-tests.ts
@@ -224,6 +224,8 @@ googletag.defineSlot("/1234567/news", [160, 600], "div-2").
 
 googletag.display();
 
+googletag.pubads().getSlots();
+
 googletag.pubads().setTagForChildDirectedTreatment(1);
 
 // Example with a single value for a key.
diff --git a/types/doubleclick-gpt/index.d.ts b/types/doubleclick-gpt/index.d.ts
index 8f6a47ae12..28dd65d108 100644
--- a/types/doubleclick-gpt/index.d.ts
+++ b/types/doubleclick-gpt/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for Google Publisher Tag v104
+// Type definitions for Google Publisher Tag v105
 // Project: https://developers.google.com/doubleclick-gpt/reference
 // Definitions by: John Wright <https://github.com/johngeorgewright>
+//                 Steven Joyce <https://github.com/steven-joyce>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace googletag {
@@ -27,6 +28,7 @@ declare namespace googletag {
           eventType: string,
             listener: (event: events.ImpressionViewableEvent | events.SlotOnloadEvent | events.SlotRenderEndedEvent | events.slotVisibilityChangedEvent) => void
         ): void;
+        getSlots(): Slot[];
     }
 
     export interface CompanionAdsService extends Service {

From 9574aaf2d2e6a5102f3c3d570f389e06e1d3e448 Mon Sep 17 00:00:00 2001
From: steven-joyce <wedgeline@gmail.com>
Date: Tue, 27 Feb 2018 13:54:29 +1300
Subject: [PATCH 312/388] GPT v111 - Added sourceAgnosticCreativeId and
 sourceAgnosticLineItemId to SlotRenderEndedEvent

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

diff --git a/types/doubleclick-gpt/index.d.ts b/types/doubleclick-gpt/index.d.ts
index 28dd65d108..46092a2165 100644
--- a/types/doubleclick-gpt/index.d.ts
+++ b/types/doubleclick-gpt/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Publisher Tag v105
+// Type definitions for Google Publisher Tag v111
 // Project: https://developers.google.com/doubleclick-gpt/reference
 // Definitions by: John Wright <https://github.com/johngeorgewright>
 //                 Steven Joyce <https://github.com/steven-joyce>
@@ -162,6 +162,8 @@ declare namespace googletag {
             serviceName: string;
             size: number[] | string;
             slot: Slot;
+            sourceAgnosticCreativeId?: number;
+            sourceAgnosticLineItemId?: number;
         }
 
         export interface slotVisibilityChangedEvent {

From 62c721de256ceea7e43ae82d8fd8c80c2b8a3cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kevin=20Tji=C3=A5m?= <kevin@kevincharm.com>
Date: Tue, 27 Feb 2018 10:14:16 +0800
Subject: [PATCH 313/388] [@types/amphtml-validator] New type definitions
 (#23923)

* feat(amphtml-validator): add type definitions for amphtml-validator

* feat(amphtml-validator): PR reviews - fix lint rules, consolidate files, remove comments, improve tests
---
 .../amphtml-validator-tests.ts                |  28 ++++
 types/amphtml-validator/index.d.ts            | 156 ++++++++++++++++++
 types/amphtml-validator/tsconfig.json         |  16 ++
 types/amphtml-validator/tslint.json           |   1 +
 4 files changed, 201 insertions(+)
 create mode 100644 types/amphtml-validator/amphtml-validator-tests.ts
 create mode 100644 types/amphtml-validator/index.d.ts
 create mode 100644 types/amphtml-validator/tsconfig.json
 create mode 100644 types/amphtml-validator/tslint.json

diff --git a/types/amphtml-validator/amphtml-validator-tests.ts b/types/amphtml-validator/amphtml-validator-tests.ts
new file mode 100644
index 0000000000..4160f7a451
--- /dev/null
+++ b/types/amphtml-validator/amphtml-validator-tests.ts
@@ -0,0 +1,28 @@
+import * as ampHtmlValidator from "amphtml-validator";
+
+(async () => {
+    const validator = await ampHtmlValidator.getInstance();
+    const result = validator.validateString("<html></html>");
+    const { status, errors } = result;
+    if (status === "FAIL" || status === "UNKNOWN") {
+        const errs = errors.map(err => {
+            const {
+                severity,
+                line,
+                col,
+                message,
+                specUrl,
+                category,
+                code,
+                params
+            } = err;
+            return err;
+        });
+    }
+})();
+
+(() => {
+    const validator = ampHtmlValidator.newInstance("");
+    const result = validator.validateString("<html></html>");
+    const { status, errors } = result;
+})();
diff --git a/types/amphtml-validator/index.d.ts b/types/amphtml-validator/index.d.ts
new file mode 100644
index 0000000000..bcf8e5d66e
--- /dev/null
+++ b/types/amphtml-validator/index.d.ts
@@ -0,0 +1,156 @@
+// Type definitions for amphtml-validator 1.0
+// Project: https://github.com/ampproject/amphtml/tree/master/validator/nodejs
+// Definitions by: Kevin Tjiam <https://github.com/kevincharm>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { Context, Script } from "vm";
+
+export interface ValidationError {
+    severity: ValidationErrorSeverity;
+    line: number;
+    col: number;
+    message: string;
+    specUrl: string | null;
+    category: ErrorCategoryCode;
+    code: ValidationErrorCode;
+    params: string[];
+}
+
+export interface ValidationResult {
+    status: ValidationResultStatus;
+    errors: ValidationError[];
+}
+
+export class Validator extends Script {
+    sandbox: Context;
+    validateString(stringToValidate: string): ValidationResult;
+}
+
+export function getInstance(
+    validatorJs?: string,
+    userAgent?: string
+): Promise<Validator>;
+export function newInstance(validatorJsContents: string): Validator;
+
+/**
+ * Enums from protobufs
+ * https://github.com/ampproject/amphtml/blob/master/validator/validator.proto
+ */
+export type ValidationResultStatus = "UNKNOWN" | "PASS" | "FAIL";
+
+export type ValidationErrorSeverity = "UNKNOWN_SEVERITY" | "ERROR" | "WARNING";
+
+export type ErrorCategoryCode =
+    | "UNKNOWN"
+    | "GENERIC"
+    | "DISALLOWED_HTML_WITH_AMP_EQUIVALENT"
+    | "DISALLOWED_HTML"
+    | "AUTHOR_STYLESHEET_PROBLEM"
+    | "MANDATORY_AMP_TAG_MISSING_OR_INCORRECT"
+    | "AMP_TAG_PROBLEM"
+    | "CUSTOM_JAVASCRIPT_DISALLOWED"
+    | "AMP_LAYOUT_PROBLEM"
+    | "AMP_HTML_TEMPLATE_PROBLEM"
+    | "DEPRECATION";
+
+export type ValidationErrorCode =
+    | "UNKNOWN_CODE"
+    | "MANDATORY_TAG_MISSING"
+    | "TAG_REQUIRED_BY_MISSING"
+    | "WARNING_TAG_REQUIRED_BY_MISSING"
+    | "WARNING_EXTENSION_UNUSED"
+    | "EXTENSION_UNUSED"
+    | "WARNING_EXTENSION_DEPRECATED_VERSION"
+    | "ATTR_REQUIRED_BUT_MISSING"
+    | "DISALLOWED_TAG"
+    | "GENERAL_DISALLOWED_TAG"
+    | "DISALLOWED_SCRIPT_TAG"
+    | "DISALLOWED_ATTR"
+    | "DISALLOWED_STYLE_ATTR"
+    | "INVALID_ATTR_VALUE"
+    | "DUPLICATE_ATTRIBUTE"
+    | "ATTR_VALUE_REQUIRED_BY_LAYOUT"
+    | "IMPLIED_LAYOUT_INVALID"
+    | "SPECIFIED_LAYOUT_INVALID"
+    | "MANDATORY_ATTR_MISSING"
+    | "MANDATORY_ONEOF_ATTR_MISSING"
+    | "DUPLICATE_DIMENSION"
+    | "DUPLICATE_UNIQUE_TAG"
+    | "DUPLICATE_UNIQUE_TAG_WARNING"
+    | "WRONG_PARENT_TAG"
+    | "STYLESHEET_TOO_LONG"
+    | "MANDATORY_CDATA_MISSING_OR_INCORRECT"
+    | "CDATA_VIOLATES_BLACKLIST"
+    | "NON_WHITESPACE_CDATA_ENCOUNTERED"
+    | "DEPRECATED_ATTR"
+    | "DEPRECATED_TAG"
+    | "MANDATORY_PROPERTY_MISSING_FROM_ATTR_VALUE"
+    | "INVALID_PROPERTY_VALUE_IN_ATTR_VALUE"
+    | "MISSING_URL"
+    | "INVALID_URL"
+    | "INVALID_URL_PROTOCOL"
+    | "DISALLOWED_DOMAIN"
+    | "DISALLOWED_RELATIVE_URL"
+    | "DISALLOWED_PROPERTY_IN_ATTR_VALUE"
+    | "MUTUALLY_EXCLUSIVE_ATTRS"
+    | "UNESCAPED_TEMPLATE_IN_ATTR_VALUE"
+    | "TEMPLATE_PARTIAL_IN_ATTR_VALUE"
+    | "TEMPLATE_IN_ATTR_NAME"
+    | "INCONSISTENT_UNITS_FOR_WIDTH_AND_HEIGHT"
+    | "DISALLOWED_TAG_ANCESTOR"
+    | "MANDATORY_LAST_CHILD_TAG"
+    | "MANDATORY_TAG_ANCESTOR"
+    | "MANDATORY_TAG_ANCESTOR_WITH_HINT"
+    | "ATTR_DISALLOWED_BY_IMPLIED_LAYOUT"
+    | "ATTR_DISALLOWED_BY_SPECIFIED_LAYOUT"
+    | "INCORRECT_NUM_CHILD_TAGS"
+    | "INCORRECT_MIN_NUM_CHILD_TAGS"
+    | "DISALLOWED_CHILD_TAG_NAME"
+    | "DISALLOWED_FIRST_CHILD_TAG_NAME"
+    | "DISALLOWED_MANUFACTURED_BODY"
+    | "CHILD_TAG_DOES_NOT_SATISFY_REFERENCE_POINT"
+    | "MANDATORY_REFERENCE_POINT_MISSING"
+    | "DUPLICATE_REFERENCE_POINT"
+    | "TAG_NOT_ALLOWED_TO_HAVE_SIBLINGS"
+    | "TAG_REFERENCE_POINT_CONFLICT"
+    | "CHILD_TAG_DOES_NOT_SATISFY_REFERENCE_POINT_SINGULAR"
+    | "BASE_TAG_MUST_PRECEED_ALL_URLS"
+    | "MISSING_REQUIRED_EXTENSION"
+    | "ATTR_MISSING_REQUIRED_EXTENSION"
+    | "DOCUMENT_TOO_COMPLEX"
+    | "INVALID_UTF8"
+    | "CSS_SYNTAX"
+    | "CSS_SYNTAX_INVALID_AT_RULE"
+    | "CSS_SYNTAX_STRAY_TRAILING_BACKSLASH"
+    | "CSS_SYNTAX_UNTERMINATED_COMMENT"
+    | "CSS_SYNTAX_UNTERMINATED_STRING"
+    | "CSS_SYNTAX_BAD_URL"
+    | "CSS_SYNTAX_EOF_IN_PRELUDE_OF_QUALIFIED_RULE"
+    | "CSS_SYNTAX_INVALID_DECLARATION"
+    | "CSS_SYNTAX_INCOMPLETE_DECLARATION"
+    | "CSS_SYNTAX_ERROR_IN_PSEUDO_SELECTOR"
+    | "CSS_SYNTAX_MISSING_SELECTOR"
+    | "CSS_SYNTAX_NOT_A_SELECTOR_START"
+    | "CSS_SYNTAX_UNPARSED_INPUT_REMAINS_IN_SELECTOR"
+    | "CSS_SYNTAX_MISSING_URL"
+    | "CSS_SYNTAX_INVALID_URL"
+    | "CSS_SYNTAX_INVALID_URL_PROTOCOL"
+    | "CSS_SYNTAX_DISALLOWED_DOMAIN"
+    | "CSS_SYNTAX_DISALLOWED_RELATIVE_URL"
+    | "CSS_SYNTAX_INVALID_ATTR_SELECTOR"
+    | "CSS_SYNTAX_INVALID_PROPERTY"
+    | "CSS_SYNTAX_INVALID_PROPERTY_NOLIST"
+    | "CSS_SYNTAX_QUALIFIED_RULE_HAS_NO_DECLARATIONS"
+    | "CSS_SYNTAX_DISALLOWED_QUALIFIED_RULE_MUST_BE_INSIDE_KEYFRAME"
+    | "CSS_SYNTAX_DISALLOWED_KEYFRAME_INSIDE_KEYFRAME"
+    | "CSS_SYNTAX_MALFORMED_MEDIA_QUERY"
+    | "CSS_SYNTAX_DISALLOWED_MEDIA_TYPE"
+    | "CSS_SYNTAX_DISALLOWED_MEDIA_FEATURE"
+    | "CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE"
+    | "CSS_SYNTAX_DISALLOWED_PROPERTY_VALUE_WITH_HINT"
+    | "CSS_SYNTAX_PROPERTY_DISALLOWED_WITHIN_AT_RULE"
+    | "CSS_SYNTAX_PROPERTY_DISALLOWED_TOGETHER_WITH"
+    | "CSS_SYNTAX_PROPERTY_REQUIRES_QUALIFICATION";
diff --git a/types/amphtml-validator/tsconfig.json b/types/amphtml-validator/tsconfig.json
new file mode 100644
index 0000000000..0c0c91b549
--- /dev/null
+++ b/types/amphtml-validator/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "amphtml-validator-tests.ts"]
+}
diff --git a/types/amphtml-validator/tslint.json b/types/amphtml-validator/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/amphtml-validator/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a2510a9e90109329524564b20fbc08e0997a001c Mon Sep 17 00:00:00 2001
From: Christopher Woodland <christopher.woodland@pearson.com>
Date: Mon, 26 Feb 2018 21:40:45 -0500
Subject: [PATCH 314/388] Move firsby definition for 0.8.5 to its own version
 folder. Add typings for v2.0 of frisby.js

---
 types/frisby/frisby-tests.ts    |  44 ++--
 types/frisby/index.d.ts         | 437 +++++++++++++++++++++++++++-----
 types/frisby/tsconfig.json      |  17 +-
 types/frisby/tslint.json        |  78 +-----
 types/frisby/v0/frisby-tests.ts |  26 ++
 types/frisby/v0/index.d.ts      |  75 ++++++
 types/frisby/v0/tsconfig.json   |  29 +++
 types/frisby/v0/tslint.json     |  79 ++++++
 8 files changed, 609 insertions(+), 176 deletions(-)
 create mode 100644 types/frisby/v0/frisby-tests.ts
 create mode 100644 types/frisby/v0/index.d.ts
 create mode 100644 types/frisby/v0/tsconfig.json
 create mode 100644 types/frisby/v0/tslint.json

diff --git a/types/frisby/frisby-tests.ts b/types/frisby/frisby-tests.ts
index d5ac312b83..d0bb27ff20 100644
--- a/types/frisby/frisby-tests.ts
+++ b/types/frisby/frisby-tests.ts
@@ -1,27 +1,21 @@
-//Example from https://www.npmjs.com/package/frisby
+import * as frisby from 'frisby';
 
-import frisby = require('frisby');
- 
-var URL = 'http://localhost:3000/';
-var URL_AUTH = 'http://username:password@localhost:3000/';
- 
-frisby.globalSetup({ // globalSetup is for ALL requests 
-  request: {
-    headers: { 'X-Auth-Token': 'fa8426a0-8eaf-4d22-8e13-7c1b16a9370c' }
-  }
+frisby.globalSetup({
+    request: {
+        headers: { 'X-Auth-Token': 'fa8426a0-8eaf-4d22-8e13-7c1b16a9370c' }
+    }
+});
+
+describe('Test Suite 1', () => {
+    it('should be a teapot get', (done) => {
+        frisby.get(URL + '/users/3.json')
+            .expect('status', 418)
+            .done(done);
+    });
+
+    it('should be a teapot post', (done) => {
+        frisby.post(URL + '/users/3.json')
+            .expect('status', 418)
+            .done(done);
+    });
 });
- 
-frisby.create('GET user johndoe')
-  .get(URL + '/users/3.json')
-  .expectStatus(200)
-  .expectJSONTypes({
-    id: Number,
-    username: String,
-    is_admin: Boolean
-  })
-  .expectJSON({
-    id: 3,
-    username: 'johndoe',
-    is_admin: false
-  })
-.toss();
\ No newline at end of file
diff --git a/types/frisby/index.d.ts b/types/frisby/index.d.ts
index 523c72e6db..b3a84c28a0 100644
--- a/types/frisby/index.d.ts
+++ b/types/frisby/index.d.ts
@@ -1,75 +1,386 @@
-// Type definitions for Frisby v0.8.5
+// Type definitions for Frisby 2.0
 // Project: https://github.com/vlucas/frisby
-// Definitions by: Johnny Li <https://github.com/johnny4753>
+// Definitions by: Christopher E. Woodland <https://github.com/cwoodland>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
-///<reference types="jasmine"/>
+/// <reference types='jasmine'/>
 
-declare interface Frisby {
-    globalSetup(opts: any): any;
-    timeout(seconds?: number): Frisby;
-    reset(): Frisby;
-    not(): Frisby;
-    addHeader(key: string, content: string): Frisby;
-    addHeaders(headers: object): Frisby;
-    removeHeader(key: string): Frisby;
-    responseType(type: any): Frisby;
-    // HTTP Basic Auth
-    auth(username: string, password: string, digest: boolean): Frisby;
-    // HTTP Request
-    get(uri: string, params?: any): Frisby;
-    patch(uri: string, data?: any, params?: any): Frisby;
-    post(uri: string, data?: any, params?: any): Frisby;
-    put(uri: string, data?: any, params?: any): Frisby;
-    delete(uri: string, data?: any, params?: any): Frisby;
-    head(uri: string, params?: any): Frisby;
-    options(uri: string, params?: any): Frisby;
+// #region Imports
+import { Response } from 'node-fetch'; // Import all definitions from node-fetch.
+//#endregion
 
-    expectMaxResponseTime(milliseconds: number): Frisby;
-    expectStatus(statusCode: number): Frisby;
-    expectHeader(header: string, content: string): Frisby;
-    expectHeaderContains(header: string, content: string): Frisby;
-    expectHeaderToMatch(header: string, pattern: RegExp): Frisby;
-    expectBodyContains(content: string): Frisby;
-    expectJSONTypes(json: any): Frisby;
-    expectJSONTypes(path: string, json: any): Frisby;
-    expectJSON(json: any): Frisby;
-    expectJSON(path: string, json: any): Frisby;
-    expectJSONSchema(path: string, jsonSchema: any): Frisby;
-    expectJSONLength(length: number): Frisby;
-    expectJSONLength(path: string, length: number): Frisby;
-    inspectRequest(): Frisby;
-    inspectResponse(): Frisby;
-    inspectHeaders(): Frisby;
-    inspectBody(): Frisby;
-    inspectJSON(): Frisby;
-    inspectStatus(): Frisby;
-    retry(count: number, delayInMilliseconds?: number): Frisby;
-    waits(delayInMilliseconds: number): Frisby;
-    after(callback: (...args: any[]) => void): Frisby;
-    afterJSON(callback: (...args: any[]) => void): Frisby;
-    exceptionHandler(fn: (...args: any[]) => void): Frisby;
-    toss(): void;
+// #region Joi Methods
+// Reference file: https://github.com/hapijs/joi
+export namespace Joi {
+    const isImmutable: boolean;
 
-    create(msg: string): Frisby;
+    const isJoi: boolean;
 
-}
+    const schemaType: string;
 
-declare global {
-    namespace jasmine {
-        interface Matchers<T> {
-            toMatchOrBeNull(expected: any): boolean;
-            toMatchOrBeEmpty(expected: any): boolean;
-            toBeType(expected: any): boolean;
-            toBeTypeOrNull(expected: any): boolean;
-            toBeTypeOrUndefined(expected: any): boolean;
-            toContainJson(expected: any, isNot?: boolean): boolean;
-            toContainJsonTypes(expected: any, isNot?: boolean): boolean;
-        }
+    const version: string;
+
+    function allow(...args: any[]): void;
+
+    function alt(args: any): any;
+
+    function alternatives(args: any): any;
+
+    function any(args: any): any;
+
+    function applyFunctionToChildren(...args: any[]): void;
+
+    function array(args: any): any;
+
+    function assert(value: any, schema: any, message: string): void;
+
+    function attempt(value: any, schema: any, message: string): any;
+
+    function binary(args: any): any;
+
+    function bool(args: any): any;
+
+    function checkOptions(...args: any[]): void;
+
+    function clone(...args: any[]): void;
+
+    function compile(schema: any): any;
+
+    function concat(...args: any[]): void;
+
+    function createError(...args: any[]): void;
+
+    function createOverrideError(...args: any[]): void;
+
+    function date(args: any): any;
+
+    function defaults(fn: any): any;
+
+    function describe(args: any): any;
+
+    function description(...args: any[]): void;
+
+    function disallow(...args: any[]): void;
+
+    function empty(...args: any[]): void;
+
+    function equal(...args: any[]): void;
+
+    function error(...args: any[]): void;
+
+    function example(...args: any[]): void;
+
+    function exist(...args: any[]): void;
+
+    function extend(args: any): any;
+
+    function forbidden(...args: any[]): void;
+
+    function func(args: any): any;
+
+    function invalid(...args: any[]): void;
+
+    function isRef(ref: any): any;
+
+    function label(...args: any[]): void;
+
+    function lazy(fn: any): any;
+
+    function meta(...args: any[]): void;
+
+    function not(...args: any[]): void;
+
+    function notes(...args: any[]): void;
+
+    function number(args: any): any;
+
+    function object(args: any): any;
+
+    function only(...args: any[]): void;
+
+    function optional(...args: any[]): void;
+
+    function options(...args: any[]): void;
+
+    function raw(...args: any[]): void;
+
+    function reach(schema: any, path: any): any;
+
+    function ref(args: any): any;
+
+    function required(...args: any[]): void;
+
+    function strict(...args: any[]): void;
+
+    function string(args: any): any;
+
+    function strip(...args: any[]): void;
+
+    function tags(...args: any[]): void;
+
+    function unit(...args: any[]): void;
+
+    function valid(...args: any[]): void;
+
+    function validate(value: any, args: any): any;
+
+    function when(...args: any[]): void;
+
+    namespace extensionSchema {
+        const isImmutable: boolean;
+
+        const isJoi: boolean;
+
+        const schemaType: string;
+
+        function allow(...args: any[]): void;
+
+        function and(...args: any[]): void;
+
+        function applyFunctionToChildren(...args: any[]): void;
+
+        function assert(...args: any[]): void;
+
+        function checkOptions(...args: any[]): void;
+
+        function clone(...args: any[]): void;
+
+        function concat(...args: any[]): void;
+
+        function createError(...args: any[]): void;
+
+        function createOverrideError(...args: any[]): void;
+
+        function describe(...args: any[]): void;
+
+        function description(...args: any[]): void;
+
+        function disallow(...args: any[]): void;
+
+        function empty(...args: any[]): void;
+
+        function equal(...args: any[]): void;
+
+        function error(...args: any[]): void;
+
+        function example(...args: any[]): void;
+
+        function exist(...args: any[]): void;
+
+        function forbidden(...args: any[]): void;
+
+        function forbiddenKeys(...args: any[]): void;
+
+        function invalid(...args: any[]): void;
+
+        function keys(...args: any[]): void;
+
+        function label(...args: any[]): void;
+
+        function length(...args: any[]): void;
+
+        function max(...args: any[]): void;
+
+        function meta(...args: any[]): void;
+
+        function min(...args: any[]): void;
+
+        function nand(...args: any[]): void;
+
+        function not(...args: any[]): void;
+
+        function notes(...args: any[]): void;
+
+        function only(...args: any[]): void;
+
+        function optional(...args: any[]): void;
+
+        function optionalKeys(...args: any[]): void;
+
+        function options(...args: any[]): void;
+
+        function or(...args: any[]): void;
+
+        function pattern(...args: any[]): void;
+
+        function raw(...args: any[]): void;
+
+        function rename(...args: any[]): void;
+
+        function required(...args: any[]): void;
+
+        function requiredKeys(...args: any[]): void;
+
+        function schema(...args: any[]): void;
+
+        function strict(...args: any[]): void;
+
+        function strip(...args: any[]): void;
+
+        function tags(...args: any[]): void;
+
+        function type(...args: any[]): void;
+
+        function unit(...args: any[]): void;
+
+        function unknown(...args: any[]): void;
+
+        function valid(...args: any[]): void;
+
+        function validate(...args: any[]): void;
+
+        function when(...args: any[]): void;
+
+        function without(...args: any[]): void;
+
+        function xor(...args: any[]): void;
+    }
+
+    namespace extensionsSchema {
+        const isImmutable: boolean;
+
+        const isJoi: boolean;
+
+        const schemaType: string;
+
+        function allow(...args: any[]): void;
+
+        function applyFunctionToChildren(...args: any[]): void;
+
+        function checkOptions(...args: any[]): void;
+
+        function clone(...args: any[]): void;
+
+        function concat(...args: any[]): void;
+
+        function createError(...args: any[]): void;
+
+        function createOverrideError(...args: any[]): void;
+
+        function describe(...args: any[]): void;
+
+        function description(...args: any[]): void;
+
+        function disallow(...args: any[]): void;
+
+        function empty(...args: any[]): void;
+
+        function equal(...args: any[]): void;
+
+        function error(...args: any[]): void;
+
+        function example(...args: any[]): void;
+
+        function exist(...args: any[]): void;
+
+        function forbidden(...args: any[]): void;
+
+        function invalid(...args: any[]): void;
+
+        function items(...args: any[]): void;
+
+        function label(...args: any[]): void;
+
+        function length(...args: any[]): void;
+
+        function max(...args: any[]): void;
+
+        function meta(...args: any[]): void;
+
+        function min(...args: any[]): void;
+
+        function not(...args: any[]): void;
+
+        function notes(...args: any[]): void;
+
+        function only(...args: any[]): void;
+
+        function optional(...args: any[]): void;
+
+        function options(...args: any[]): void;
+
+        function ordered(...args: any[]): void;
+
+        function raw(...args: any[]): void;
+
+        function required(...args: any[]): void;
+
+        function single(...args: any[]): void;
+
+        function sparse(...args: any[]): void;
+
+        function strict(...args: any[]): void;
+
+        function strip(...args: any[]): void;
+
+        function tags(...args: any[]): void;
+
+        function unique(...args: any[]): void;
+
+        function unit(...args: any[]): void;
+
+        function valid(...args: any[]): void;
+
+        function validate(...args: any[]): void;
+
+        function when(...args: any[]): void;
     }
 }
+// #endregion
 
-declare const frisby: Frisby;
-export = frisby;
+// #region Frisby FrisbySpec Methods
+// Reference file: https://github.com/vlucas/frisby/blob/master/src/frisby/spec.js
+export class FrisbySpec {
+    constructor(...args: any[]);
+    catch(onRejected?: (error: Error) => void): 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;
+    fromJSON(json: {}): FrisbySpec;
+    get(url: string, params: {}): FrisbySpec;
+    getBaseUrl(): string | boolean;
+    inspectBody(): FrisbySpec;
+    inspectHeaders(): FrisbySpec;
+    inspectJSON(): FrisbySpec;
+    inspectLog(...args: any[]): FrisbySpec;
+    inspectRequest(): FrisbySpec;
+    inspectRequestHeaders(): FrisbySpec;
+    inspectResponse(): FrisbySpec;
+    inspectStatus(): FrisbySpec;
+    patch(url: string, params: {}): FrisbySpec;
+    post(url: string, params: {}): FrisbySpec;
+    promise(): Promise<Response>;
+    put(url: string, params: {}): FrisbySpec;
+    setup(opts: {}, replace: boolean): 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;
+    static removeExpectHandler(expectName: string): void;
+}
+// #endregion
 
+// #region General Frisby Methods
+// Reference file: https://github.com/vlucas/frisby/blob/master/src/frisby.js
+
+export const version: string;
+export function addExpectHandler(expectName: string, expectFn: (...args: any[]) => any): FrisbySpec;
+export function baseUrl(url: string): void;
+export function create(name: string): void;
+export function del(...args: any[]): FrisbySpec;
+export function fetch(...args: any[]): FrisbySpec;
+export function formData(): FormData;
+export function fromJSON(...args: any[]): FrisbySpec;
+export function get(...args: any[]): FrisbySpec;
+export function globalSetup(opts: {}): void;
+export function patch(...args: any[]): FrisbySpec;
+export function post(...args: any[]): FrisbySpec;
+export function put(...args: any[]): FrisbySpec;
+export function removeExpectHandler(expectName: string, expectFn: (...args: any[]) => any): FrisbySpec;
+export function setup(...args: any[]): FrisbySpec;
+export function timeout(...args: any[]): FrisbySpec;
+export function use(...args: any[]): FrisbySpec;
+// #endregion
diff --git a/types/frisby/tsconfig.json b/types/frisby/tsconfig.json
index 725ebf48f1..b5780edd98 100644
--- a/types/frisby/tsconfig.json
+++ b/types/frisby/tsconfig.json
@@ -1,24 +1,19 @@
 {
     "compilerOptions": {
+        "baseUrl": "../",
+        "forceConsistentCasingInFileNames": true,
+        "lib": ["es6","dom"],
         "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
+        "noEmit": true,
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
         "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "typeRoots": ["../"]
     },
     "files": [
         "index.d.ts",
         "frisby-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/frisby/tslint.json b/types/frisby/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/frisby/tslint.json
+++ b/types/frisby/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/frisby/v0/frisby-tests.ts b/types/frisby/v0/frisby-tests.ts
new file mode 100644
index 0000000000..f954ddc04e
--- /dev/null
+++ b/types/frisby/v0/frisby-tests.ts
@@ -0,0 +1,26 @@
+//Example from https://www.npmjs.com/package/frisby
+import frisby = require('frisby');
+
+var URL = 'http://localhost:3000/';
+var URL_AUTH = 'http://username:password@localhost:3000/';
+
+frisby.globalSetup({ // globalSetup is for ALL requests
+  request: {
+    headers: { 'X-Auth-Token': 'fa8426a0-8eaf-4d22-8e13-7c1b16a9370c' }
+  }
+});
+
+frisby.create('GET user johndoe')
+  .get(URL + '/users/3.json')
+  .expectStatus(200)
+  .expectJSONTypes({
+    id: Number,
+    username: String,
+    is_admin: Boolean
+  })
+  .expectJSON({
+    id: 3,
+    username: 'johndoe',
+    is_admin: false
+  })
+.toss();
diff --git a/types/frisby/v0/index.d.ts b/types/frisby/v0/index.d.ts
new file mode 100644
index 0000000000..523c72e6db
--- /dev/null
+++ b/types/frisby/v0/index.d.ts
@@ -0,0 +1,75 @@
+// Type definitions for Frisby v0.8.5
+// Project: https://github.com/vlucas/frisby
+// Definitions by: Johnny Li <https://github.com/johnny4753>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+///<reference types="jasmine"/>
+
+declare interface Frisby {
+    globalSetup(opts: any): any;
+    timeout(seconds?: number): Frisby;
+    reset(): Frisby;
+    not(): Frisby;
+    addHeader(key: string, content: string): Frisby;
+    addHeaders(headers: object): Frisby;
+    removeHeader(key: string): Frisby;
+    responseType(type: any): Frisby;
+    // HTTP Basic Auth
+    auth(username: string, password: string, digest: boolean): Frisby;
+    // HTTP Request
+    get(uri: string, params?: any): Frisby;
+    patch(uri: string, data?: any, params?: any): Frisby;
+    post(uri: string, data?: any, params?: any): Frisby;
+    put(uri: string, data?: any, params?: any): Frisby;
+    delete(uri: string, data?: any, params?: any): Frisby;
+    head(uri: string, params?: any): Frisby;
+    options(uri: string, params?: any): Frisby;
+
+    expectMaxResponseTime(milliseconds: number): Frisby;
+    expectStatus(statusCode: number): Frisby;
+    expectHeader(header: string, content: string): Frisby;
+    expectHeaderContains(header: string, content: string): Frisby;
+    expectHeaderToMatch(header: string, pattern: RegExp): Frisby;
+    expectBodyContains(content: string): Frisby;
+    expectJSONTypes(json: any): Frisby;
+    expectJSONTypes(path: string, json: any): Frisby;
+    expectJSON(json: any): Frisby;
+    expectJSON(path: string, json: any): Frisby;
+    expectJSONSchema(path: string, jsonSchema: any): Frisby;
+    expectJSONLength(length: number): Frisby;
+    expectJSONLength(path: string, length: number): Frisby;
+    inspectRequest(): Frisby;
+    inspectResponse(): Frisby;
+    inspectHeaders(): Frisby;
+    inspectBody(): Frisby;
+    inspectJSON(): Frisby;
+    inspectStatus(): Frisby;
+    retry(count: number, delayInMilliseconds?: number): Frisby;
+    waits(delayInMilliseconds: number): Frisby;
+    after(callback: (...args: any[]) => void): Frisby;
+    afterJSON(callback: (...args: any[]) => void): Frisby;
+    exceptionHandler(fn: (...args: any[]) => void): Frisby;
+    toss(): void;
+
+    create(msg: string): Frisby;
+
+}
+
+declare global {
+    namespace jasmine {
+        interface Matchers<T> {
+            toMatchOrBeNull(expected: any): boolean;
+            toMatchOrBeEmpty(expected: any): boolean;
+            toBeType(expected: any): boolean;
+            toBeTypeOrNull(expected: any): boolean;
+            toBeTypeOrUndefined(expected: any): boolean;
+            toContainJson(expected: any, isNot?: boolean): boolean;
+            toContainJsonTypes(expected: any, isNot?: boolean): boolean;
+        }
+    }
+}
+
+declare const frisby: Frisby;
+export = frisby;
+
diff --git a/types/frisby/v0/tsconfig.json b/types/frisby/v0/tsconfig.json
new file mode 100644
index 0000000000..532da8d7c4
--- /dev/null
+++ b/types/frisby/v0/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "baseUrl": "../../",
+        "forceConsistentCasingInFileNames": true,
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "module": "commonjs",
+        "noEmit": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "paths": {
+            "frisby": [
+                "frisby/v0"
+            ]
+        },
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "types": [],
+        "typeRoots": [
+            "../../"
+        ]
+    },
+    "files": [
+        "index.d.ts",
+        "frisby-tests.ts"
+    ]
+}
diff --git a/types/frisby/v0/tslint.json b/types/frisby/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/frisby/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
+    }
+}

From ac6469fbcc6d9599d3ec8c3535f11672655442c6 Mon Sep 17 00:00:00 2001
From: Christopher Woodland <christopher.woodland@pearson.com>
Date: Mon, 26 Feb 2018 21:43:49 -0500
Subject: [PATCH 315/388] strictNullChecks true

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

diff --git a/types/frisby/tsconfig.json b/types/frisby/tsconfig.json
index b5780edd98..e07143dad2 100644
--- a/types/frisby/tsconfig.json
+++ b/types/frisby/tsconfig.json
@@ -7,7 +7,7 @@
         "noEmit": true,
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "types": [],
         "typeRoots": ["../"]

From 52dee462e07daa0a2d583ba4d194c9f408be27bc Mon Sep 17 00:00:00 2001
From: steven-joyce <wedgeline@gmail.com>
Date: Tue, 27 Feb 2018 15:59:26 +1300
Subject: [PATCH 316/388] GPT v121 - Modified display methods to accept div
 elements

---
 types/doubleclick-gpt/doubleclick-gpt-tests.ts | 6 ++++++
 types/doubleclick-gpt/index.d.ts               | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/types/doubleclick-gpt/doubleclick-gpt-tests.ts b/types/doubleclick-gpt/doubleclick-gpt-tests.ts
index 5eadd36861..4b843aeb8b 100644
--- a/types/doubleclick-gpt/doubleclick-gpt-tests.ts
+++ b/types/doubleclick-gpt/doubleclick-gpt-tests.ts
@@ -425,3 +425,9 @@ slot.setTargeting("allow_expandable", "true");
 
 // Example with multiple values for a key inside in an array.
 slot.setTargeting("interests", ["sports", "music", "movies"]);
+
+// googletag.display accepts a div element as well as a div ID.
+googletag.display(new HTMLElement());
+
+// pubads.display accepts a div element.
+googletag.pubads().display("/1234567/science", [300, 250], new HTMLElement());
diff --git a/types/doubleclick-gpt/index.d.ts b/types/doubleclick-gpt/index.d.ts
index 46092a2165..85bae04796 100644
--- a/types/doubleclick-gpt/index.d.ts
+++ b/types/doubleclick-gpt/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Publisher Tag v111
+// Type definitions for Google Publisher Tag v121
 // Project: https://developers.google.com/doubleclick-gpt/reference
 // Definitions by: John Wright <https://github.com/johngeorgewright>
 //                 Steven Joyce <https://github.com/steven-joyce>
@@ -63,7 +63,7 @@ declare namespace googletag {
         defineSlot(adUnitPath: string, size: GeneralSize, opt_div?: string): Slot;
         destroySlots(opt_slots?: Slot[]): boolean;
         disablePublisherConsole(): void;
-        display(div?: string): void;
+        display(div?: string | Element): void;
         enableServices(): void;
         getVersion(): string;
         openConsole(opt_div?: string): void;
@@ -115,7 +115,7 @@ declare namespace googletag {
         defineOutOfPagePassback(adUnitPath: string): PassbackSlot;
         definePassback(adUnitPath: string, size: GeneralSize): PassbackSlot;
         disableInitialLoad(): void;
-        display(adUnitPath: string, size: GeneralSize, opt_div?: string, opt_clickUrl?: string): Slot;
+        display(adUnitPath: string, size: GeneralSize, opt_div?: string | Element, opt_clickUrl?: string): Slot;
         enableAsyncRendering(): boolean;
         enableSingleRequest(): boolean;
         enableSyncRendering(): boolean;

From 09ab654b88bb7230cf0aba3a0cf451e3596c57d1 Mon Sep 17 00:00:00 2001
From: steven-joyce <wedgeline@gmail.com>
Date: Tue, 27 Feb 2018 16:05:23 +1300
Subject: [PATCH 317/388] GPT v138 - SlotRenderEndedEvent and
 ResponseInformation changes

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

diff --git a/types/doubleclick-gpt/index.d.ts b/types/doubleclick-gpt/index.d.ts
index 85bae04796..aa64909369 100644
--- a/types/doubleclick-gpt/index.d.ts
+++ b/types/doubleclick-gpt/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Publisher Tag v121
+// Type definitions for Google Publisher Tag v138
 // Project: https://developers.google.com/doubleclick-gpt/reference
 // Definitions by: John Wright <https://github.com/johngeorgewright>
 //                 Steven Joyce <https://github.com/steven-joyce>
@@ -44,7 +44,6 @@ declare namespace googletag {
         advertiserId: string;
         campaignId: string;
         creativeId?: number;
-        labelIds: number[];
         lineItemId?: number;
     }
 
@@ -156,6 +155,7 @@ declare namespace googletag {
         }
 
         export interface SlotRenderEndedEvent {
+            advertiserId?: number;
             creativeId?: number;
             isEmpty: boolean;
             lineItemId?: number;

From 61d67c812c211208349e8d6c279e396ffd0e798b Mon Sep 17 00:00:00 2001
From: steven-joyce <wedgeline@gmail.com>
Date: Tue, 27 Feb 2018 16:18:04 +1300
Subject: [PATCH 318/388] GPT v172 - NamedSize can be a string or array of
 strings

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

diff --git a/types/doubleclick-gpt/doubleclick-gpt-tests.ts b/types/doubleclick-gpt/doubleclick-gpt-tests.ts
index 4b843aeb8b..941ad3c260 100644
--- a/types/doubleclick-gpt/doubleclick-gpt-tests.ts
+++ b/types/doubleclick-gpt/doubleclick-gpt-tests.ts
@@ -431,3 +431,7 @@ googletag.display(new HTMLElement());
 
 // pubads.display accepts a div element.
 googletag.pubads().display("/1234567/science", [300, 250], new HTMLElement());
+
+// A named size can be a string or an array of strings.
+googletag.pubads().display("/1234567/science/physics", [[300, 250], "fluid"], "div-1");
+googletag.pubads().display("/1234567/science/physics", [[300, 250], ["fluid"]], "div-1");
diff --git a/types/doubleclick-gpt/index.d.ts b/types/doubleclick-gpt/index.d.ts
index aa64909369..10e20cccd1 100644
--- a/types/doubleclick-gpt/index.d.ts
+++ b/types/doubleclick-gpt/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Publisher Tag v138
+// Type definitions for Google Publisher Tag v172
 // Project: https://developers.google.com/doubleclick-gpt/reference
 // Definitions by: John Wright <https://github.com/johngeorgewright>
 //                 Steven Joyce <https://github.com/steven-joyce>
@@ -7,7 +7,7 @@
 declare namespace googletag {
     export type SingleSizeArray = number[];
 
-    export type NamedSize = string;
+    export type NamedSize = string | string[];
 
     export type SingleSize = SingleSizeArray | NamedSize;
 

From f014d236f892ba946e2442a9687e6f5c7f97f0b0 Mon Sep 17 00:00:00 2001
From: Christopher Woodland <christopher.woodland@pearson.com>
Date: Mon, 26 Feb 2018 22:40:13 -0500
Subject: [PATCH 319/388] spacing

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

diff --git a/types/frisby/index.d.ts b/types/frisby/index.d.ts
index b3a84c28a0..899e45ef5e 100644
--- a/types/frisby/index.d.ts
+++ b/types/frisby/index.d.ts
@@ -14,316 +14,164 @@ import { Response } from 'node-fetch'; // Import all definitions from node-fetch
 // Reference file: https://github.com/hapijs/joi
 export namespace Joi {
     const isImmutable: boolean;
-
     const isJoi: boolean;
-
     const schemaType: string;
-
     const version: string;
-
     function allow(...args: any[]): void;
-
     function alt(args: any): any;
-
     function alternatives(args: any): any;
-
     function any(args: any): any;
-
     function applyFunctionToChildren(...args: any[]): void;
-
     function array(args: any): any;
-
     function assert(value: any, schema: any, message: string): void;
-
     function attempt(value: any, schema: any, message: string): any;
-
     function binary(args: any): any;
-
     function bool(args: any): any;
-
     function checkOptions(...args: any[]): void;
-
     function clone(...args: any[]): void;
-
     function compile(schema: any): any;
-
     function concat(...args: any[]): void;
-
     function createError(...args: any[]): void;
-
     function createOverrideError(...args: any[]): void;
-
     function date(args: any): any;
-
     function defaults(fn: any): any;
-
     function describe(args: any): any;
-
     function description(...args: any[]): void;
-
     function disallow(...args: any[]): void;
-
     function empty(...args: any[]): void;
-
     function equal(...args: any[]): void;
-
     function error(...args: any[]): void;
-
     function example(...args: any[]): void;
-
     function exist(...args: any[]): void;
-
     function extend(args: any): any;
-
     function forbidden(...args: any[]): void;
-
     function func(args: any): any;
-
     function invalid(...args: any[]): void;
-
     function isRef(ref: any): any;
-
     function label(...args: any[]): void;
-
     function lazy(fn: any): any;
-
     function meta(...args: any[]): void;
-
     function not(...args: any[]): void;
-
     function notes(...args: any[]): void;
-
     function number(args: any): any;
-
     function object(args: any): any;
-
     function only(...args: any[]): void;
-
     function optional(...args: any[]): void;
-
     function options(...args: any[]): void;
-
     function raw(...args: any[]): void;
-
     function reach(schema: any, path: any): any;
-
     function ref(args: any): any;
-
     function required(...args: any[]): void;
-
     function strict(...args: any[]): void;
-
     function string(args: any): any;
-
     function strip(...args: any[]): void;
-
     function tags(...args: any[]): void;
-
     function unit(...args: any[]): void;
-
     function valid(...args: any[]): void;
-
     function validate(value: any, args: any): any;
-
     function when(...args: any[]): void;
 
     namespace extensionSchema {
         const isImmutable: boolean;
-
         const isJoi: boolean;
-
         const schemaType: string;
-
         function allow(...args: any[]): void;
-
         function and(...args: any[]): void;
-
         function applyFunctionToChildren(...args: any[]): void;
-
         function assert(...args: any[]): void;
-
         function checkOptions(...args: any[]): void;
-
         function clone(...args: any[]): void;
-
         function concat(...args: any[]): void;
-
         function createError(...args: any[]): void;
-
         function createOverrideError(...args: any[]): void;
-
         function describe(...args: any[]): void;
-
         function description(...args: any[]): void;
-
         function disallow(...args: any[]): void;
-
         function empty(...args: any[]): void;
-
         function equal(...args: any[]): void;
-
         function error(...args: any[]): void;
-
         function example(...args: any[]): void;
-
         function exist(...args: any[]): void;
-
         function forbidden(...args: any[]): void;
-
         function forbiddenKeys(...args: any[]): void;
-
         function invalid(...args: any[]): void;
-
         function keys(...args: any[]): void;
-
         function label(...args: any[]): void;
-
         function length(...args: any[]): void;
-
         function max(...args: any[]): void;
-
         function meta(...args: any[]): void;
-
         function min(...args: any[]): void;
-
         function nand(...args: any[]): void;
-
         function not(...args: any[]): void;
-
         function notes(...args: any[]): void;
-
         function only(...args: any[]): void;
-
         function optional(...args: any[]): void;
-
         function optionalKeys(...args: any[]): void;
-
         function options(...args: any[]): void;
-
         function or(...args: any[]): void;
-
         function pattern(...args: any[]): void;
-
         function raw(...args: any[]): void;
-
         function rename(...args: any[]): void;
-
         function required(...args: any[]): void;
-
         function requiredKeys(...args: any[]): void;
-
         function schema(...args: any[]): void;
-
         function strict(...args: any[]): void;
-
         function strip(...args: any[]): void;
-
         function tags(...args: any[]): void;
-
         function type(...args: any[]): void;
-
         function unit(...args: any[]): void;
-
         function unknown(...args: any[]): void;
-
         function valid(...args: any[]): void;
-
         function validate(...args: any[]): void;
-
         function when(...args: any[]): void;
-
         function without(...args: any[]): void;
-
         function xor(...args: any[]): void;
     }
 
     namespace extensionsSchema {
         const isImmutable: boolean;
-
         const isJoi: boolean;
-
         const schemaType: string;
-
         function allow(...args: any[]): void;
-
         function applyFunctionToChildren(...args: any[]): void;
-
         function checkOptions(...args: any[]): void;
-
         function clone(...args: any[]): void;
-
         function concat(...args: any[]): void;
-
         function createError(...args: any[]): void;
-
         function createOverrideError(...args: any[]): void;
-
         function describe(...args: any[]): void;
-
         function description(...args: any[]): void;
-
         function disallow(...args: any[]): void;
-
         function empty(...args: any[]): void;
-
         function equal(...args: any[]): void;
-
         function error(...args: any[]): void;
-
         function example(...args: any[]): void;
-
         function exist(...args: any[]): void;
-
         function forbidden(...args: any[]): void;
-
         function invalid(...args: any[]): void;
-
         function items(...args: any[]): void;
-
         function label(...args: any[]): void;
-
         function length(...args: any[]): void;
-
         function max(...args: any[]): void;
-
         function meta(...args: any[]): void;
-
         function min(...args: any[]): void;
-
         function not(...args: any[]): void;
-
         function notes(...args: any[]): void;
-
         function only(...args: any[]): void;
-
         function optional(...args: any[]): void;
-
         function options(...args: any[]): void;
-
         function ordered(...args: any[]): void;
-
         function raw(...args: any[]): void;
-
         function required(...args: any[]): void;
-
         function single(...args: any[]): void;
-
         function sparse(...args: any[]): void;
-
         function strict(...args: any[]): void;
-
         function strip(...args: any[]): void;
-
         function tags(...args: any[]): void;
-
         function unique(...args: any[]): void;
-
         function unit(...args: any[]): void;
-
         function valid(...args: any[]): void;
-
         function validate(...args: any[]): void;
-
         function when(...args: any[]): void;
     }
 }

From 81bd41215269309ebf6c414089033167c9c4329f Mon Sep 17 00:00:00 2001
From: Scott Cooper <scttcper@gmail.com>
Date: Mon, 26 Feb 2018 22:43:00 -0800
Subject: [PATCH 320/388] fix: allow joi object to be passed directly to
 response.schema

---
 types/hapi/index.d.ts               | 1 +
 types/hapi/test/route/validation.ts | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index aebef5e5d8..de1542f33f 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -1381,6 +1381,7 @@ export interface ValidationObject {
 export type RouteOptionsResponseSchema =
     boolean
     | ValidationObject
+    | AnySchema
     | ((value: object | Buffer | string, options: ValidationOptions) => Promise<any>);
 
 /**
diff --git a/types/hapi/test/route/validation.ts b/types/hapi/test/route/validation.ts
index 58190a2584..6cc4ed186d 100644
--- a/types/hapi/test/route/validation.ts
+++ b/types/hapi/test/route/validation.ts
@@ -11,6 +11,9 @@ const routeOptions: RouteOptions = {
         params: {
             name: Joi.string().min(3).max(10)
         }
+    },
+    response: {
+        schema: Joi.string()
     }
 };
 

From 5c6737cfc5d3e1203ca2722a1e212a66cdeab844 Mon Sep 17 00:00:00 2001
From: Tim Wang <tim@thenetcircle.com>
Date: Tue, 27 Feb 2018 15:51:36 +0800
Subject: [PATCH 321/388] [react-native] Add YellowBox API

---
 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 395ce9af45..717135e7d4 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -8609,6 +8609,8 @@ export function findNodeHandle(
 
 export function processColor(color: any): number;
 
+export const YellowBox: React.Component<any, any> & { ignoreWarnings: (warnings: string[]) => void };
+
 //////////////////////////////////////////////////////////////////////////
 //
 // Additional ( and controversial)

From 44f71205b746d23f7687f96cba5631ffed9caa2b Mon Sep 17 00:00:00 2001
From: Paul Brabban <paul.brabban@gmail.com>
Date: Tue, 27 Feb 2018 08:25:53 +0000
Subject: [PATCH 322/388] allow routing key in CreateDocumentParams

---
 types/elasticsearch/elasticsearch-tests.ts | 8 ++++++++
 types/elasticsearch/index.d.ts             | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 3043a1f473..2e90389126 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -61,6 +61,14 @@ client.create({
 }, (err, repsonse, status) => {
 });
 
+client.create({
+  id: '123',
+  index: 'index',
+  type: 'type',
+  routing: 'parent_123',
+}, (err, repsonse, status) => {
+});
+
 client.cluster.getSettings({
   masterTimeout: '100s'
 }, (err, response) => {
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index dbf836c6ae..4d53575749 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -7,6 +7,7 @@
 //                 Margus Lamp <https://github.com/mlamp>
 //                 Ahmad Ferdous Bin Alam <https://github.com/ahmadferdous>
 //                 Simon Schick <https://github.com/SimonSchick>
+//                 Paul Brabban <https://github.com/brabster>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -199,6 +200,7 @@ export interface CreateDocumentParams extends GenericParams {
     waitForActiveShards?: string;
     parent?: string;
     refresh?: Refresh;
+    routing?: string;
     timeout?: TimeSpan;
     timestamp?: Date | number;
     ttl?: TimeSpan;

From 36bf8b0bb6b3de1d8a3192dd96ddb2fda19deead Mon Sep 17 00:00:00 2001
From: Mathias Lykkegaard Lorenzen <mathias.lorenzen@live.com>
Date: Tue, 27 Feb 2018 09:30:37 +0100
Subject: [PATCH 323/388] Update index.d.ts

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

diff --git a/types/knockout.mapping/index.d.ts b/types/knockout.mapping/index.d.ts
index 58a6c24d3a..86ce2431cc 100644
--- a/types/knockout.mapping/index.d.ts
+++ b/types/knockout.mapping/index.d.ts
@@ -13,6 +13,10 @@ declare var self: KnockoutMapping;
 export = self;
 
 declare global {
+    type KnockoutObservableType<T> = {	
+        [P in keyof T]: KnockoutObservable<KnockoutObservableType<T[P]>>|T[P];	
+    };
+    
     interface KnockoutMappingCreateOptions {
         data: any;
         parent: any;

From 0cc193198f0e6fc24b4474cf75c92e87a1c35ae1 Mon Sep 17 00:00:00 2001
From: Dona278 <davide.donadello@ericsoft.com>
Date: Tue, 27 Feb 2018 11:23:00 +0100
Subject: [PATCH 324/388] [angular-desktop-notification] - Changed tslint.json
 configuration

- Removed rules from "tslint.json" configuration file and add line in code where necessary
---
 types/angular-desktop-notification/index.d.ts  | 3 +++
 types/angular-desktop-notification/tslint.json | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/types/angular-desktop-notification/index.d.ts b/types/angular-desktop-notification/index.d.ts
index 1f62dfb178..a20d67cd21 100644
--- a/types/angular-desktop-notification/index.d.ts
+++ b/types/angular-desktop-notification/index.d.ts
@@ -122,12 +122,14 @@ declare module 'angular' {
             onError?: EventListener;
         }
 
+        // tslint:disable-next-line interface-name
         interface IDesktopNotificationOptions {
             autoClose?: boolean;
             duration?: number;
             showOnPageHidden?: boolean;
         }
 
+        // tslint:disable-next-line interface-name
         interface IDesktopNotificationProvider {
             /**
              * Set the default app-wide configuration for desktopNotification
@@ -135,6 +137,7 @@ declare module 'angular' {
             config(options: IDesktopNotificationOptions): void;
         }
 
+        // tslint:disable-next-line interface-name
         interface IDesktopNotificationService {
             permissions: {
                 default: 'default',
diff --git a/types/angular-desktop-notification/tslint.json b/types/angular-desktop-notification/tslint.json
index 63913ca3f0..183bc723ef 100644
--- a/types/angular-desktop-notification/tslint.json
+++ b/types/angular-desktop-notification/tslint.json
@@ -1,7 +1,3 @@
 { 
-    "extends": "dtslint/dt.json" ,
-    "rules": {
-        "interface-name": false,
-        "max-line-length": false
-    }
+    "extends": "dtslint/dt.json" 
 }

From 2f96ad47788dbc2402529e4f97589cd330282b99 Mon Sep 17 00:00:00 2001
From: Stuart Gray <stuart.gray@global.com>
Date: Tue, 27 Feb 2018 11:19:02 +0000
Subject: [PATCH 325/388] Add bubble chart radius property to ChartPoint

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

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 9a8269bee4..23af4bd526 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -162,6 +162,7 @@ declare namespace Chart {
     interface ChartPoint {
         x?: number | string | Date;
         y?: number;
+        r?: number;
     }
 
     interface ChartConfiguration {

From 2d6b9e356260aa945f92e4f7b508021cf741889b Mon Sep 17 00:00:00 2001
From: dominuskernel <promodominus@gmail.com>
Date: Tue, 27 Feb 2018 12:23:31 +0100
Subject: [PATCH 326/388] Add types definitions for roads-server

---
 types/roads-server/index.d.ts            | 43 ++++++++++++++++++++++++
 types/roads-server/roads-server-tests.ts | 25 ++++++++++++++
 types/roads-server/tsconfig.json         | 24 +++++++++++++
 types/roads-server/tslint.json           |  3 ++
 4 files changed, 95 insertions(+)
 create mode 100644 types/roads-server/index.d.ts
 create mode 100644 types/roads-server/roads-server-tests.ts
 create mode 100644 types/roads-server/tsconfig.json
 create mode 100644 types/roads-server/tslint.json

diff --git a/types/roads-server/index.d.ts b/types/roads-server/index.d.ts
new file mode 100644
index 0000000000..e624b2828e
--- /dev/null
+++ b/types/roads-server/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for roads-server 1.0
+// Project: https://github.com/Dashron/roads-server
+// Definitions by: Francisco Jesus <https://github.com/dancespiele>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+/// <reference types="node" />
+
+import { Road } from "roads";
+
+/**
+ * Roads-Server is a simple webserver for setting up and using the roads framework on an HTTP or HTTP 2 server
+ */
+export class Server {
+    /**
+     *
+     * @param Roads The Road that handles all the routes
+     * @param error_handler An overwrite to the standard error handler. Accepts a single parameter (the error) and should return a Roads.Response object
+     */
+    constructor(Roads: Road, error_handler: (error: any) => any);
+
+    /**
+     * Start the http server. Accepts the same parameters as HttpServer.listen
+     * @param port Port which listen the server
+     * @param handler Execution tasks after start the server
+     */
+    listen(port: number, handler: () => any): any;
+}
+
+export class Http2Server {
+    /**
+     *
+     * @param Roads The Road that handles all the routes
+     * @param error_handler An overwrite to the standard error handler. Accepts a single parameter (the error) and should return a Roads.Response object
+     */
+    constructor(Roads: Road);
+
+    /**
+     * Start the http server. Accepts the same parameters as HttpServer.listen
+     * @param port Port which listen the server
+     * @param handler Execution tasks after start the server
+     */
+    listen(port: number, handler: () => any): any;
+}
diff --git a/types/roads-server/roads-server-tests.ts b/types/roads-server/roads-server-tests.ts
new file mode 100644
index 0000000000..bff1852145
--- /dev/null
+++ b/types/roads-server/roads-server-tests.ts
@@ -0,0 +1,25 @@
+import { Road, Response } from "roads";
+import { Server, Http2Server } from "roads-server";
+
+const road = new Road();
+const server = new Server(road, (error: any) => {
+    switch (error.code) {
+        case 404:
+            return new Response("Not Found", 404);
+        case 405:
+            return new Response("Not Allowed", 405);
+        default:
+        case 500:
+            return new Response(error.message, 500);
+    }
+});
+
+server.listen(3000, () => {
+    console.log("Serve is running in the port 3000");
+});
+
+const server2 = new Http2Server(road);
+
+server2.listen(3000, () => {
+    console.log("Serve is running in the port 3000");
+});
diff --git a/types/roads-server/tsconfig.json b/types/roads-server/tsconfig.json
new file mode 100644
index 0000000000..bbe5268bef
--- /dev/null
+++ b/types/roads-server/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",
+        "roads-server-tests.ts"
+    ]
+}
diff --git a/types/roads-server/tslint.json b/types/roads-server/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/roads-server/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 580c06d4f82ff32711035fd18e3ecd6b47700078 Mon Sep 17 00:00:00 2001
From: PINGUET Julien <pinguet62@gmail.com>
Date: Tue, 27 Feb 2018 13:07:59 +0100
Subject: [PATCH 327/388] Fix review

---
 types/mongorito/index.d.ts         |  44 +++--
 types/mongorito/mongorito-tests.ts | 253 +++++++++++++++--------------
 types/mongorito/tslint.json        |  78 +--------
 3 files changed, 151 insertions(+), 224 deletions(-)

diff --git a/types/mongorito/index.d.ts b/types/mongorito/index.d.ts
index 8342495926..3e54ce0791 100644
--- a/types/mongorito/index.d.ts
+++ b/types/mongorito/index.d.ts
@@ -1,20 +1,17 @@
-// Type definitions for mongorito v3.0.4
+// Type definitions for mongorito 3.0
 // Project: https://github.com/vadimdemedes/mongorito
 // Definitions by: Pinguet62 <https://github.com/pinguet62>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-import {Collection, CommonOptions, Db, IndexOptions, Long, MongoClientOptions, ReadPreference} from 'mongodb';
+import { Collection, CommonOptions, Db, IndexOptions, Long, MongoClientOptions, ReadPreference } from 'mongodb';
 
-declare namespace mongorito {
-}
+export { Timestamp, ObjectId, MinKey, MaxKey, DBRef, Long } from 'mongodb';
 
-export {Timestamp, ObjectId, MinKey, MaxKey, DBRef, Long} from 'mongodb';
-
-type Class<T> = new (...args: any[]) => T;
+export type Class<T> = new (...args: any[]) => T;
 export type ModelClass = Class<Model>;
 
-declare class MQuery {
+export class MQuery {
 }
 
 // "extends MQuery": not actually inheritance, but more easy to implement
@@ -44,7 +41,6 @@ export class Query extends MQuery {
 
 // "extends Query": not actually inheritance, but more easy to implement
 export class Model extends Query {
-
     /**
      * @see Model#database
      * @see Database#connection()
@@ -54,24 +50,24 @@ export class Model extends Query {
     /**
      * @see Db#collection(string)
      */
-    static getCollection<TSchema = any>(): Promise<Collection<TSchema>>;
+    static getCollection(): Promise<Collection<any>>;
 
     static use(plugins?: Plugin | Plugin[]): void;
 
     static modifyReducer(reducerModifier: ReducerModifier): void;
 
-    static query(method: string, query: [string, any][]): Promise<object[]>;
+    static query(method: string, query: Array<[string, any]>): Promise<object[]>;
 
     /**
      * @see mongodb.Collection#listIndexes()
-     * @return {Promise<any[]>} {@link CommandCursor#toArray()}
+     * @see mongodb.CommandCursor#toArray()
      */
     static listIndexes(options?: { batchSize?: number, readPreference?: ReadPreference | string }): Promise<any[]>;
 
     /**
      * @see mongodb.Collection#createIndex()
      */
-    static createIndex(fieldOrSpec: string | any, options?: IndexOptions): Promise<string>;
+    static createIndex(fieldOrSpec: any, options?: IndexOptions): Promise<string>;
 
     /**
      * @see mongodb.Collection#dropIndex()
@@ -86,7 +82,7 @@ export class Model extends Query {
 
     getConnection(): Promise<Db>;
 
-    getCollection<TSchema = any>(): Promise<Collection<TSchema>>;
+    getCollection(): Promise<Collection<any>>;
 
     set(key: string, value: any): void;
     set(value: object): void;
@@ -210,13 +206,13 @@ export interface ListIndexesAction {
 export interface QueryAction {
     type: string; // ActionTypes.QUERY
     method: string;
-    query: { method: string, args: any }[];
+    query: Array<{ method: string, args: any }>;
 }
 
 export interface CallAction {
     type: string; // ActionTypes.CALL
     method: string;
-    args: { method: string, args: any }[];
+    args: Array<{ method: string, args: any }>;
 }
 
 export type Action =
@@ -237,22 +233,22 @@ export type Action =
     | DropIndexAction
     | ListIndexesAction
     | QueryAction
-    | CallAction
+    | CallAction;
 
 export type PluginNext = (action: Action) => void;
 
-interface DefaultState {
-    unset: string[],
-    fields: object
+export interface DefaultState {
+    unset: string[];
+    fields: object;
 }
 
 export type State = DefaultState & any;
 
 export interface PluginStore {
-    dispatch: (arg: any) => any,
-    getState: () => State,
-    modelClass: ModelClass,
-    model?: Model
+    dispatch: (arg: any) => any;
+    getState: () => State;
+    modelClass: ModelClass;
+    model?: Model;
 }
 
 export type Reducer<S = any> = (state: S, action: Action) => Reducer;
diff --git a/types/mongorito/mongorito-tests.ts b/types/mongorito/mongorito-tests.ts
index 88a7b51cc0..58ebc894a3 100644
--- a/types/mongorito/mongorito-tests.ts
+++ b/types/mongorito/mongorito-tests.ts
@@ -1,8 +1,3 @@
-/**
- * - Compilation type-check: using TS compiler "strict" options, and DefinitelyTyped linter (based on comments)
- * - Dynamic type-check: using `expect(...).toBeInstanceOf(...)` on a simple workflow (require Mongodb instance)
- */
-
 import {
     Collection,
     Db,
@@ -42,8 +37,10 @@ import {
 const URL = `192.168.99.100:27017`;
 
 // "jest" dependency
-declare function describe(description: string, callback: Function): void;
-declare function it(description: string, callback: Function | Promise<Function>): void;
+declare function describe(description: string, callback: () => void): void;
+
+declare function it(description: string, callback: (() => void) | (() => Promise<void>)): void;
+
 declare function expect(obj: any): any;
 
 function expectToBeAModelClass(obj: ModelClass) {
@@ -56,7 +53,7 @@ function expectToBeAPluginStore(obj: PluginStore) {
     expect(obj.dispatch).toBeInstanceOf(Function);
 
     expect(obj.getState).toBeInstanceOf(Function);
-    let storeState: State = obj.getState();
+    const storeState: State = obj.getState();
     expectToBeAState(storeState);
 
     expectToBeAModelClass(obj.modelClass);
@@ -125,7 +122,7 @@ describe('mongorito', () => {
     };
 
     it('Plugin', async () => {
-        let plugin: Plugin = (modelClass: ModelClass) => {
+        const plugin: Plugin = (modelClass: ModelClass) => {
             expectToBeAModelClass(modelClass);
             return (store: PluginStore) => {
                 expectToBeAPluginStore(store);
@@ -134,12 +131,12 @@ describe('mongorito', () => {
                     return (action: Action) => {
                         expectToBeAAction(action);
                         // next(action);
-                    }
-                }
-            }
+                    };
+                };
+            };
         };
 
-        let database = new Database(URL);
+        const database = new Database(URL);
         await database.connect();
 
         class PluggedModel extends Model {
@@ -147,16 +144,16 @@ describe('mongorito', () => {
 
         database.register(PluggedModel);
         PluggedModel.use(plugin);
-        let obj: Model = new PluggedModel({attr: 42});
-        await obj.save()
+        const obj: Model = new PluggedModel({attr: 42});
+        await obj.save();
     });
 
     it('Database', async () => {
         // ----- constructor -----
 
         new Database(URL);
-        let options: MongoClientOptions = {};
-        let database = new Database(URL, options);
+        const options: MongoClientOptions = {};
+        const database = new Database(URL, options);
 
         new Database(URL);
 
@@ -166,80 +163,84 @@ describe('mongorito', () => {
 
         // ----- connect -----
 
-        let connectResultPromise: Promise<Db> = database.connect();
+        const connectResultPromise: Promise<Db> = database.connect();
         expect(connectResultPromise).toBeInstanceOf(Promise);
-        let connectResult: Db = await connectResultPromise;
+        const connectResult: Db = await connectResultPromise;
         expect(connectResult).toBeInstanceOf(Db);
 
         // ----- connection -----
 
-        let connectionResultPromise: Promise<Db> = database.connection();
+        const connectionResultPromise: Promise<Db> = database.connection();
         expect(connectionResultPromise).toBeInstanceOf(Promise);
-        let connectionResult: Db = await connectionResultPromise;
+        const connectionResult: Db = await connectionResultPromise;
         expect(connectionResult).toBeInstanceOf(Db);
 
         // ----- disconnect -----
 
-        let disconnectResultPromise: Promise<void> = database.disconnect();
+        const disconnectResultPromise: Promise<void> = database.disconnect();
         expect(disconnectResultPromise).toBeInstanceOf(Promise);
-        let disconnectResult = await disconnectResultPromise;
-        expect(disconnectResult).toBeUndefined();
+        // expect(await disconnectResultPromise).toBeUndefined();
+        await disconnectResultPromise; // $ExpectType void
 
         // ----- register -----
         class RegisteredModel extends Model {
-            constructor(fields?: Object) {
+            constructor(fields?: object) {
                 super(fields);
             }
         }
 
         class RegisteredModelA extends Model {
-            constructor(fields?: Object) {
+            constructor(fields?: object) {
                 super(fields);
             }
         }
 
         class RegisteredModelB extends Model {
-            constructor(fields?: Object) {
+            constructor(fields?: object) {
                 super(fields);
             }
         }
 
-        expect(database.register(RegisteredModel)).toBeUndefined();
-        expect(database.register([RegisteredModelA, RegisteredModelB])).toBeUndefined();
+        // expect(database.register(RegisteredModel)).toBeUndefined();
+        database.register(RegisteredModel); // $ExpectType void
+        // expect(database.register([RegisteredModelA, RegisteredModelB])).toBeUndefined();
+        database.register([RegisteredModelA, RegisteredModelB]); // $ExpectType void
 
         // ----- use -----
 
-        expect(database.use(plugin1)).toBeUndefined();
-        expect(database.use([plugin2, plugin3])).toBeUndefined();
+        // expect(database.use(plugin1)).toBeUndefined();
+        database.use(plugin1); // $ExpectType void
+        // expect(database.use([plugin2, plugin3])).toBeUndefined();
+        database.use([plugin2, plugin3]); // $ExpectType void
     });
 
     describe('Model', () => {
         it('base static', async () => {
-            let database = new Database(URL);
+            const database = new Database(URL);
             await database.connect();
 
             class Sample extends Model {
-                constructor(fields?: Object) {
+                constructor(fields?: object) {
                     super(fields);
                 }
             }
 
             database.register(Sample);
 
-            const fieldOrSpec: string = 'any';
+            const fieldOrSpec = 'any';
 
             // ----- getConnection -----
 
-            let getConnectionResultPromise: Promise<Db> = Sample.getConnection();
+            const getConnectionResultPromise: Promise<Db> = Sample.getConnection();
             expect(getConnectionResultPromise).toBeInstanceOf(Promise);
-            let getConnectionResult: Db = await getConnectionResultPromise;
+            const getConnectionResult: Db = await getConnectionResultPromise;
             expect(getConnectionResult).toBeInstanceOf(Db);
 
             // ----- getCollection -----
 
-            let getCollectionResultPromise: Promise<Collection<any>> = Sample.getCollection();
+            const getCollectionResultPromise: Promise<Collection<any>> = Sample.getCollection();
             expect(getCollectionResultPromise).toBeInstanceOf(Promise);
-            let getCollectionResult: Collection<any> = await getCollectionResultPromise;
+            const getCollectionResult: Collection<any> = await getCollectionResultPromise;
             expectToBeACollection(getCollectionResult);
 
             // ----- use -----
@@ -249,66 +250,68 @@ describe('mongorito', () => {
 
             // ----- modifyReducer -----
 
-            let reducer: ReducerModifier = (reducerState: ReducerState) => {
+            const reducer: ReducerModifier = (reducerState: ReducerState) => {
                 expect(reducerState.unset).toBeInstanceOf(Function);
                 expect(reducerState.fields).toBeInstanceOf(Function);
-                return reducerState
+                return reducerState;
             };
-            expect(Sample.modifyReducer(reducer)).toBeUndefined();
+            // expect(Sample.modifyReducer(reducer)).toBeUndefined();
+            Sample.modifyReducer(reducer); // $ExpectType void
 
             // ----- query -----
-            await new Sample({'attr': 'first'}).save();
-            await new Sample({'attr': 'second'}).save();
+            await new Sample({attr: 'first'}).save();
+            await new Sample({attr: 'second'}).save();
 
-            let method: string = 'find';
-            let query: [string, any][] = [
-                ['where', {'attr': {$exists: true}}],
+            const method = 'find';
+            const query: Array<[string, any]> = [
+                ['where', {attr: {$exists: true}}],
                 ['limit', 5]
             ];
-            let queryResultPromise: Promise<Object[]> = Sample.query(method, query);
+            const queryResultPromise: Promise<object[]> = Sample.query(method, query);
             expect(queryResultPromise).toBeInstanceOf(Promise);
-            let queryResult: Object[] = await queryResultPromise;
+            const queryResult: object[] = await queryResultPromise;
             expect(Array.isArray(queryResult)).toBe(true);
             expect(queryResult.length).toBeGreaterThan(0);
             queryResult.forEach(x => expect(x).toBeInstanceOf(Object));
 
             // ----- listIndexes -----
 
-            let listIndexesResultPromise: Promise<any[]> = Sample.listIndexes();
+            const listIndexesResultPromise: Promise<any[]> = Sample.listIndexes();
             expect(listIndexesResultPromise).toBeInstanceOf(Promise);
-            let listIndexesResult: any[] = await listIndexesResultPromise;
+            const listIndexesResult: any[] = await listIndexesResultPromise;
             expect(Array.isArray(listIndexesResult)).toBe(true);
             listIndexesResult.forEach(x => expect(x).not.toBeUndefined());
 
             // ----- createIndex -----
 
-            let createIndexResultPromise: Promise<string> = Sample.createIndex(fieldOrSpec);
+            const createIndexResultPromise: Promise<string> = Sample.createIndex(fieldOrSpec);
             expect(createIndexResultPromise).toBeInstanceOf(Promise);
-            let createIndexResult: string = await createIndexResultPromise;
+            const createIndexResult: string = await createIndexResultPromise;
             expect(typeof createIndexResult).toBe('string');
 
             // ----- dropIndex -----
 
-            let dropIndexResultPromise: Promise<object> = Sample.dropIndex(createIndexResult);
+            const dropIndexResultPromise: Promise<object> = Sample.dropIndex(createIndexResult);
             expect(dropIndexResultPromise).toBeInstanceOf(Promise);
-            let dropIndexResult: object = await dropIndexResultPromise;
+            const dropIndexResult: object = await dropIndexResultPromise;
             expect(dropIndexResult).not.toBeUndefined();
 
             // ----- embeds -----
             class EmbeddedModel extends Model {
             }
 
-            let key: string = 'any';
-            let model: ModelClass = EmbeddedModel;
-            expect(Sample.embeds(key, model)).toBeUndefined()
+            const key = 'any';
+            const model: ModelClass = EmbeddedModel;
+            // expect(Sample.embeds(key, model)).toBeUndefined();
+            Sample.embeds(key, model); // $ExpectType void
         });
 
         it('base', async () => {
-            let database = new Database(URL);
+            const database = new Database(URL);
             await database.connect();
 
             class Sample extends Model {
-                constructor(fields?: Object) {
+                constructor(fields?: object) {
                     super(fields);
                 }
             }
@@ -317,198 +320,202 @@ describe('mongorito', () => {
 
             // ----- constructor -----
 
-            let fields: Object = {views: 5, comments: 2};
-            let model = new Sample(fields);
+            const fields: object = {views: 5, comments: 2};
+            const model = new Sample(fields);
 
             new Sample();
 
             // ----- collection -----
 
-            let collectionResult: string = model.collection();
+            const collectionResult: string = model.collection();
             expect(typeof collectionResult).toBe('string');
 
             // ----- getConnection -----
 
-            let getConnectionResultPromise: Promise<Db> = model.getConnection();
+            const getConnectionResultPromise: Promise<Db> = model.getConnection();
             expect(getConnectionResultPromise).toBeInstanceOf(Promise);
-            let getConnectionResult: Db = await getConnectionResultPromise;
+            const getConnectionResult: Db = await getConnectionResultPromise;
             expect(getConnectionResult).toBeInstanceOf(Db);
 
             // ----- getCollection -----
 
-            let getCollectionResultPromise: Promise<Collection<any>> = model.getCollection();
+            const getCollectionResultPromise: Promise<Collection<any>> = model.getCollection();
             expect(getCollectionResultPromise).toBeInstanceOf(Promise);
-            let getCollectionResult: Collection<any> = await getCollectionResultPromise;
+            const getCollectionResult: Collection<any> = await getCollectionResultPromise;
             expectToBeACollection(getCollectionResult);
 
             // ----- set -----
-            let key: string = 'attr';
-            let key2: string = 'attr2';
-            let key3: string = 'attr3';
+            const key = 'attr';
+            const key2 = 'attr2';
+            const key3 = 'attr3';
 
-            expect(model.set(key, 'val')).toBeUndefined();
-            expect(model.set({key2: 'val1', key3: 'val2'})).toBeUndefined();
+            // expect(model.set(key, 'val')).toBeUndefined();
+            model.set(key, 'val'); // $ExpectType void
+            // expect(model.set({key2: 'val1', key3: 'val2'})).toBeUndefined();
+            model.set({key2: 'val1', key3: 'val2'}); // $ExpectType void
 
             // ----- get -----
 
-            let getResult1: any = model.get(key);
+            const getResult1: any = model.get(key);
             expect(getResult1).not.toBeUndefined();
 
-            let getResult2: any = model.get();
+            const getResult2: any = model.get();
             expect(getResult2).not.toBeUndefined();
 
             // ----- unset -----
 
-            expect(model.unset(key)).toBeUndefined();
+            // expect(model.unset(key)).toBeUndefined();
+            model.unset(key); // $ExpectType void
 
-            let keys: string[] = [key2, key3];
-            expect(model.unset(keys)).toBeUndefined();
+            const keys: string[] = [key2, key3];
+            // expect(model.unset(keys)).toBeUndefined();
+            model.unset(keys); // $ExpectType void
 
             // ----- toJSON -----
 
-            let toJSONResult: object = model.toJSON();
+            const toJSONResult: object = model.toJSON();
             expect(toJSONResult).toBeInstanceOf(Object);
 
             // ----- isSaved -----
 
-            let isSavedResult: boolean = model.isSaved();
+            const isSavedResult: boolean = model.isSaved();
             expect(typeof isSavedResult).toBe('boolean');
 
             // ----- save -----
 
-            let save1ResultPromise: Promise<CreatedAction | UpdatedAction> = model.save();
+            const save1ResultPromise: Promise<CreatedAction | UpdatedAction> = model.save();
             expect(save1ResultPromise).toBeInstanceOf(Promise);
-            let save1Result: CreatedAction | UpdatedAction = await save1ResultPromise;
+            const save1Result: CreatedAction | UpdatedAction = await save1ResultPromise;
             expectToBeACreatedAction(save1Result);
 
-            let save2ResultPromise: Promise<CreatedAction | UpdatedAction> = model.save();
+            const save2ResultPromise: Promise<CreatedAction | UpdatedAction> = model.save();
             expect(save2ResultPromise).toBeInstanceOf(Promise);
-            let save2Result: CreatedAction | UpdatedAction = await save2ResultPromise;
+            const save2Result: CreatedAction | UpdatedAction = await save2ResultPromise;
             expectToBeAUpdatedAction(save2Result);
 
             // ----- increment -----
 
-            let incrementResultPromise1: Promise<any> = model.increment('views');
+            const incrementResultPromise1: Promise<any> = model.increment('views');
             expect(incrementResultPromise1).toBeInstanceOf(Promise);
-            let incrementResult1: any = await incrementResultPromise1;
+            const incrementResult1: any = await incrementResultPromise1;
             expectToBeARefreshedAction(incrementResult1);
 
-            let incrementResultPromise2: Promise<any> = model.increment('views', 2);
+            const incrementResultPromise2: Promise<any> = model.increment('views', 2);
             expect(incrementResultPromise2).toBeInstanceOf(Promise);
-            let incrementResult2: any = await incrementResultPromise2;
+            const incrementResult2: any = await incrementResultPromise2;
             expectToBeARefreshedAction(incrementResult2);
 
-            let incrementResultPromise3: Promise<any> = model.increment({views: 10, comments: 3});
+            const incrementResultPromise3: Promise<any> = model.increment({views: 10, comments: 3});
             expect(incrementResultPromise3).toBeInstanceOf(Promise);
-            let incrementResult3: any = await incrementResultPromise3;
+            const incrementResult3: any = await incrementResultPromise3;
             expectToBeARefreshedAction(incrementResult3);
 
             // ----- refresh -----
 
-            let refreshResultPromise: Promise<RefreshedAction> = model.refresh();
+            const refreshResultPromise: Promise<RefreshedAction> = model.refresh();
             expect(refreshResultPromise).toBeInstanceOf(Promise);
-            let refreshResult: RefreshedAction = await refreshResultPromise;
+            const refreshResult: RefreshedAction = await refreshResultPromise;
             expectToBeARefreshedAction(refreshResult);
 
             // ----- remove -----
 
-            let removeResultPromise: Promise<RemovedAction> = model.remove();
+            const removeResultPromise: Promise<RemovedAction> = model.remove();
             expect(removeResultPromise).toBeInstanceOf(Promise);
-            let removeResult: RemovedAction = await removeResultPromise;
+            const removeResult: RemovedAction = await removeResultPromise;
             expectToBeARemovedAction(removeResult);
         });
 
         it('Query', async () => {
-            let database = new Database(URL);
+            const database = new Database(URL);
             await database.connect();
 
             class Sample extends Model {
-                constructor(fields?: Object) {
+                constructor(fields?: object) {
                     super(fields);
                 }
             }
 
             database.register(Sample);
 
-            let cas = new Sample();
+            const cas = new Sample();
             await cas.save();
-            let ID = cas.get('_id');
+            const ID = cas.get('_id');
 
-            let query: object = {_id: ID};
+            const query: object = {_id: ID};
 
             // ----- find -----
 
-            let findResultPromise1: Promise<Sample[]> = Sample.find();
+            const findResultPromise1: Promise<Sample[]> = Sample.find();
             expect(findResultPromise1).toBeInstanceOf(Promise);
-            let findResult1: Sample[] = await findResultPromise1;
+            const findResult1: Sample[] = await findResultPromise1;
             expect(Array.isArray(findResult1)).toBe(true);
             expect(findResult1[0]).toBeInstanceOf(Sample);
 
-            let findResultPromise2: Promise<Sample[]> = Sample.find(query);
+            const findResultPromise2: Promise<Sample[]> = Sample.find(query);
             expect(findResultPromise2).toBeInstanceOf(Promise);
-            let findResult2: Sample[] = await findResultPromise2;
+            const findResult2: Sample[] = await findResultPromise2;
             expect(Array.isArray(findResult2)).toBe(true);
             expect(findResult2[0]).toBeInstanceOf(Sample);
 
             // ----- findOne -----
 
-            let findOneResultPromise1: Promise<Sample | null> = Sample.findOne();
+            const findOneResultPromise1: Promise<Sample | null> = Sample.findOne();
             expect(findOneResultPromise1).toBeInstanceOf(Promise);
-            let findOneResult1: Sample | null = await findOneResultPromise1;
+            const findOneResult1: Sample | null = await findOneResultPromise1;
             expect(findOneResult1).toBeInstanceOf(Sample);
 
-            let findOneResultPromise2: Promise<Sample | null> = Sample.findOne(query);
+            const findOneResultPromise2: Promise<Sample | null> = Sample.findOne(query);
             expect(findOneResultPromise2).toBeInstanceOf(Promise);
-            let findOneResult2: Sample | null = await findOneResultPromise2;
+            const findOneResult2: Sample | null = await findOneResultPromise2;
             expect(findOneResult2).toBeInstanceOf(Sample);
 
             // ----- findById -----
 
-            let findByIdResultPromise: Promise<Sample | null> = Sample.findById(ID);
+            const findByIdResultPromise: Promise<Sample | null> = Sample.findById(ID);
             expect(findByIdResultPromise).toBeInstanceOf(Promise);
-            let findByIdResult: Sample | null = await findByIdResultPromise;
+            const findByIdResult: Sample | null = await findByIdResultPromise;
             expect(findByIdResult).toBeInstanceOf(Sample);
 
             await Sample.findById(ID.toString());
 
             // ----- count -----
 
-            let countResultPromise: Promise<number> = Sample.count();
+            const countResultPromise: Promise<number> = Sample.count();
             expect(countResultPromise).toBeInstanceOf(Promise);
-            let countResult: number = await countResultPromise;
+            const countResult: number = await countResultPromise;
             expect(typeof countResult).toBe('number');
 
             await Sample.count(query);
 
             // ----- sort -----
 
-            let sortResult1: Query = Sample.sort('field-test');
+            const sortResult1: Query = Sample.sort('field-test');
             expectToBeAQuery(sortResult1);
 
-            let sortResult2: Query = Sample.sort({field: 1, test: -1});
+            const sortResult2: Query = Sample.sort({field: 1, test: -1});
             expectToBeAQuery(sortResult2);
 
             // ----- include -----
 
-            let includeResult1: Query = Sample.include('field-test');
+            const includeResult1: Query = Sample.include('field-test');
             expectToBeAQuery(includeResult1);
 
-            let includeResult2: Query = Sample.include({field: 1, test: -1});
+            const includeResult2: Query = Sample.include({field: 1, test: -1});
             expectToBeAQuery(includeResult2);
 
             // ----- exclude -----
 
-            let excludeResult1: Query = Sample.exclude('field-test');
+            const excludeResult1: Query = Sample.exclude('field-test');
             expectToBeAQuery(excludeResult1);
 
-            let excludeResult2: Query = Sample.exclude({field: 1, test: -1});
+            const excludeResult2: Query = Sample.exclude({field: 1, test: -1});
             expectToBeAQuery(excludeResult2);
 
             // ----- remove -----
 
-            let removeResultPromise: Promise<object> = Sample.remove();
+            const removeResultPromise: Promise<object> = Sample.remove();
             expect(removeResultPromise).toBeInstanceOf(Promise);
-            let removeResult: object = await removeResultPromise;
+            const removeResult: object = await removeResultPromise;
             expect(removeResult).toBeInstanceOf(Object);
 
             await Sample.remove(query);
@@ -516,37 +523,37 @@ describe('mongorito', () => {
     });
 
     it('Timestamp', async () => {
-        let obj: Timestamp = new Timestamp(1, 9);
+        const obj: Timestamp = new Timestamp(1, 9);
         expect(obj).toBeInstanceOf(Timestamp);
         expect(obj).toBeInstanceOf(MongodbTimestamp);
     });
 
     it('ObjectId', async () => {
-        let obj: ObjectId = new ObjectId();
+        const obj: ObjectId = new ObjectId();
         expect(obj).toBeInstanceOf(ObjectId);
         expect(obj).toBeInstanceOf(MongodbObjectId);
     });
 
     it('MinKey', async () => {
-        let obj: MinKey = new MinKey();
+        const obj: MinKey = new MinKey();
         expect(obj).toBeInstanceOf(MinKey);
         expect(obj).toBeInstanceOf(MongodbMinKey);
     });
 
     it('MaxKey', async () => {
-        let obj: MaxKey = new MaxKey();
+        const obj: MaxKey = new MaxKey();
         expect(obj).toBeInstanceOf(MaxKey);
         expect(obj).toBeInstanceOf(MongodbMaxKey);
     });
 
     it('DBRef', async () => {
-        let obj: DBRef = new DBRef('namespace', new ObjectId());
+        const obj: DBRef = new DBRef('namespace', new ObjectId());
         expect(obj).toBeInstanceOf(DBRef);
         expect(obj).toBeInstanceOf(MongodbDBRef);
     });
 
     it('Long', async () => {
-        let obj: Long = new Long(1, 9);
+        const obj: Long = new Long(1, 9);
         expect(obj).toBeInstanceOf(Long);
         expect(obj).toBeInstanceOf(MongodbLong);
     });
diff --git a/types/mongorito/tslint.json b/types/mongorito/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/mongorito/tslint.json
+++ b/types/mongorito/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 fd0ba37df78fffc857c6b36df7205a445488ee11 Mon Sep 17 00:00:00 2001
From: arusakov <a_s_rusakov@mail.ru>
Date: Tue, 27 Feb 2018 16:17:17 +0300
Subject: [PATCH 328/388] bson: add cacheHexString boolean flag to ObjectID

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

diff --git a/types/bson/bson-tests.ts b/types/bson/bson-tests.ts
index d18332fe9f..ebdd8a19c3 100644
--- a/types/bson/bson-tests.ts
+++ b/types/bson/bson-tests.ts
@@ -1,5 +1,8 @@
 import * as bson from 'bson';
 
+// enable hex string caching
+bson.ObjectID.cacheHexString = true
+
 let BSON = new bson.BSON();
 let Long = bson.Long;
 
diff --git a/types/bson/index.d.ts b/types/bson/index.d.ts
index 380e6e380c..817f50374d 100644
--- a/types/bson/index.d.ts
+++ b/types/bson/index.d.ts
@@ -135,6 +135,10 @@ export class ObjectID {
     constructor(id?: string | number | ObjectID);
     /** The generation time of this ObjectID instance */
     generationTime: number;
+    /**
+     * If true cache the hex string representation of ObjectID instance
+     */
+    static cacheHexString?: boolean;
     /**
      * Creates an ObjectID from a hex string representation of an ObjectID.
      * @param {string} hexString create a ObjectID from a passed in 24 byte hexstring.

From 86cb9449d542bc3fbe06bbcec5a5612372cf2117 Mon Sep 17 00:00:00 2001
From: arusakov <a_s_rusakov@mail.ru>
Date: Tue, 27 Feb 2018 16:59:37 +0300
Subject: [PATCH 329/388] clear

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

diff --git a/types/bson/index.d.ts b/types/bson/index.d.ts
index 817f50374d..6fe0473694 100644
--- a/types/bson/index.d.ts
+++ b/types/bson/index.d.ts
@@ -135,9 +135,7 @@ export class ObjectID {
     constructor(id?: string | number | ObjectID);
     /** The generation time of this ObjectID instance */
     generationTime: number;
-    /**
-     * If true cache the hex string representation of ObjectID instance
-     */
+    /** If true cache the hex string representation of this ObjectID instance */
     static cacheHexString?: boolean;
     /**
      * Creates an ObjectID from a hex string representation of an ObjectID.

From e1aa4e4ce4dcef7031e2a50d70e8c3000b470f76 Mon Sep 17 00:00:00 2001
From: arusakov <a_s_rusakov@mail.ru>
Date: Tue, 27 Feb 2018 17:05:45 +0300
Subject: [PATCH 330/388] fix typo

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

diff --git a/types/bson/index.d.ts b/types/bson/index.d.ts
index 6fe0473694..24372ff0f5 100644
--- a/types/bson/index.d.ts
+++ b/types/bson/index.d.ts
@@ -135,7 +135,7 @@ export class ObjectID {
     constructor(id?: string | number | ObjectID);
     /** The generation time of this ObjectID instance */
     generationTime: number;
-    /** If true cache the hex string representation of this ObjectID instance */
+    /** If true cache the hex string representation of ObjectID */
     static cacheHexString?: boolean;
     /**
      * Creates an ObjectID from a hex string representation of an ObjectID.

From 9b7bc38ae9482792b68c11365d0a965faea446da Mon Sep 17 00:00:00 2001
From: mizdra <pp.mizdra@gmail.com>
Date: Wed, 28 Feb 2018 00:05:36 +0900
Subject: [PATCH 331/388] Fix property types of <Brush />

---
 types/recharts/index.d.ts         | 8 ++++----
 types/recharts/recharts-tests.tsx | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index ae13044035..5de42776b9 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -219,10 +219,10 @@ export interface BrushProps {
     className?: string;
     fill?: string;
     stroke?: string;
-    x: number;
-    y: number;
-    width: number;
-    height: number;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
     travellerWidth?: number;
     padding?: Partial<Margin>;
     dataKey?: DataKey;
diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 27a1c4e87d..e052d692a5 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -4,7 +4,7 @@ import * as ReactDOM from 'react-dom';
 import {
     CartesianGrid, Line, LineChart, PieChart, Pie,
     Sector, XAxis, YAxis, Tooltip, ReferenceLine,
-    ReferenceArea, ResponsiveContainer, Label
+    ReferenceArea, ResponsiveContainer, Label, Brush
 } from 'recharts';
 
 interface ComponentState {
@@ -98,6 +98,7 @@ class Component extends React.Component<{}, ComponentState> {
                     <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"

From 83d106420f530ba3c4f127809b321bcd480bbe25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anderson=20Fria=C3=A7a?= <afriacaxd@gmail.com>
Date: Tue, 27 Feb 2018 11:30:44 -0400
Subject: [PATCH 332/388] Types for JQuery Appear (#23896)

* Types for JQuery Appear

* Adjustments

* Adjustments
---
 types/jquery.appear/index.d.ts             | 37 ++++++++++++++++++++++
 types/jquery.appear/jquery.appear-tests.ts | 19 +++++++++++
 types/jquery.appear/tsconfig.json          | 25 +++++++++++++++
 types/jquery.appear/tslint.json            |  1 +
 4 files changed, 82 insertions(+)
 create mode 100644 types/jquery.appear/index.d.ts
 create mode 100644 types/jquery.appear/jquery.appear-tests.ts
 create mode 100644 types/jquery.appear/tsconfig.json
 create mode 100644 types/jquery.appear/tslint.json

diff --git a/types/jquery.appear/index.d.ts b/types/jquery.appear/index.d.ts
new file mode 100644
index 0000000000..faa16b3a8f
--- /dev/null
+++ b/types/jquery.appear/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for JQuery Appear 1.0
+// Project: https://github.com/bas2k/jquery.appear
+// 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<T> {
+    /**
+     * Data to pass into callback
+     */
+    data?: T;
+
+    /**
+     * Callback is called only in first appear
+     */
+    one?: boolean;
+
+    /**
+     * X accuracy
+     */
+    accX?: number;
+
+    /**
+     * Y accuracy
+     */
+    accY?: number;
+}
+declare global {
+    interface JQuery {
+        /**
+         * Initialize appear plugin
+         */
+        appear<T>(callback: ((element: HTMLElement, data: T) => void), options?: Options<T>): JQuery;
+    }
+}
diff --git a/types/jquery.appear/jquery.appear-tests.ts b/types/jquery.appear/jquery.appear-tests.ts
new file mode 100644
index 0000000000..ebd0e473d9
--- /dev/null
+++ b/types/jquery.appear/jquery.appear-tests.ts
@@ -0,0 +1,19 @@
+import { Options } from "jquery.appear";
+
+$(document).ready(() => {
+    // basic usage
+    $('#foo').appear(() => {
+        $('#text').text('Appeared');
+    });
+
+    // with options
+    const options: Options<string> = {
+        data: 'test',
+        one: false,
+        accX: 50,
+        accY: 100
+    };
+    $('#foo').appear<string>((element: HTMLElement, data: string) => {
+        $(element).text(data);
+    }, options);
+});
diff --git a/types/jquery.appear/tsconfig.json b/types/jquery.appear/tsconfig.json
new file mode 100644
index 0000000000..1c58b6e113
--- /dev/null
+++ b/types/jquery.appear/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.appear-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery.appear/tslint.json b/types/jquery.appear/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery.appear/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From 757b18759a6b59f8824ce528d1b4c14a436764ce Mon Sep 17 00:00:00 2001
From: twawszczak <tadeusz.wawszczak@onet.eu>
Date: Tue, 27 Feb 2018 16:33:26 +0100
Subject: [PATCH 333/388] [smtp-server] correct type of
 SMTPServerSession.remoteAddress property (#23810)

* correct type of SMTPServerSession.remoteAddress property

* add SMTPServerSession.remotePort property type

* add secure flag type to SMTPServerSession

* envelope.mailFrom property could be false
---
 types/smtp-server/index.d.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/types/smtp-server/index.d.ts b/types/smtp-server/index.d.ts
index 6e71373260..bbcee547e6 100644
--- a/types/smtp-server/index.d.ts
+++ b/types/smtp-server/index.d.ts
@@ -74,7 +74,11 @@ export interface SMTPServerSession {
     /**
      * the IP address for the connected client
      */
-    remoteAddress: SMTPServerAddress;
+    remoteAddress: string;
+    /**
+     * port number the connected client
+     */
+    remotePort: number;
     /**
      * reverse resolved hostname for remoteAddress
      */
@@ -91,6 +95,11 @@ export interface SMTPServerSession {
      * Envelope Object
      */
     envelope: SMTPServerEnvelope;
+    /**
+     *  If true, then the connection is using TLS
+     */
+    secure: boolean;
+
     transmissionType: string;
 
     tlsOptions: tls.TlsOptions;
@@ -100,7 +109,7 @@ export interface SMTPServerEnvelope {
     /**
      * includes an address object or is set to false
      */
-    mailFrom: SMTPServerAddress;
+    mailFrom: SMTPServerAddress | false;
     /**
      * includes an array of address objects
      */

From b728b61adbcfa384034c32b761c7bb687afcbdf6 Mon Sep 17 00:00:00 2001
From: Glen M <glencfl@gmail.com>
Date: Tue, 27 Feb 2018 10:33:44 -0500
Subject: [PATCH 334/388] atom: add the linterName property to Linter Message
 (#23804)

---
 types/atom/linter/index.d.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/types/atom/linter/index.d.ts b/types/atom/linter/index.d.ts
index 79fc397ab8..72f378af26 100644
--- a/types/atom/linter/index.d.ts
+++ b/types/atom/linter/index.d.ts
@@ -5,6 +5,10 @@
 
 import { Disposable, Point, Range, TextEditor } from "../index";
 
+export interface Config {
+    name: string;
+}
+
 export interface ReplacementSolution {
     title?: string;
     position: Range;
@@ -60,6 +64,9 @@ export interface Message {
      *  do things like HTTP requests.
      */
     description?: string|(() => Promise<string>|string);
+
+    /** Optionally override the displayed linter name. Defaults to provider name. */
+    linterName?: string;
 }
 
 export interface IndieDelegate {
@@ -73,10 +80,14 @@ export interface IndieDelegate {
     dispose(): void;
 }
 
+export type LintResult = Message[] | null;
+
 export interface LinterProvider {
     name: string;
     scope: "file"|"project";
     lintsOnChange: boolean;
     grammarScopes: string[];
-    lint(textEditor: TextEditor): Message[]|null|Promise<Message[]|null>;
+    lint(editor: TextEditor): LintResult | Promise<LintResult>;
 }
+
+export type IndieProvider = (register: (config: Config) => IndieDelegate) => void;

From 506d25b0c4588ed98e6f3b1ff30e9a87c7a343c3 Mon Sep 17 00:00:00 2001
From: Bleser <Bleser92@gmail.com>
Date: Tue, 27 Feb 2018 20:34:45 +0500
Subject: [PATCH 335/388] Nightmare add timeout types (#23840)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add timeout fields in options

* Add test for tiomeout

* Edit 'definitions by'

* Вeleting unnecessary files.
---
 types/nightmare/index.d.ts         |  5 ++
 types/nightmare/nightmare-tests.ts | 86 +++++++++++++++++++-----------
 2 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/types/nightmare/index.d.ts b/types/nightmare/index.d.ts
index 737137f22e..061f22bd10 100644
--- a/types/nightmare/index.d.ts
+++ b/types/nightmare/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/segmentio/nightmare
 // Definitions by: horiuchi <https://github.com/horiuchi>
 //                 Sam Yang <https://github.com/samyang-au>
+//                 Bleser   <https://github.com/Bleser92>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -132,6 +133,10 @@ declare class Nightmare {
 declare namespace Nightmare {
     export interface IConstructorOptions {
         timeout?: any;  // number | string;
+        waitTimeout?:number //in ms
+        gotoTimeout?:number
+        pollInterval?:number
+        executionTimeout?:number
         interval?: any; // number | string;
         port?: number;
         weak?: boolean;
diff --git a/types/nightmare/nightmare-tests.ts b/types/nightmare/nightmare-tests.ts
index 1dfe655c94..7eb376b996 100644
--- a/types/nightmare/nightmare-tests.ts
+++ b/types/nightmare/nightmare-tests.ts
@@ -4,27 +4,27 @@ import Nightmare = require("nightmare");
 
 new Nightmare()
   .goto('http://yahoo.com')
-    .type('input[title="Search"]', 'github nightmare')
-    .click('.searchsubmit')
-    .run((err: any, nightmare: Nightmare) => {
-      if (err) return console.log(err);
-      console.log('Done!');
-    });
+  .type('input[title="Search"]', 'github nightmare')
+  .click('.searchsubmit')
+  .run((err: any, nightmare: Nightmare) => {
+    if (err) return console.log(err);
+    console.log('Done!');
+  });
 
 new Nightmare()
   .goto('http://yahoo.com')
-    .type('input[title="Search"]', 'github nightmare')
-    .click('.searchsubmit')
-    .wait('.url.breadcrumb')
-    .evaluate(() => {
-      return (<HTMLElement>document.querySelector('.url.breadcrumb')).innerText;
-    }, (breadcrumb: string) => {
-      // expect(breadcrumb).to.equal('github.com');
-    })
-    .run((err: any, nightmare: Nightmare) => {});
+  .type('input[title="Search"]', 'github nightmare')
+  .click('.searchsubmit')
+  .wait('.url.breadcrumb')
+  .evaluate(() => {
+    return (<HTMLElement>document.querySelector('.url.breadcrumb')).innerText;
+  }, (breadcrumb: string) => {
+    // expect(breadcrumb).to.equal('github.com');
+  })
+  .run((err: any, nightmare: Nightmare) => { });
 
 
-var done = (err: any) => {};
+var done = (err: any) => { };
 
 new Nightmare()
   .goto('http://www.google.com/')
@@ -141,7 +141,7 @@ new Nightmare()
     };
   }, function (coordinates) {
   })
-  .scrollTo(100,50)
+  .scrollTo(100, 50)
   .evaluate(function () {
     return {
       top: document.body.scrollTop,
@@ -174,12 +174,12 @@ new Nightmare()
 
 new Nightmare()
   .goto('http://yahoo.com')
-  .screenshot('test/test.png', { x: 10, y: 5, width: 10, height: 10})
+  .screenshot('test/test.png', { x: 10, y: 5, width: 10, height: 10 })
   .run(done);
 
 new Nightmare()
   .goto('http://yahoo.com')
-  .screenshot({ x: 10, y: 5, width: 10, height: 10}, (err, buffer) => {
+  .screenshot({ x: 10, y: 5, width: 10, height: 10 }, (err, buffer) => {
     console.log(Buffer.isBuffer(buffer));
   })
   .run(done);
@@ -197,7 +197,7 @@ new Nightmare()
 
 var seconds = function () {
   var gifs = document.querySelectorAll('img');
-  var split = (<HTMLImageElement>gifs[gifs.length-2]).src.split('.gif')[0];
+  var split = (<HTMLImageElement>gifs[gifs.length - 2]).src.split('.gif')[0];
   var seconds = split.split('.com/c')[1];
   return parseInt(seconds, 10);
 };
@@ -209,8 +209,8 @@ new Nightmare()
 var seconds = function () {
   var text = document.querySelectorAll('b')[0].textContent;
   var splits = text.split(/\s/);
-  var seconds = splits[splits.length-2].split(':')[2];
-  return parseInt(seconds, 10)%10;
+  var seconds = splits[splits.length - 2].split(':')[2];
+  return parseInt(seconds, 10) % 10;
 };
 new Nightmare()
   .goto('http://www.whattimeisit.com/')
@@ -218,8 +218,8 @@ new Nightmare()
   .run(done);
 
 new Nightmare({
-    timeout: 1000
-  })
+  timeout: 1000
+})
   .on('timeout', function (msg) {
   })
   .goto('http://www.google.com/')
@@ -262,15 +262,15 @@ new Nightmare()
   .run(done);
 
 new Nightmare()
-  .authentication('my','auth')
+  .authentication('my', 'auth')
   .goto('http://httpbin.org/basic-auth/my/auth')
   .evaluate(function () {
     return document.body.innerHTML;
-  }, function (data){
+  }, function (data) {
   })
   .run(done);
 
-var size = { width : 400, height: 1000 };
+var size = { width: 400, height: 1000 };
 new Nightmare()
   .viewport(size.width, size.height)
   .goto('http://www.wikipedia.org/')
@@ -316,8 +316,8 @@ function search(term: string) {
   return function (nightmare: Nightmare) {
     nightmare
       .goto('http://yahoo.com')
-        .type('.input-query', term)
-        .click('.searchsubmit')
+      .type('.input-query', term)
+      .click('.searchsubmit')
       .wait();
   };
 }
@@ -335,7 +335,7 @@ new Nightmare()
   .use(testTitle('test term'))
   .run(done);
 
-new Nightmare({show: true});
+new Nightmare({ show: true });
 
 new Nightmare()
   .goto('http://google.com', { bogus: 'foo' })
@@ -366,4 +366,28 @@ new Nightmare()
   .click('a[href="/segmentio/nightmare/archive/master.zip"]')
   .download('/some/other/path/master.zip');
 
-new Nightmare({show: true, openDevTools: {mode: 'detach'}});
+new Nightmare({ show: true, openDevTools: { mode: 'detach' } });
+
+
+new Nightmare({ waitTimeout: 1000 })
+  .goto("https//google.com")
+  .wait(".really-not-real")
+
+
+new Nightmare({ gotoTimeout: 10000 })
+  .goto("https://45.56.178.93/")
+
+
+new Nightmare({ executionTimeout: 1000 })
+  .goto("https//google.com")
+  .evaluate(() => {
+    new Promise((resolve, reject) => {
+      setTimeout(() => {
+        resolve()
+      }, 2000)
+    })
+  })
+
+
+
+

From 75d01efe7edf13c145fa9e5c0f6f924552bece64 Mon Sep 17 00:00:00 2001
From: Chen Junda <viccrubs@users.noreply.github.com>
Date: Tue, 27 Feb 2018 23:35:26 +0800
Subject: [PATCH 336/388] Adds definitions for react-svg (#23905)

* adds definition for react-svg

* changed typescript version to 2.6

* make it work with require

* fixed lint error
---
 types/react-svg/index.d.ts          | 40 +++++++++++++++++++++++++++++
 types/react-svg/react-svg-tests.tsx | 14 ++++++++++
 types/react-svg/tsconfig.json       | 24 +++++++++++++++++
 types/react-svg/tslint.json         |  1 +
 4 files changed, 79 insertions(+)
 create mode 100644 types/react-svg/index.d.ts
 create mode 100644 types/react-svg/react-svg-tests.tsx
 create mode 100644 types/react-svg/tsconfig.json
 create mode 100644 types/react-svg/tslint.json

diff --git a/types/react-svg/index.d.ts b/types/react-svg/index.d.ts
new file mode 100644
index 0000000000..31a4533f57
--- /dev/null
+++ b/types/react-svg/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for react-svg 2.2
+// Project: https://github.com/atomic-app/react-svg
+// Definitions by: Chen Junda <https://github.com/viccrubs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from "react";
+
+declare class ReactSVG extends React.Component<ReactSVG.ReactSVGProps> {}
+
+export = ReactSVG;
+
+declare namespace ReactSVG {
+  interface ReactSVGProps {
+    /**
+     * Path to the SVG.
+     */
+    path: string;
+    /**
+     * Function to call after the SVG is injected. Receives the newly injected SVG DOM element as a parameter. Defaults to null.
+     */
+    callback?: (dom: SVGSVGElement) => void;
+    /**
+     * Class name to be added to the SVG. Defaults to ''.
+     */
+    className?: string;
+    /**
+     * Class name to be added to the wrapping div. Defaults to ''.
+     */
+    wrapperClassName?: string;
+    /**
+     * Run any script blocks found in the SVG (always, once, or never). Defaults to never.
+     */
+    evalScripts?: 'always' | 'once' | 'never';
+    /**
+     * Inline styles to be added to the SVG. Defaults to {}.
+     */
+    style?: any;
+  }
+}
diff --git a/types/react-svg/react-svg-tests.tsx b/types/react-svg/react-svg-tests.tsx
new file mode 100644
index 0000000000..338698b036
--- /dev/null
+++ b/types/react-svg/react-svg-tests.tsx
@@ -0,0 +1,14 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import ReactSVG = require("react-svg");
+
+const complete = <ReactSVG
+    path={"atomic.svg"}
+    callback={svg => {}}
+    className="class-name"
+    wrapperClassName="wrapper-class-name"
+    evalScripts="once"
+    style={{}}
+  />;
+
+const minimal = <ReactSVG path={"test.svg"}/>;
diff --git a/types/react-svg/tsconfig.json b/types/react-svg/tsconfig.json
new file mode 100644
index 0000000000..43b8246d54
--- /dev/null
+++ b/types/react-svg/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "jsx": "react",
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-svg-tests.tsx"
+    ]
+}
diff --git a/types/react-svg/tslint.json b/types/react-svg/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-svg/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 62f618c5f3d18a9683c4495f54882503c5d20b93 Mon Sep 17 00:00:00 2001
From: Daniel Gronberg <daniel.gronberg@symphony.com>
Date: Tue, 27 Feb 2018 16:45:15 +0100
Subject: [PATCH 337/388] Added null as valid argument type to
 ssh2-sftp-client::get

---
 types/ssh2-sftp-client/index.d.ts                | 2 +-
 types/ssh2-sftp-client/ssh2-sftp-client-tests.ts | 3 ++-
 types/ssh2-sftp-client/tsconfig.json             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/ssh2-sftp-client/index.d.ts b/types/ssh2-sftp-client/index.d.ts
index a91725d7a4..a0133961d8 100644
--- a/types/ssh2-sftp-client/index.d.ts
+++ b/types/ssh2-sftp-client/index.d.ts
@@ -10,7 +10,7 @@ export = sftp;
 declare class sftp {
   connect(options: ssh2.ConnectConfig): Promise<void>;
   list(remoteFilePath: string): Promise<sftp.FileInfo[]>;
-  get(remoteFilePath: string, useCompression?: boolean, encoding?: string): Promise<NodeJS.ReadableStream>;
+  get(remoteFilePath: string, useCompression?: boolean, encoding?: string | null): Promise<NodeJS.ReadableStream>;
   put(input: string | Buffer | NodeJS.ReadableStream, remoteFilePath: string, useCompression?: boolean, encoding?: string): Promise<void>;
   mkdir(remoteFilePath: string, recursive?: boolean): Promise<void>;
   rmdir(remoteFilePath: string, recursive?: boolean): Promise<void>;
diff --git a/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts b/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
index a8c774c5d3..67d2d35826 100644
--- a/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
+++ b/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
@@ -12,7 +12,8 @@ client.connect({
 client.list('/remote/path').then(() => null);
 
 client.get('/remote/path').then(stream => stream.read(0));
-client.get('/remote/path', true, 'binary').then(stream => stream.read(0));
+client.get('/remote/path', true, 'utf8').then(stream => stream.read(0));
+client.get('/remote/path', true, null).then(stream => stream.read(0));
 
 client.put('/local/path', '/remote/path').then(() => null);
 client.put(new Buffer('content'), '/remote/path').then(() => null);
diff --git a/types/ssh2-sftp-client/tsconfig.json b/types/ssh2-sftp-client/tsconfig.json
index 809639cd51..d714a8d1b4 100644
--- a/types/ssh2-sftp-client/tsconfig.json
+++ b/types/ssh2-sftp-client/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [

From 37dc307d9e9b09e5445fc94b2a78238e02e2e7ba Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Tue, 27 Feb 2018 09:58:46 -0800
Subject: [PATCH 338/388] Update CODEOWNERS (#23955)

---
 .github/CODEOWNERS | 468 +++++++++++++++++++++++++++++++--------------
 1 file changed, 327 insertions(+), 141 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index be7e9011fd..ec7763f89a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,4 @@
 /types/abbrev/                                  @BendingBender
-/types/ably/                                    @ably
 /types/abs/                                     @AyaMorisawa
 /types/absolute/                                @AyaMorisawa
 /types/acc-wizard/                              @cyrilschumacher
@@ -14,8 +13,11 @@
 /types/activex-access/                          @zspitz
 /types/activex-adodb/                           @zspitz
 /types/activex-dao/                             @zspitz
+/types/activex-diskquota/                       @zspitz
 /types/activex-excel/                           @zspitz
+/types/activex-faxcomexlib/                     @zspitz
 /types/activex-infopath/                        @zspitz
+/types/activex-iwshruntimelibrary/              @zspitz
 /types/activex-libreoffice/                     @zspitz
 /types/activex-msforms/                         @zspitz
 /types/activex-mshtml/                          @zspitz
@@ -24,6 +26,8 @@
 /types/activex-outlook/                         @zspitz
 /types/activex-powerpoint/                      @zspitz
 /types/activex-scripting/                       @zspitz
+/types/activex-shdocvw/                         @zspitz
+/types/activex-shell/                           @zspitz
 /types/activex-stdole/                          @zspitz
 /types/activex-vbide/                           @zspitz
 /types/activex-wia/                             @zspitz
@@ -36,7 +40,7 @@
 /types/agenda/                                  @meirgottlieb
 /types/aggregate-error/                         @BendingBender
 /types/alertify/                                @jjeffery
-/types/alexa-sdk/                               @petebeegle @hoo29 @pascalwhoop @blforce @rk-7
+/types/alexa-sdk/                               @petebeegle @hoo29 @pascalwhoop @blforce @rk-7 @alexmalcoci
 /types/alexa-voice-service/                     @dolanmiu
 /types/algebra.js/                              @CaselIT
 /types/algoliasearch/                           @cbaptiste @haroenv @aherve
@@ -49,7 +53,7 @@
 /types/amqp/                                    @seikho @jonnysparkplugs
 /types/amqp-rpc/                                @wokim
 /types/amqplib/                                 @mnahkies @abreits @nfantone
-/types/analytics-node/                          @fongandrew
+/types/analytics-node/                          @fongandrew @thomasthiebaud
 /types/angular/                                 @diegovilar @thorn0 @calebstdenis @leonard-thieu
 /types/angular-agility/                         @rolandzwaga
 /types/angular-animate/                         @michelsalib @adidahiya @rasch @codyschaaf
@@ -136,12 +140,14 @@
 /types/api-error-handler/                       @tkrotoff
 /types/apigee-access/                           @CasperSkydt
 /types/apollo-codegen/                          @bradleyayers
+/types/app-root-dir/                            @chenyang-biu
 /types/app-root-path/                           @shantmarouti
 /types/appdmg/                                  @unindented
 /types/appframework/                            @kyo-ago
 /types/applepayjs/                              @martincostello
 /types/appletvjs/                               @brainded
 /types/applicationinsights-js/                  @kamilszostak
+/types/aqb/                                     @Athenkosi-Mase
 /types/arbiter/                                 @arash16
 /types/arcgis-js-api/v3/                        @Esri
 /types/arcgis-js-api/                           @Esri
@@ -167,15 +173,16 @@
 /types/aspnet-identity-pw/                      @jt000
 /types/assert-equal-jsx/                        @seryl
 /types/assert-plus/                             @KostyaTretyak
-/types/assertion-error/                         @Bartvds
 /types/assertsharp/                             @brunolm
 /types/assets-webpack-plugin/                   @kryops
 /types/async/                                   @borisyankov @kern0 @Penryn @fenying @pascalmartin
 /types/async-cache/                             @BendingBender
-/types/async-lock/                              @elisee
+/types/async-lock/                              @elisee @afharo @rhymmor
 /types/async-polling/                           @Goldsmith42
+/types/async-retry/                             @albertywu
 /types/async.nexttick/                          @pyrho
 /types/asynciterator/                           @rubensworks
+/types/atlaskit__button/                        @dijimsta
 /types/atmosphere.js/                           @toedter @Mory1879
 /types/atom/                                    @GlenCFL @smhxx @lierdakil
 /types/atom-keymap/                             @GlenCFL
@@ -186,7 +193,7 @@
 /types/auth0-angular/                           @homesar
 /types/auth0-js/v7/                             @advancedrei
 /types/auth0-js/                                @adrianchia @mdurrant @peterblazejewicz
-/types/auth0-lock/                              @carusology @goldcaddy77
+/types/auth0-lock/                              @carusology @goldcaddy77 @lfaudreejr
 /types/auth0.widget/                            @advancedrei
 /types/auto-launch/                             @rhysd @unindented
 /types/auto-sni/                                @janwo
@@ -194,10 +201,11 @@
 /types/autolinker/                              @leonyu
 /types/autoprefixer/                            @odnamrataizem
 /types/autosize/                                @kingdango @keika299 @NeekSandhu
+/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
-/types/aws-serverless-express/                  @threesquared @jcaffey @mattmeye
+/types/aws-lambda/                              @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase
+/types/aws-serverless-express/                  @threesquared @jcaffey @mattmeye @albertovasquez
 /types/aws4/                                    @ajcrites
 /types/axel/                                    @ruslan-molodyko
 /types/azure/                                   @AndrewGaspar @antiveeranna @SomaticIT
@@ -237,6 +245,7 @@
 /types/base-x/                                  @chrootsu
 /types/base16/                                  @alechill
 /types/base64-js/                               @pe8ter
+/types/base64topdf/                             @lucasriondel
 /types/bases/                                   @harikv
 /types/bash-glob/                               @mrmlnc
 /types/basic-auth/                              @moonpyk @vesse
@@ -267,6 +276,7 @@
 /types/bip39/                                   @micksatana
 /types/bit-array/                               @mudkipme
 /types/bitcoinjs-lib/                           @mhegazy @dlebrecht @rbuckton @micksatana @youssefgh
+/types/bitcore-lib/                             @lautarodragan
 /types/bittorrent-protocol/                     @feross @tlaziuk
 /types/bitwise-xor/                             @rogierschouten
 /types/bl/                                      @Bartvds
@@ -295,8 +305,10 @@
 /types/bootbox/                                 @vbortone @konpikwastaken @kanup @icereed @trodi @stannynuytkens @renjfk
 /types/bootpag/                                 @rdeneau
 /types/bootstrap/                               @borisyankov
+/types/bootstrap-3-typeahead/                   @AndersonFriaca
 /types/bootstrap-datepicker/                    @borisyankov
 /types/bootstrap-fileinput/                     @CheCoxshall
+/types/bootstrap-growl-ifightcrime/             @AndersonFriaca
 /types/bootstrap-maxlength/                     @danmana
 /types/bootstrap-notify/                        @niemyjski @mouse0270 @robert-voica
 /types/bootstrap-select/                        @LKay
@@ -334,8 +346,9 @@
 /types/buffer-equal/                            @Bartvds
 /types/buffers/                                 @rhencke
 /types/bufferstream/                            @Bartvds
+/types/builtin-modules/                         @ajafff
 /types/bull/v2/                                 @bgrieder @JProgrammer
-/types/bull/                                    @bgrieder @JProgrammer @marshall007 @weeco
+/types/bull/                                    @bgrieder @JProgrammer @marshall007 @weeco @blaugold
 /types/bump-regex/                              @silkentrance
 /types/bunnymq/                                 @cyrilschumacher
 /types/bunyan/                                  @amikhalev
@@ -351,27 +364,31 @@
 /types/byline/                                  @reppners
 /types/bytebuffer/                              @cappellin
 /types/bytes/                                   @danny8002
-/types/c3/                                      @mcliment @gerinjacob @denyo
+/types/c3/                                      @mcliment @gerinjacob @denyo @dmitryshindin
 /types/cache-manager/                           @GausSim
 /types/cal-heatmap/                             @RetroChrisB
 /types/callsite/                                @newclear
 /types/callsites/                               @BendingBender
 /types/calq/                                    @eirikhm
+/types/camaro/                                  @tuananh
 /types/camelcase/                               @samverschueren
 /types/camelcase-keys/                          @mhegazy
 /types/camo/                                    @lucasmciruzzi
 /types/cancan/                                  @Vincent-Pang
 /types/cannon/                                  @clark-stevenson @Gelio
+/types/canvas-confetti/                         @matracey
 /types/canvas-gauges/                           @Mikhus
 /types/canvasjs/                                @brutalimp
 /types/capitalize/                              @frederickfogerty
 /types/card-validator/                          @ChanceM
 /types/case-sensitive-paths-webpack-plugin/     @r3nya
-/types/caseless/                                @downace
+/types/caseless/                                @downace @mastermatt
 /types/cash/                                    @akvlko
 /types/casperjs/                                @jedmao @urielch
 /types/cassandra-driver/                        @Svjard
-/types/catbox/                                  @jasonswearingen @AJamesPhillips
+/types/catalog/                                 @grossbart @wereHamster
+/types/catbox/v7/                               @jasonswearingen @AJamesPhillips
+/types/catbox/                                  @jasonswearingen @AJamesPhillips @saboya
 /types/cbor/                                    @pushplay
 /types/ccap/                                    @taoqf
 /types/chai/v2/                                 @Bartvds @AGBrown
@@ -382,7 +399,7 @@
 /types/chai-dom/                                @mattlewis92
 /types/chai-enzyme/                             @asvetliakov
 /types/chai-fuzzy/                              @Bartvds
-/types/chai-http/                               @Nemo157 @G1itcher @CaselIT
+/types/chai-http/                               @Nemo157 @G1itcher @CaselIT @bas-l
 /types/chai-jest-snapshot/                      @mattvperry
 /types/chai-jquery/                             @kazimanzurrashid
 /types/chai-json-schema/                        @ulrichheiniger
@@ -395,7 +412,8 @@
 /types/chance/                                  @cbowdon @brikou
 /types/change-emitter/                          @iskandersierra
 /types/charm/                                   @Xananax
-/types/chart.js/                                @anuti @FabienLavocat @KentarouTakeda @larrybahr @mernen @josefpaij @danmana
+/types/charset/                                 @cspotcode
+/types/chart.js/                                @anuti @FabienLavocat @KentarouTakeda @larrybahr @mernen @josefpaij @danmana @guillaume-ro-fr @chicoxyzzy
 /types/chartist/                                @mtgibbs @psimonski @clottman
 /types/chayns/                                  @HenningKuehl
 /types/check-sum/                               @BendingBender
@@ -403,6 +421,7 @@
 /types/checkstyle-formatter/                    @mhegazy
 /types/checksum/                                @rogierschouten
 /types/cheerio/                                 @blittle @wmaurer @umarniz @LiJinyao
+/types/chessboardjs/                            @sliverb @davidmpaz
 /types/chmodr/                                  @BendingBender
 /types/chokidar/                                @reppners @felixfbecker @bayssmekanique
 /types/chosen-js/                               @borisyankov @denisname
@@ -420,7 +439,7 @@
 /types/clean-stack/                             @BendingBender
 /types/clean-webpack-plugin/                    @j-f1
 /types/clear-require/                           @dan-j
-/types/cleave.js/                               @clentfort @jasongi-at-sportsbet
+/types/cleave.js/                               @clentfort @jasongi-at-sportsbet @sashashakun
 /types/cli/                                     @kayahr
 /types/cli-color/                               @ChaosinaCan
 /types/cli-spinner/                             @janslow
@@ -449,9 +468,11 @@
 /types/collections/                             @scarabedore
 /types/color/v0/                                @LKay
 /types/color/v1/                                @LKay
-/types/color/                                   @Airlun
+/types/color/v2/                                @Airlun
+/types/color/                                   @Airlun @jameswlane
 /types/color-convert/                           @Airlun
 /types/color-name/                              @Ailrun
+/types/color-namer/                             @in19farkt
 /types/color-string/                            @BendingBender @danmarshall
 /types/colorbrewer/                             @mtraynham
 /types/colors/                                  @Bartvds @staeke
@@ -479,7 +500,7 @@
 /types/conf/v0/                                 @SamVerschueren
 /types/conf/                                    @SamVerschueren @BendingBender
 /types/confidence/                              @jppellerin
-/types/config/                                  @RWander @forrestbice @jndonald3
+/types/config/                                  @RWander @forrestbice @jndonald3 @albertovasquez
 /types/configstore/                             @ArcticLight
 /types/confit/                                  @ethanresnick
 /types/connect/                                 @SomaticIT
@@ -561,6 +582,7 @@
 /types/cron/                                    @horiuchi
 /types/cropperjs/                               @stepancar
 /types/croppie/                                 @connor4312 @dklmuc @sarunint
+/types/cross-spawn/                             @Alorel
 /types/crossfilter/                             @schmuli @iebaker @nordfjord
 /types/crossroads/                              @diullei
 /types/cryptiles/                               @awendland
@@ -579,6 +601,7 @@
 /types/csvrow/                                  @codeanimal
 /types/csvtojson/                               @EricByers @wcarson
 /types/cucumber/v1/                             @abraaoalves @jan-molak @isoung @BendingBender
+/types/cucumber/v3/                             @abraaoalves @jan-molak @isoung @BendingBender @ErikSchierboom
 /types/cucumber/                                @abraaoalves @jan-molak @isoung @BendingBender @ErikSchierboom
 /types/currency-formatter/                      @mhegazy @davidmpaz
 /types/custom-error-generator/                  @thmiceli
@@ -586,8 +609,9 @@
 /types/cwise-compiler/                          @taoqf
 /types/cwise-parser/                            @taoqf
 /types/cybozulabs-md5/                          @pine613
-/types/cytoscape/                               @phreed @wy193777 @ypconstante
+/types/cytoscape/                               @phreed @wy193777 @ypconstante @janniclas
 /types/d3/v3/                                   @gustavderdrache @borisyankov @MatthiasJobst
+/types/d3/v4/                                   @tomwanzek @gustavderdrache @borisyankov
 /types/d3/                                      @tomwanzek @gustavderdrache @borisyankov
 /types/d3-array/                                @gustavderdrache @borisyankov @tomwanzek
 /types/d3-axis/                                 @tomwanzek @gustavderdrache @borisyankov
@@ -601,6 +625,7 @@
 /types/d3-drag/                                 @tomwanzek @gustavderdrache @borisyankov
 /types/d3-dsv/                                  @tomwanzek @gustavderdrache @borisyankov
 /types/d3-ease/                                 @tomwanzek @gustavderdrache @borisyankov
+/types/d3-fetch/                                @ledragon
 /types/d3-force/                                @tomwanzek @gustavderdrache @borisyankov
 /types/d3-format/                               @tomwanzek @gustavderdrache @borisyankov
 /types/d3-geo/                                  @Ledragon @tomwanzek @gustavderdrache @borisyankov
@@ -615,6 +640,7 @@
 /types/d3-random/                               @tomwanzek @gustavderdrache @borisyankov
 /types/d3-request/                              @Ledragon @gustavderdrache @borisyankov @tomwanzek
 /types/d3-sankey/                               @tomwanzek @gustavderdrache
+/types/d3-scale/v1/                             @tomwanzek @gustavderdrache @borisyankov
 /types/d3-scale/                                @tomwanzek @gustavderdrache @borisyankov
 /types/d3-scale-chromatic/                      @Ledragon @gustavderdrache @borisyankov @henriquefm
 /types/d3-selection/                            @tomwanzek @gustavderdrache @borisyankov
@@ -635,12 +661,14 @@
 /types/dagre-d3/                                @markwongsk
 /types/dagre-layout/                            @qinfchen @Frankrike @vilterp
 /types/dargs/                                   @BendingBender
-/types/dat-gui/                                 @gyohk @sonic3d @rroylance
+/types/dashify/                                 @rokt33r
+/types/dat.gui/                                 @gyohk @sonic3d @rroylance
 /types/data-driven/                             @mrhen
 /types/datadog-metrics/                         @pushplay
 /types/datatables.net/                          @Silver-Connection @omidkrad @pragmatrix @CNBoland
 /types/datatables.net-buttons/                  @Silver-Connection @SammyG4Free @jimhartford
 /types/datatables.net-fixedheader/              @szechyjs @Silver-Connection
+/types/datatables.net-rowgroup/                 @maixiu
 /types/datatables.net-rowreorder/               @baywet
 /types/datatables.net-select/                   @szechyjs
 /types/date-arithmetic/                         @HeeL
@@ -659,6 +687,7 @@
 /types/decamelize/                              @samverschueren
 /types/decay/                                   @enaeseth
 /types/decompress/                              @plantain-00
+/types/decompress-response/                     @DanielRosenwasser
 /types/decorum/                                 @dflor003
 /types/dedent/                                  @douglasduteil
 /types/deep-assign/                             @souldreamer
@@ -706,7 +735,7 @@
 /types/discontinuous-range/                     @OiCMudkips
 /types/disposable-email-domains/                @geoffreak
 /types/doccookies/                              @jonegerton
-/types/dockerode/                               @seikho @nlaplante @isac322 @lazarusx @meisenzahl
+/types/dockerode/                               @seikho @nlaplante @isac322 @lazarusx @meisenzahl @thegecko
 /types/docopt/                                  @giggio
 /types/doctrine/                                @rictic
 /types/documentdb/                              @NoelAbrahams @brettferdosi @ctstone @yifanwu
@@ -761,6 +790,7 @@
 /types/dynatable/                               @francoismassart
 /types/dynogels/                                @SpartanLabs
 /types/each/                                    @misak113
+/types/earcut/                                  @NaridaL
 /types/easeljs/                                 @evilangelist
 /types/easy-api-request/                        @DeadAlready
 /types/easy-jsend/                              @DeadAlready
@@ -772,6 +802,7 @@
 /types/echarts/                                 @xieisabug @AntiMoron
 /types/ecurve/                                  @mhegazy
 /types/ed25519/                                 @erikma
+/types/ed2curve/                                @ffflorian
 /types/egg-mock/                                @sheperdwind
 /types/egg.js/                                  @ToastHawaii
 /types/egjs__axes/                              @naver
@@ -788,11 +819,11 @@
 /types/electron-json-storage/                   @stpettersens @nrlquaker @jbw91
 /types/electron-notifications/                  @djpereira
 /types/electron-notify/                         @djpereira
-/types/electron-packager/                       @SomaticIT @cortopy
+/types/electron-packager/                       @SomaticIT @cortopy @jkleinsc
 /types/electron-settings/v2/                    @leonard-thieu
 /types/electron-settings/                       @icopp @nrlquaker
 /types/electron-spellchecker/                   @unindented
-/types/electron-store/                          @unindented
+/types/electron-store/                          @unindented @jsynowiec
 /types/electron-util/                           @kputh
 /types/electron-window-state/                   @rhysd
 /types/electron-winstaller/                     @shiftkey @unindented
@@ -803,7 +834,7 @@
 /types/email-templates/                         @cyrilschumacher @gurisko @blankstar85
 /types/ember/v1/                                @jedmao
 /types/ember/                                   @jedmao @bttf @dwickern @chriskrycho @theroncross @mfeckie
-/types/ember-data/                              @dwickern @mike-north
+/types/ember-data/                              @dwickern @mike-north @chriskrycho
 /types/ember-feature-flags/                     @tansongyang
 /types/ember-mocha/                             @dwickern
 /types/ember-modal-dialog/                      @tansongyang
@@ -827,6 +858,7 @@
 /types/envify/                                  @tkQubo
 /types/enzyme/                                  @MarianPalkus @NoHomey @jwbay @huhuanming @MartynasZilinskas @thovden
 /types/enzyme-adapter-react-15/                 @tkrotoff
+/types/enzyme-adapter-react-15.4/               @nali
 /types/enzyme-adapter-react-16/                 @tkrotoff
 /types/enzyme-to-json/                          @joscha
 /types/eonasdan-bootstrap-datetimepicker/       @ToastHawaii
@@ -836,14 +868,17 @@
 /types/eq.js/                                   @stephenlautier
 /types/errorhandler/                            @santialbo
 /types/es6-collections/                         @rbuckton
-/types/es6-promisify/                           @harryshipton
+/types/es6-promisify/                           @harryshipton @bschlenk
 /types/es6-shim/                                @rbuckton
 /types/es6-weak-map/                            @pine
 /types/escape-html/                             @elisee
 /types/escape-latex/                            @olsio
 /types/escape-string-regexp/                    @kruncher @faergeek
 /types/escodegen/                               @simondel
+/types/eslint/                                  @pmdartus @j-f1
 /types/eslint-plugin-prettier/                  @ikatyang
+/types/eslint-scope/                            @mysticatea
+/types/eslint-visitor-keys/                     @mysticatea
 /types/esprima/v2/                              @teppeis @RReverser
 /types/esprima/                                 @teppeis @RReverser @peter-scott
 /types/esprima-walk/                            @tswaters
@@ -872,8 +907,9 @@
 /types/expect.js/                               @teppeis
 /types/expectations/                            @vvakame
 /types/expo/v23/                                @KonstantinKai
-/types/expo/                                    @KonstantinKai @martynaskadisa
-/types/expr-eval/                               @connor4312
+/types/expo/v24/                                @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger
+/types/expo/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger
+/types/expo__vector-icons/                      @incleaf
 /types/express/                                 @borisyankov
 /types/express-brute/                           @cyrilschumacher
 /types/express-brute-memcached/                 @cyrilschumacher
@@ -889,7 +925,7 @@
 /types/express-flash-2/                         @mathsalmi
 /types/express-flash-notification/              @Mister4Eyes
 /types/express-formidable/                      @tdolsen @evanshortiss
-/types/express-graphql/                         @isman-usoh @nitintutlani @hubel
+/types/express-graphql/                         @isman-usoh @nitintutlani @hubel @zya
 /types/express-handlebars/                      @stpettersens @yhaskell
 /types/express-jwt/                             @wokim @kacepe @Sl1MBoy
 /types/express-less/                            @xieyubo
@@ -905,8 +941,9 @@
 /types/express-rate-limit/                      @cyrilschumacher @makepost
 /types/express-route-fs/                        @kripod
 /types/express-sanitized/                       @cjbarth
-/types/express-serve-static-core/               @borisyankov @19majkel94 @kacepe @micksatana
-/types/express-session/                         @horiuchi @jacobbogers
+/types/express-serve-static-core/               @borisyankov @19majkel94 @kacepe @micksatana @samijaber
+/types/express-session/                         @horiuchi @jacobbogers @builtinnya @ry7n
+/types/express-to-koa/                          @xiaohanzhang
 /types/express-unless/                          @wokim
 /types/express-winston/                         @bricka
 /types/extend/                                  @reppners
@@ -916,7 +953,7 @@
 /types/extract-zip/                             @mizunashi-mana
 /types/eyes/                                    @brynbellomy
 /types/f1/                                      @neolwc
-/types/fabric/                                  @oklemencic @joewashear007 @mrand01
+/types/fabric/                                  @oklemencic @joewashear007 @mrand01 @NotWoods
 /types/facebook-js-sdk/                         @amritk
 /types/facebook-pixel/                          @noctishsu
 /types/faker/v3/                                @Kuniwak
@@ -939,6 +976,22 @@
 /types/fb/                                      @JoshStrobl
 /types/fbemitter/                               @kmxz
 /types/featherlight/                            @xStrom
+/types/feathersjs__authentication/              @AbraaoAlves @j2L4e
+/types/feathersjs__authentication-client/       @AbraaoAlves @j2L4e
+/types/feathersjs__authentication-jwt/          @j2L4e
+/types/feathersjs__authentication-local/        @j2L4e
+/types/feathersjs__authentication-oauth1/       @j2L4e
+/types/feathersjs__authentication-oauth2/       @j2L4e
+/types/feathersjs__configuration/               @j2L4e
+/types/feathersjs__errors/                      @j2L4e
+/types/feathersjs__express/                     @j2L4e
+/types/feathersjs__feathers/                    @j2L4e @AbraaoAlves
+/types/feathersjs__primus/                      @j2L4e
+/types/feathersjs__primus-client/               @j2L4e
+/types/feathersjs__rest-client/                 @j2L4e
+/types/feathersjs__socket-commons/              @j2L4e
+/types/feathersjs__socketio/                    @j2L4e
+/types/feathersjs__socketio-client/             @j2L4e
 /types/feedme/                                  @codeanimal
 /types/feedparser/                              @cortopy
 /types/fetch-jsonp/                             @tkrotoff
@@ -954,11 +1007,12 @@
 /types/file-type/                               @tcaesvk @BendingBender
 /types/file-url/                                @coderslagoon
 /types/filenamify/                              @rokt33r
-/types/filesize/                                @GiedriusGrabauskas
+/types/filesize/                                @GiedriusGrabauskas @renchap
 /types/fill-pdf/                                @westy92
 /types/finalhandler/                            @chrootsu
 /types/finch/                                   @DavidSichau
 /types/find/                                    @andypyrope
+/types/find-root/                               @Alorel
 /types/find-up/                                 @BendingBender
 /types/findup-sync/                             @Bartvds @ngbrown
 /types/fingerprintjs/                           @zaneli
@@ -986,6 +1040,7 @@
 /types/fm-websync/                              @markusmauch
 /types/fontfaceobserver/                        @RandScullard
 /types/fontoxml/                                @rolandzwaga
+/types/forever-agent/                           @yavanosta
 /types/forever-monitor/                         @shuntksh
 /types/forge-di/                                @adamcarr
 /types/form-data/                               @soywiz @leonyu @BendingBender
@@ -995,6 +1050,7 @@
 /types/format-io/                               @amitbeck
 /types/format-unicorn/                          @kruncher
 /types/formidable/                              @Nemo157
+/types/forms/                                   @suXinjke
 /types/forwarded/                               @BendingBender
 /types/fossil-delta/                            @endel
 /types/foundation/                              @borisyankov
@@ -1028,12 +1084,11 @@
 /types/ftpd/                                    @rogierschouten
 /types/fullname/                                @kayahr
 /types/fullpage.js/                             @jodiwarren
-/types/fuse/                                    @smrq
 /types/fusioncharts/                            @rohitkr @shivarajkv
 /types/fuzzaldrin/                              @mhegazy
 /types/fuzzaldrin-plus/                         @jeancroy @jkillian
-/types/fuzzyset/                                @lgrignon
-/types/fuzzyset.js/                             @lgrignon
+/types/fuzzyset/                                @lgrignon @narainsagar
+/types/fuzzyset.js/                             @lgrignon @narainsagar
 /types/fxn/                                     @charrondev
 /types/gae.channel.api/                         @vvakame
 /types/gamequery/                               @Laubi
@@ -1176,6 +1231,7 @@
 /types/gapi.youtube/                            @sgtfrankieboy
 /types/gapi.youtubeanalytics/                   @sgtfrankieboy
 /types/gaussian/                                @scttcper
+/types/geetest/                                 @plantain-00
 /types/gen-readlines/                           @CodeAnimal
 /types/generic-functions/                       @stpettersens
 /types/generic-pool/                            @jerray
@@ -1186,9 +1242,12 @@
 /types/geokdbush/                               @DenisCarriere
 /types/geometry-dom/                            @nakakura
 /types/geopattern/                              @Gaelan
+/types/get-caller-file/                         @ajafff
 /types/get-node-dimensions/                     @vincekovacs
 /types/get-stdin/                               @DanielRosenwasser
 /types/get-stream/                              @douglasduteil @BendingBender
+/types/get-value/                               @DanielRosenwasser
+/types/getopts/                                 @azasypkin
 /types/getos/                                   @BendingBender
 /types/gettext.js/                              @jucrouzet
 /types/gifffer/                                 @gatimus
@@ -1214,7 +1273,7 @@
 /types/gm/                                      @ChaosinaCan @maartenvanvliet
 /types/go/                                      @NorthwoodsSoftware
 /types/google-adwords-scripts/                  @jafaircl
-/types/google-apps-script/                      @motemen @grant
+/types/google-apps-script/                      @motemen
 /types/google-apps-script-oauth2/               @dhayab
 /types/google-cloud__datastore/                 @beaulac
 /types/google-cloud__pubsub/                    @pheromonez
@@ -1238,9 +1297,11 @@
 /types/graceful-fs/                             @Bartvds @BendingBender
 /types/graham_scan/                             @hberntsen
 /types/graphite-udp/                            @EricByers
-/types/graphql/                                 @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal
+/types/graphql/                                 @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal @tgriesser @dyst5422 @adnsio
 /types/graphql-date/                            @enaeseth
+/types/graphql-iso-date/                        @jwaldrip
 /types/graphql-relay/                           @arvitaly @nitintutlani @Grelinfo
+/types/graphql-resolve-batch/                   @nayni
 /types/graphql-type-json/                       @schfkt
 /types/graphviz/                                @mhfrantz
 /types/grasp/                                   @agnoster
@@ -1250,10 +1311,11 @@
 /types/grecaptcha/v0/                           @brentj73
 /types/grecaptcha/                              @DethAriel
 /types/gregorian-calendar/                      @cwalv
+/types/grid-styled/                             @antonvasin
 /types/gridfs-stream/                           @liorm
 /types/gridstack/                               @PascalSenn @ZoolWay @Sl1MBoy
 /types/grunt/                                   @jeffmay @basarat
-/types/gsap/                                    @codebelt @ProbablePrime
+/types/gsap/                                    @codebelt @ProbablePrime @philipbulley
 /types/guid/                                    @maroy1986
 /types/gulp/                                    @GiedriusGrabauskas
 /types/gulp-angular-templatecache/              @amanmahajan7
@@ -1331,7 +1393,8 @@
 /types/hapi/v8/                                 @jasonswearingen
 /types/hapi/v12/                                @jasonswearingen
 /types/hapi/v15/                                @jasonswearingen
-/types/hapi/                                    @jasonswearingen @AJamesPhillips
+/types/hapi/v16/                                @jasonswearingen @AJamesPhillips
+/types/hapi/                                    @BorntraegerMarc @rafaelsouzaf @jhsimms
 /types/hapi-auth-basic/                         @AJamesPhillips @saboya
 /types/hapi-auth-jwt2/                          @warrenseymour
 /types/hapi-decorators/                         @kenhowardpdx
@@ -1346,13 +1409,14 @@
 /types/hashids/                                 @pocesar
 /types/hashmap/                                 @outring
 /types/haversine/                               @screendriver
+/types/hbs/                                     @davidm77
 /types/he/                                      @sedwards2009
 /types/headroom/                                @hakubo
 /types/heap/                                    @ryan10132
 /types/heapdump/                                @weekens
 /types/heatmap.js/                              @lookuptable @rhys-vdw
 /types/hedron/                                  @dborysov
-/types/hellojs/                                 @PavelPZ @vuorinem
+/types/hellojs/                                 @PavelPZ @vuorinem @baywet
 /types/hellosign-embedded/                      @xt0rted
 /types/helmet/                                  @cyrilschumacher @EvanHahn @bluehatbrit
 /types/heredatalens/                            @denyo
@@ -1395,7 +1459,7 @@
 /types/http-codes/                              @mhegazy
 /types/http-context/                            @mtraynham
 /types/http-errors/                             @tkrotoff @BendingBender
-/types/http-proxy/                              @SomaticIT
+/types/http-proxy/                              @SomaticIT @Raigen
 /types/http-proxy-agent/                        @mrmlnc
 /types/http-proxy-middleware/                   @zebMcCorkle @BendingBender
 /types/http-server/                             @plantain-00
@@ -1406,6 +1470,7 @@
 /types/hubspot-pace/                            @borislavjivkov
 /types/humane/                                  @jmvrbanac
 /types/humanize-plus/                           @DenisCarriere
+/types/humanize-string/                         @ragnarok56
 /types/humanparser/                             @MichalPodeszwa
 /types/humps/                                   @nikeee
 /types/hyco-ws/                                 @mrcabellom
@@ -1443,12 +1508,12 @@
 /types/imap/                                    @psnider
 /types/imap-simple/                             @pushplay
 /types/imgur-rest-api/                          @lukewestby
-/types/immutability-helper/                     @seansfkelley
 /types/impress/                                 @borisyankov
 /types/in-range/                                @DanielRosenwasser
 /types/incremental-dom/                         @basarat @lanthaler @vvakame
 /types/indent-string/                           @mhegazy
-/types/inert/                                   @nycdotnet @AJamesPhillips
+/types/inert/v4/                                @nycdotnet @AJamesPhillips
+/types/inert/                                   @nycdotnet @AJamesPhillips @lenovouser
 /types/inflected/                               @dsci
 /types/inflection/                              @shiwano
 /types/inherits/                                @chrootsu
@@ -1477,6 +1542,7 @@
 /types/iota.lib.js/                             @fogsh
 /types/ip/                                      @codeanimal
 /types/ip-regex/                                @unindented
+/types/ipcheck/                                 @bengry
 /types/irc/                                     @phillips1012
 /types/iron/                                    @simonschick @rafaelsouzaf
 /types/is/                                      @cabralRodrigo
@@ -1488,6 +1554,7 @@
 /types/is-compressed/                           @mhegazy
 /types/is-finite/                               @mhegazy
 /types/is-glob/                                 @mrmlnc
+/types/is-hotkey/                               @petester42
 /types/is-ip/                                   @coderslagoon
 /types/is-my-json-valid/                        @kruncher
 /types/is-negated-glob/                         @ajafff
@@ -1508,6 +1575,7 @@
 /types/is-windows/                              @mizunashi-mana
 /types/isbn-utils/                              @elhaard
 /types/iscroll/                                 @csrakowski
+/types/ismobilejs/                              @Ty3uK
 /types/iso-3166-2/                              @sicilica
 /types/iso8601-localizer/                       @avielfedida
 /types/isomorphic-fetch/                        @toddlucas
@@ -1525,7 +1593,7 @@
 /types/jade/                                    @panuhorsmalahti
 /types/jalaali-js/                              @alitaheri
 /types/japanese-holidays/                       @syamatoo
-/types/jasmine/                                 @borisyankov @theodorejb @davidparsson @gmoothart @lukas-zech-software
+/types/jasmine/                                 @borisyankov @theodorejb @davidparsson @gmoothart @lukas-zech-software @Engineer2B
 /types/jasmine-ajax/                            @lgrignon
 /types/jasmine-data_driven_tests/               @AnthonyMacKinnon
 /types/jasmine-enzyme/                          @bolatovumar
@@ -1549,7 +1617,7 @@
 /types/jdataview/                               @RReverser
 /types/jdenticon/                               @mtr
 /types/jest/v16/                                @NoHomey @jwbay
-/types/jest/                                    @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil
+/types/jest/                                    @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @AhnpGit
 /types/jest-diff/                               @myabc
 /types/jest-docblock/                           @ikatyang
 /types/jest-get-type/                           @myabc
@@ -1562,11 +1630,12 @@
 /types/jjv/                                     @Nemo157
 /types/jjve/                                    @Nemo157
 /types/jmespath/                                @pushplay
-/types/johnny-five/                             @nakakura
+/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
+/types/joi/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun
 /types/joigoose/                                @boothwhack
+/types/josa/                                    @vichyssoise
 /types/jpeg-js/                                 @DanielRosenwasser
 /types/jpm/                                     @github-account-because-they-want-it
 /types/jqgrid/                                  @lokeshpeta
@@ -1576,7 +1645,9 @@
 /types/jquery/                                  @leonard-thieu @borisyankov @choffmeister @Steve-Fenton @Diullei @tasoili @jasons-novaleaf @seanski @Guuz @ksummerlin @basarat @nwolverson @derekcicerone @AndrewGaspar @seikichi @benjaminjackman @s093294 @JoshStrobl @johnnyreilly @DickvdBrink @King2500
 /types/jquery-ajax-chain/                       @humana-fragilitas
 /types/jquery-alertable/                        @stever
+/types/jquery-awesome-cursor/                   @zskovacs
 /types/jquery-backstretch/                      @dkulyk
+/types/jquery-countdown/                        @AndersonFriaca
 /types/jquery-cropbox/                          @PerKastman
 /types/jquery-deparam/                          @patsissons
 /types/jquery-easy-loading/                     @delphinus35
@@ -1587,7 +1658,9 @@
 /types/jquery-jcrop/                            @joeskeen
 /types/jquery-jsonrpcclient/                    @Ty3uK
 /types/jquery-knob/                             @iain8
-/types/jquery-mask-plugin/                      @avidenic
+/types/jquery-lazyload/                         @AndersonFriaca
+/types/jquery-mask-plugin/                      @avidenic @AndersonFriaca
+/types/jquery-maskmoney/                        @AndersonFriaca
 /types/jquery-match-height/                     @kbytesys
 /types/jquery-mockjax/                          @laszlojakab @vladeck
 /types/jquery-mousewheel/                       @xt0rted
@@ -1595,6 +1668,8 @@
 /types/jquery-param/                            @patsissons
 /types/jquery-sortable/                         @Seltzer
 /types/jquery-steps/                            @jblank @nickwph
+/types/jquery-sticky/                           @maixiu
+/types/jquery-tags-input/                       @AndersonFriaca
 /types/jquery-timeentry/                        @marknadig
 /types/jquery-toastmessage-plugin/              @joeskeen
 /types/jquery-truncate-html/                    @abraaoalves
@@ -1649,6 +1724,7 @@
 /types/jquery.slimscroll/                       @Promact
 /types/jquery.soap/                             @tigerxy
 /types/jquery.sortelements/                     @tbureck
+/types/jquery.stickem/                          @davidmpaz
 /types/jquery.superlink/                        @niemyjski
 /types/jquery.tagsmanager/                      @vbortone
 /types/jquery.tile/                             @zaneli
@@ -1679,6 +1755,7 @@
 /types/js-quantities/                           @wrummler
 /types/js-schema/                               @marcinporebski @roblabat
 /types/js-search/                               @guoyunhe
+/types/js-sha512/                               @nicojs
 /types/js-to-java/                              @skyitachi
 /types/js-url/                                  @pine613
 /types/js-yaml/                                 @Bartvds @sclausen
@@ -1696,7 +1773,9 @@
 /types/jshamcrest/                              @dharkness
 /types/jsmockito/                               @shiver-me-timbers
 /types/jsnox/                                   @stkb @DovydasNavickas
+/types/json-js/                                 @NN---
 /types/json-merge-patch/                        @senyaarseniy
+/types/json-parse-better-errors/                @DanielRosenwasser
 /types/json-patch/                              @vvakame
 /types/json-pointer/                            @Bartvds
 /types/json-query/                              @mtraynham
@@ -1714,12 +1793,14 @@
 /types/jsonnet/                                 @hookclaw
 /types/jsonp/                                   @surenkov
 /types/jsonpath/                                @horiuchi @ikatyang
-/types/jsonrpc-serializer/                      @Akim95
+/types/jsonrpc-serializer/                      @Akim95 @many20
 /types/jsonstream/                              @Bartvds
+/types/jsontoxml/                               @benstevens48
 /types/jsonwebtoken/                            @SomaticIT @danielheim @brikou
 /types/jspdf/                                   @amberjs
 /types/jsqrcode/                                @lordazzi
 /types/jsrender/                                @zakki
+/types/jsreport-core/                           @taoqf
 /types/jsrp/                                    @harryshipton
 /types/jss/                                     @appsforartists @kof
 /types/jssha/                                   @randombk @SrTobi
@@ -1737,7 +1818,7 @@
 /types/jui-core/                                @easylogic
 /types/jui-grid/                                @easylogic
 /types/jweixin/                                 @taoqf @gomydodo
-/types/jwplayer/                                @martinduparc @kutomer
+/types/jwplayer/                                @martinduparc @kutomer @philippguertler
 /types/jws/                                     @JustinBeckwith
 /types/jwt-client/                              @timoteoponce
 /types/jwt-decode/v1/                           @QuatroDevOfficial
@@ -1767,6 +1848,7 @@
 /types/klaw/v1/                                 @mceachen
 /types/klaw/                                    @mceachen
 /types/klaw-sync/                               @shiftkey
+/types/kms-json/                                @sunnyone
 /types/knex/                                    @tkQubo @baronfel @MeLlamoPablo @mastermatt @micksatana
 /types/knex-postgis/                            @vesse
 /types/knockback/                               @borisyankov
@@ -1807,7 +1889,8 @@
 /types/koa-logger/                              @geoffreak @tlaziuk
 /types/koa-logger-winston/                      @stevehipwell
 /types/koa-morgan/                              @vesse
-/types/koa-mount/                               @amirsaber
+/types/koa-mount/                               @amirsaber @tlaziuk
+/types/koa-multer/                              @benstevens48
 /types/koa-passport/                            @horiuchi @tlaziuk @brendtumi
 /types/koa-pino-logger/                         @khell
 /types/koa-pug/                                 @Xstoudi
@@ -1816,7 +1899,7 @@
 /types/koa-route/                               @migstopheles
 /types/koa-router/                              @hellopao @schfkt
 /types/koa-send/                                @pe8ter @tlaziuk
-/types/koa-session/                             @kerol2r20
+/types/koa-session/                             @kerol2r20 @tlaziuk
 /types/koa-session-minimal/                     @longztian
 /types/koa-sslify/                              @wingsbob
 /types/koa-static/                              @hellopao @tlaziuk
@@ -1855,6 +1938,7 @@
 /types/leaflet-gpx/                             @soucekv
 /types/leaflet-imageoverlay-rotated/            @tkleinke
 /types/leaflet-label/                           @Nemo157
+/types/leaflet-mouse-position/                  @Hanyon
 /types/leaflet-polylinedecorator/               @soucekv
 /types/leaflet-providers/                       @BendingBender
 /types/leaflet-rotatedmarker/                   @robert-prib-polestar
@@ -1866,7 +1950,6 @@
 /types/leaflet.locatecontrol/                   @DenisCarriere
 /types/leaflet.markercluster/                   @rimig
 /types/leaflet.markercluster.layersupport/      @AsamK
-/types/leaflet.mouseposition/                   @Hanyon
 /types/leaflet.pancontrol/                      @Brictarus
 /types/leaflet.pm/                              @tkleinke
 /types/leaflet.polylinemeasure/                 @RiON69
@@ -1890,7 +1973,6 @@
 /types/line-by-line/                            @etomsen
 /types/line-reader/                             @stpettersens
 /types/linkify-it/                              @praxxis
-/types/linq4js/                                 @morrisjdev
 /types/lls/                                     @borislavjivkov
 /types/load-json-file/                          @SamVerschueren
 /types/loader-runner/                           @e-cloud
@@ -1898,7 +1980,6 @@
 /types/loadware/                                @ALyman
 /types/lobibox/                                 @itboy87
 /types/local-dynamo/                            @Sicilica
-/types/localforage-cordovasqlitedriver/         @thgreasi
 /types/localized-countries/                     @coderslagoon
 /types/localizejs-library/                      @salbahra
 /types/locate-path/                             @me
@@ -1907,7 +1988,7 @@
 /types/lockr/                                   @droritos
 /types/locutus/                                 @hookclaw
 /types/lodash/v3/                               @bczengel @chrootsu
-/types/lodash/                                  @bczengel @chrootsu @stepancar @ericanderson @aj-r @ailrun @e-cloud @thorn0 @jtmthf
+/types/lodash/                                  @bczengel @chrootsu @stepancar @aj-r @ailrun @e-cloud @thorn0 @jtmthf @DomiR
 /types/lodash-es/                               @stephenlautier @e-cloud
 /types/lodash-webpack-plugin/                   @bumbleblym
 /types/lodash.add/                              @bczengel @chrootsu @stepancar
@@ -2197,11 +2278,12 @@
 /types/log-symbols/                             @BendingBender
 /types/log-update/                              @BendingBender
 /types/logat/                                   @krvikash35
+/types/logform/                                 @DABH
 /types/logg/                                    @blittle
 /types/loggly/                                  @rmartone @geoffreak
 /types/loglevel/                                @Pro @szmeti @screendriver
 /types/logrotate-stream/                        @rogierschouten
-/types/lokijs/                                  @TeamworkGuy2
+/types/lokijs/                                  @TeamworkGuy2 @thomasconner
 /types/lolex/                                   @Nemo157 @joshuakgoldberg @rogierschouten
 /types/long/                                    @peterkooijmans
 /types/loopback/                                @kattsushi @enko @sequoia @drmikecrowe
@@ -2220,7 +2302,7 @@
 /types/lunr/v0/                                 @sebastian-lenz
 /types/lunr/                                    @seantanly
 /types/lusca/                                   @crutchcorn
-/types/luxon/                                   @colbydehart @FourwingsY
+/types/luxon/                                   @colbydehart @FourwingsY @jsiebern
 /types/lwip/                                    @AyaMorisawa
 /types/lz-string/                               @M0ns1gn0r
 /types/magic-number/                            @stpettersens
@@ -2255,15 +2337,36 @@
 /types/massive/v3/                              @swissspidy @clarenceh
 /types/massive/                                 @swissspidy @clarenceh @AmazingTurtle
 /types/match-media-mock/                        @asvetliakov
+/types/material-components-web/                 @BrentDouglas
 /types/material-design-lite/                    @bradzacher
 /types/material-ui/                             @ngbrown @theigor @alitaheri @herrmanno @DaIgeb @allienna @schlesingermatthias @InsidersByte @artyomsv @dan-j @minodisk
 /types/material-ui-datatables/                  @coding2012
-/types/materialize-css/v0/                      @eriklieben @leonyu @SinghSukhdeep @jfcere @scote
+/types/material__animation/                     @BrentDouglas
+/types/material__auto-init/                     @BrentDouglas
+/types/material__base/                          @BrentDouglas
+/types/material__checkbox/                      @BrentDouglas
+/types/material__dialog/                        @BrentDouglas
+/types/material__drawer/                        @BrentDouglas
+/types/material__form-field/                    @BrentDouglas
+/types/material__grid-list/                     @BrentDouglas
+/types/material__icon-toggle/                   @BrentDouglas
+/types/material__linear-progress/               @BrentDouglas
+/types/material__menu/                          @BrentDouglas
+/types/material__radio/                         @BrentDouglas
+/types/material__ripple/                        @BrentDouglas
+/types/material__select/                        @BrentDouglas
+/types/material__selection-control/             @BrentDouglas
+/types/material__slider/                        @BrentDouglas
+/types/material__snackbar/                      @BrentDouglas
+/types/material__tabs/                          @BrentDouglas
+/types/material__textfield/                     @BrentDouglas
+/types/material__toolbar/                       @BrentDouglas
+/types/materialize-css/v0/                      @eriklieben @leonyu @SinghSukhdeep @jfcere @scote @LiadIdan
 /types/materialize-css/                         @huww98
 /types/math3d/                                  @laszlojakab @jimsmart
 /types/mathjax/                                 @rolandzwaga
 /types/mathjs/                                  @siavol
-/types/matter-js/                               @piranha771
+/types/matter-js/                               @piranha771 @hasparus
 /types/maxmind/                                 @geoffreak
 /types/mcustomscrollbar/                        @flurg
 /types/md5/                                     @arcdev1 @jprogrammer
@@ -2277,10 +2380,11 @@
 /types/memory-cache/                            @jedigo @thieman
 /types/memory-fs/                               @e-cloud
 /types/memwatch-next/                           @cyrilschumacher
-/types/meow/                                    @KnisterPeter
+/types/meow/                                    @KnisterPeter @praxxis
 /types/merge-descriptors/                       @danny8002
 /types/merge-stream/                            @k-kagurazaka @daniel-zazula
 /types/merge2/                                  @tkrotoff @smac89
+/types/merkle/                                  @kerol2r20
 /types/mersenne-twister/                        @KentarouTakeda
 /types/meshblu/                                 @fnipo
 /types/mess/                                    @Nemo157
@@ -2315,6 +2419,7 @@
 /types/minimatch/                               @vvakame @shantmarouti
 /types/minimist/                                @Bartvds @Necroskillz @kamranayub
 /types/minimist-options/                        @ikatyang
+/types/minio/                                   @barinbritva
 /types/minipass/                                @BendingBender
 /types/mirrorx/                                 @aaronphy
 /types/mithril/                                 @spacejack @andraaspar @isiahmeadows
@@ -2326,7 +2431,9 @@
 /types/mkpath/                                  @optical
 /types/mobx-apollo/                             @pselden
 /types/mocha/                                   @kazimanzurrashid @otiai10 @jt000 @enlight
+/types/mocha-each/                              @magnostherobot
 /types/mocha-phantomjs/                         @ErikSchierboom
+/types/mocha-steps/                             @Arylo
 /types/mochaccino/                              @thomas-p
 /types/mock-aws-s3/                             @bluehatbrit
 /types/mock-fs/                                 @Nemo157 @tkqubo
@@ -2340,15 +2447,18 @@
 /types/moji/                                    @yasupeke
 /types/moment-business/                         @wonbyte
 /types/moment-business-time/                    @swist
-/types/moment-duration-format/                  @SwintDC @TwoStone @leonard-thieu
+/types/moment-duration-format/                  @SwintDC @TwoStone @leonard-thieu @bendykowski
 /types/moment-holiday/                          @rwdalpe
 /types/moment-jalaali/                          @alitaheri
 /types/moment-range/                            @Burgov @wilgert @franjuan @MartynasZilinskas
 /types/moment-round/                            @jacobbaskin
 /types/moment-strftime2/                        @dex4er
 /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/mongoose/                                @simonxca @horiuchi @sindrenm @lukasz-zak
+/types/mongoose/v4/                             @simonxca @horiuchi @sindrenm @lukasz-zak
+/types/mongoose/                                @simonxca @horiuchi @sindrenm @lukasz-zak @Alorel @jendrikw @ethanresnick
 /types/mongoose-auto-increment/                 @AyaMorisawa
 /types/mongoose-deep-populate/                  @AyaMorisawa
 /types/mongoose-geojson-schema/                 @bondz
@@ -2367,6 +2477,7 @@
 /types/move-concurrently/                       @mgroenhoff
 /types/moviedb/                                 @basarat @0x6368656174
 /types/moxios/                                  @itoasuka
+/types/mozilla-readability/                     @charlesvdv
 /types/mpromise/                                @sgkim126
 /types/mri/                                     @shiftkey @j-f1
 /types/ms/                                      @danny8002
@@ -2385,7 +2496,7 @@
 /types/multiparty/                              @kenfdev
 /types/multiplexjs/                             @KamyarNazeri
 /types/multisort/                               @CzBuCHi
-/types/multistream/                             @mrmlnc
+/types/multistream/                             @mrmlnc @kenzierocks
 /types/murmurhash-js/                           @cvle
 /types/murmurhash3js/                           @dlee-nvisia
 /types/musicmetadata/                           @Xstoudi
@@ -2396,6 +2507,7 @@
 /types/n3/                                      @phreed
 /types/nano/                                    @timjacobi @vincekovacs
 /types/nanoajax/                                @nathancahill
+/types/nanoid/                                  @bash
 /types/nanomsg/                                 @titan
 /types/nanoscroller/                            @zihark17
 /types/nanp/                                    @karn
@@ -2405,7 +2517,7 @@
 /types/natural-sort/                            @a-morales
 /types/navigation/                              @grahammendick
 /types/navigation-react/                        @grahammendick
-/types/navigo/                                  @aersamkull
+/types/navigo/                                  @aersamkull @dancespiele
 /types/nblas/                                   @erikgerrits
 /types/nconf/                                   @jedigo @jmthibault
 /types/ncp/                                     @bartvds
@@ -2421,6 +2533,9 @@
 /types/nes/                                     @NoHomey @saboya
 /types/net-keepalive/                           @hertzg
 /types/netmask/                                 @mhfrantz
+/types/new-relic-browser/                       @renehamburger @piotrkubisa
+/types/newline-remove/                          @OpenByteDev
+/types/newrelic/                                @mastermatt
 /types/nexpect/                                 @vvakame
 /types/next/                                    @dru89 @brikou
 /types/next-redux-wrapper/                      @stevegeek
@@ -2447,19 +2562,20 @@
 /types/nightmare/                               @horiuchi @samyang-au
 /types/nightwatch/                              @rkavalap @schlesiger
 /types/noble/                                   @swook @wind-rider @shantanubhadoria @lukel99 @bioball @keton
-/types/nock/                                    @bonnici @horiuchi @afharo @mastermatt
+/types/nock/                                    @bonnici @horiuchi @afharo @mastermatt @damour
 /types/nodal/                                   @charrondev
 /types/node/v4/                                 @eps1lon
-/types/node/v6/                                 @WilcoBakker @inlined @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
-/types/node/                                    @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff
+/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-7z/                                 @erkie
 /types/node-array-ext/                          @Beng89
 /types/node-cache/                              @chrootsu @dthunell @useltmann
 /types/node-calendar/                           @luzianz
 /types/node-cleanup/                            @agadar
 /types/node-common-errors/                      @icopp
+/types/node-cron/                               @maximelkin
 /types/node-dir/                                @panuhorsmalahti
 /types/node-dogstatsd/                          @chrisbobo
 /types/node-emoji/                              @jonestristand @styu
@@ -2478,7 +2594,6 @@
 /types/node-json-db/                            @kuzn-ilya
 /types/node-mysql-wrapper/                      @kataras
 /types/node-notifier/                           @tkQubo
-/types/node-pg-migrate/                         @bradleyayers
 /types/node-polyglot/                           @timjk
 /types/node-powershell/                         @rodrigoff
 /types/node-ral/                                @ssddi456
@@ -2494,7 +2609,6 @@
 /types/node-uuid/                               @jeffmay
 /types/node-validator/                          @kengorab
 /types/node-vault/                              @YuJianrong
-/types/node-waves/                              @stephenlautier
 /types/node-wit/                                @julienduf
 /types/node-xmpp-client/                        @PJakcson
 /types/node-xmpp-core/                          @PJakcson
@@ -2527,6 +2641,7 @@
 /types/novnc-core/                              @smithkl42 @BendingBender
 /types/npm/                                     @SomaticIT
 /types/npm-package-arg/                         @mgroenhoff
+/types/npm-packlist/                            @ajafff
 /types/ns-api/                                  @Archcry
 /types/nslog/                                   @unindented
 /types/nsqjs/                                   @cezaryrk
@@ -2549,6 +2664,7 @@
 /types/object-hash/                             @misak113
 /types/object-inspect/                          @demurgos
 /types/object-map/                              @wolfgang42
+/types/object-merge/                            @OpenByteDev
 /types/object-path/                             @pocesar
 /types/object-refs/                             @3fd
 /types/oblo-util/                               @Oblosys
@@ -2557,10 +2673,11 @@
 /types/oclazyload/                              @rolandzwaga
 /types/odata/                                   @janhommes @jcchalte
 /types/ofe/                                     @Morfent
-/types/office-js/                               @OfficeDev @LanceEA
+/types/office-js/                               @OfficeDev @LanceEA @Zlatkovsky @kbrandl @Rick-Kirkham
 /types/offline-js/                              @cgwrench
 /types/oibackoff/                               @geoffreak
 /types/oidc-token-manager/                      @rosieks
+/types/ol/                                      @yairtawil
 /types/on-finished/                             @czechboy0 @BendingBender
 /types/on-headers/                              @jjeffery @BendingBender
 /types/once/                                    @denis-sokolov @BendingBender
@@ -2574,16 +2691,16 @@
 /types/openjscad/                               @danmarshall
 /types/openlayers/v2/                           @bolhovsky
 /types/openlayers/v3/                           @osechet @matthiasdailey-ccri
-/types/openlayers/                              @osechet @wb14123 @ailrun @mylen @iamthechad @danmana
+/types/openlayers/                              @osechet @wb14123 @ailrun @mylen @iamthechad @danmana @yairtawil @pierremarc
 /types/openstack-wrapper/                       @sanjaymadane
 /types/opentok/                                 @westy92 @CatGuardian
-/types/opentype.js/                             @danmarshall
+/types/opentype.js/                             @danmarshall @edzis
 /types/opn/                                     @shinnn @SomaticIT @tlent
 /types/optics-agent/                            @crevil
 /types/optimist/                                @soywiz @chbrown
 /types/optimize-css-assets-webpack-plugin/      @odnamrataizem
 /types/ora/v0/                                  @screendriver
-/types/ora/                                     @basarat @screendriver @BendingBender
+/types/ora/                                     @basarat @screendriver @BendingBender @azasypkin
 /types/oracledb/                                @Bigous
 /types/orchestrator/                            @tkQubo @TeamworkGuy2
 /types/orderedmap/                              @bradleyayers
@@ -2593,7 +2710,7 @@
 /types/os-locale/                               @AyaMorisawa @BendingBender
 /types/os-name/                                 @BendingBender
 /types/os-tmpdir/                               @mhegazy
-/types/osmosis/                                 @jurajkocan
+/types/osmosis/                                 @jurajkocan @evanshortiss
 /types/osmtogeojson/                            @tkqubo
 /types/osrm/                                    @DenisCarriere
 /types/otplib/                                  @renjfk
@@ -2611,6 +2728,7 @@
 /types/p-every/                                 @BendingBender
 /types/p-lazy/                                  @BendingBender
 /types/p-limit/                                 @BendingBender
+/types/p-loading/                               @renjfk
 /types/p-locate/                                @BendingBender
 /types/p-log/                                   @BendingBender
 /types/p-map/                                   @BendingBender
@@ -2641,7 +2759,10 @@
 /types/paper/                                   @clark-stevenson @Xakaloz
 /types/paralleljs/                              @jbaldwin
 /types/parent-package-json/                     @sgmccli
-/types/parse/                                   @dpoetzsch @jaeggerr @flavionegrao
+/types/parity-pmd/                              @leovujanic @jewbre
+/types/parity-pmr/                              @leovujanic
+/types/parity-poe/                              @leovujanic
+/types/parse/                                   @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes
 /types/parse-git-config/                        @leonard-thieu
 /types/parse-glob/                              @glen-84
 /types/parse-json/                              @mrmlnc
@@ -2653,7 +2774,7 @@
 /types/parse-unit/                              @Jack-Works
 /types/parseurl/                                @bomret
 /types/parsimmon/                               @Bartvds @mizunashi-mana @bcherny @bvanreeven @leonard-thieu
-/types/passport/                                @horiuchi @enaeseth @theigor @tlaziuk
+/types/passport/                                @horiuchi @enaeseth @theigor @tlaziuk @danielpa9708
 /types/passport-anonymous/                      @0x6368656174
 /types/passport-beam/                           @AtlasDev
 /types/passport-discord/                        @kzay
@@ -2663,10 +2784,13 @@
 /types/passport-github2/                        @yasupeke @mthmulders
 /types/passport-google-oauth/                   @staticfunction
 /types/passport-google-oauth2/                  @bluehatbrit
-/types/passport-http/                           @krizalys
+/types/passport-http/                           @krizalys @tlaziuk @cjbarth
 /types/passport-http-bearer/                    @isman-usoh
+/types/passport-jwt/                            @jindev
+/types/passport-kakao/                          @Park9eon
 /types/passport-local/                          @SomaticIT
 /types/passport-local-mongoose/                 @linusbrolin
+/types/passport-naver/                          @Park9eon
 /types/passport-oauth2/                         @pasieronen
 /types/passport-oauth2-client-password/         @akaNightmare
 /types/passport-saml/                           @cjbarth
@@ -2741,7 +2865,7 @@
 /types/playcanvas/                              @Neoflash1979
 /types/playerframework/                         @ricardosabino
 /types/pleasejs/                                @nakakura
-/types/plotly.js/                               @chrisgervang @martinduparc @frederikaalund @taoqf
+/types/plotly.js/                               @chrisgervang @martinduparc @frederikaalund @taoqf @Dadstart
 /types/plugapi/                                 @BNedry
 /types/plugin-error/                            @rogierschouten
 /types/plupload/                                @patrickbussmann
@@ -2802,6 +2926,7 @@
 /types/promise-pg/                              @coldacid
 /types/promise-polyfill/                        @skysteve
 /types/promise-pool/                            @vilic
+/types/promise-queue/                           @LachlanStuart
 /types/promise-retry/                           @shirakaba
 /types/promise.prototype.finally/               @slavik57 @BendingBender
 /types/promised-temp/                           @rokadias
@@ -2820,7 +2945,7 @@
 /types/prosemirror-keymap/                      @bradleyayers @davidka @timjb
 /types/prosemirror-markdown/                    @bradleyayers @davidka @timjb
 /types/prosemirror-menu/                        @bradleyayers @davidka @timjb
-/types/prosemirror-model/                       @bradleyayers @davidka @timjb
+/types/prosemirror-model/                       @bradleyayers @davidka @timjb @neknalb
 /types/prosemirror-schema-basic/                @bradleyayers @davidka @timjb
 /types/prosemirror-schema-list/                 @bradleyayers @davidka @timjb
 /types/prosemirror-state/                       @bradleyayers @davidka @timjb
@@ -2835,18 +2960,19 @@
 /types/proxyquire/                              @jt000
 /types/pty.js/                                  @enlight
 /types/public-ip/                               @BendingBender
-/types/pubnub/                                  @bitbankinc @rollymaduk
+/types/pubnub/                                  @bitbankinc @rollymaduk @vitosamson
 /types/pubsub-js/                               @borisyankov
 /types/pug/                                     @TonyPythoneer @19majkel94
-/types/pulltorefreshjs/                         @DanielRosenwasser
+/types/pulltorefreshjs/                         @DanielRosenwasser @humpedli
 /types/pump/                                    @tlaziuk
 /types/pupa/                                    @nju33
-/types/puppeteer/                               @marvinhagemeister @cdeutsch
+/types/puppeteer/v0/                            @marvinhagemeister @cdeutsch
+/types/puppeteer/                               @marvinhagemeister @cdeutsch @jwbay
 /types/pure-render-decorator/                   @seansfkelley
 /types/purl/                                    @danfma
 /types/pusher-js/                               @tkqubo
 /types/pvutils/                                 @microshine
-/types/python-shell/                            @dolanmiu
+/types/python-shell/                            @dolanmiu @WORMSS
 /types/q/v0/                                    @bnemetchek @johnnyreilly
 /types/q/                                       @bnemetchek @AndrewGaspar @johnnyreilly @mboudreau
 /types/q-io/                                    @Bartvds
@@ -2859,7 +2985,7 @@
 /types/qrcode.react/                            @mleko
 /types/qs/                                      @RWander @leonyu @tehbelinda @zyml @artursvonda @CarlosBonetti
 /types/qtip2/                                   @Seltzer @leonard-thieu
-/types/query-string/                            @SamVerschueren @tkrotoff @huhuanming
+/types/query-string/                            @SamVerschueren @tkrotoff @huhuanming @MadaraUchiha
 /types/quick-lru/                               @BendingBender
 /types/quill/                                   @sumitkm @guillaume-ro-fr @43081j
 /types/quixote/                                 @greybax
@@ -2871,8 +2997,9 @@
 /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
+/types/ramda/                                   @donnut @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @charlespwd @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick
 /types/random-js/                               @pistacchio
+/types/random-number/                           @OpenByteDev
 /types/random-seed/                             @endel
 /types/random-string/                           @stpettersens
 /types/randomcolor/                             @feitzi @BradyLiles
@@ -2882,7 +3009,14 @@
 /types/rappid/                                  @DenEwout
 /types/raspi/                                   @nebrius
 /types/raspi-board/                             @nebrius
+/types/raspi-gpio/                              @nebrius
+/types/raspi-i2c/                               @nebrius
+/types/raspi-led/                               @nebrius
+/types/raspi-onewire/                           @nebrius
 /types/raspi-peripheral/                        @nebrius
+/types/raspi-pwm/                               @nebrius
+/types/raspi-serial/                            @nebrius
+/types/raspi-soft-pwm/                          @nebrius
 /types/ratelimiter/                             @AyaMorisawa
 /types/raty/                                    @terrawheat
 /types/raven/                                   @scttcper @1999
@@ -2904,13 +3038,14 @@
 /types/react-aria-menubutton/                   @forabi @crohlfs
 /types/react-autosuggest/                       @nicolas-schmitt @pjo256 @robessog @tbayne @cdeutsch @rosskevin
 /types/react-beautiful-dnd/                     @varHarrie @bradleyayers
+/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-date-picker/             @LKay @ssi-hu-antal-bodnar
 /types/react-bootstrap-daterangepicker/         @ianks
 /types/react-bootstrap-table/v2/                @flaub @alelode @UJosue10
 /types/react-bootstrap-table/                   @flaub @alelode @UJosue10 @dawnmist @Ogglas
-/types/react-bootstrap-typeahead/               @Guymestef
+/types/react-bootstrap-typeahead/               @Guymestef @radziksh
 /types/react-breadcrumbs/                       @KostyaEsmukov
 /types/react-breadcrumbs-dynamic/               @mitsuruog
 /types/react-broadcast/                         @kandros
@@ -2918,12 +3053,13 @@
 /types/react-calendar-heatmap/                  @9renpoto
 /types/react-calendar-timeline/                 @radziksh
 /types/react-cartographer/                      @trevonmckay
+/types/react-click-outside/                     @screendriver
 /types/react-codemirror/                        @velveret @rudi-c
 /types/react-collapse/                          @Kimahriman
 /types/react-color/                             @LKay @markspolakovs @mntdn
 /types/react-confirm/                           @santiagodoldan
 /types/react-content-loader/                    @alaatm
-/types/react-copy-to-clipboard/                 @mabels
+/types/react-copy-to-clipboard/                 @mabels @BernabeFelix
 /types/react-cropper/                           @stepancar
 /types/react-css-modules/                       @KostyaEsmukov @skirsdeda
 /types/react-css-transition-replace/            @LKay
@@ -2933,7 +3069,7 @@
 /types/react-data-grid/                         @SupernaviX @KieranPeat @martinnov92
 /types/react-datagrid/                          @stephenjelfs
 /types/react-date-range/                        @Junbong
-/types/react-datepicker/                        @radziksh @andrewBalekha @smrq @Rogach @royxue
+/types/react-datepicker/                        @radziksh @andrewBalekha @smrq @Rogach @royxue @KoalaHuman
 /types/react-daterange-picker/                  @uncovertruth @MartynasZilinskas
 /types/react-dates/                             @Artur-A
 /types/react-daum-postcode/                     @Sa-ryong
@@ -2948,13 +3084,15 @@
 /types/react-dropzone/v2/                       @matdube @LynxEyes @goblindegook @benbayard
 /types/react-dropzone/v3/                       @matdube @LynxEyes @goblindegook @benbayard @LKay
 /types/react-dropzone/                          @matdube @LynxEyes @goblindegook @benbayard @LKay @codeaid @jurosh
+/types/react-dynamic-number/                    @eugrdn
 /types/react-easy-chart/                        @danzel
 /types/react-event-listener/                    @asvetliakov
 /types/react-fa/                                @flaub @patsissons @LKay
 /types/react-facebook-login/                    @apare @jankarres
-/types/react-faux-dom/                          @alitaheri @cleverguy25
+/types/react-faux-dom/                          @alitaheri @cleverguy25 @deviousm
 /types/react-file-input/                        @dmitryrogozhny
 /types/react-file-reader-input/                 @dmitryrogozhny @alitaheri
+/types/react-flags-select/                      @senukartur
 /types/react-flatpickr/                         @begincalendar
 /types/react-flex/                              @pushplay
 /types/react-flexr/                             @pushplay
@@ -2969,6 +3107,7 @@
 /types/react-hamburger-menu/                    @grzesie2k
 /types/react-helmet/v4/                         @evanbb @isman-usoh
 /types/react-helmet/                            @evanbb @isman-usoh @lith-light-g @sammkj @yuit
+/types/react-helmet-async/                      @forabi
 /types/react-highlight-words/                   @mhegazy
 /types/react-highlighter/                       @oizie
 /types/react-holder/                            @isman-usoh
@@ -2986,7 +3125,7 @@
 /types/react-input-calendar/                    @stepancar
 /types/react-input-mask/                        @apare
 /types/react-intl/v1/                           @bgrieder
-/types/react-intl/                              @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari
+/types/react-intl/                              @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari @formatlos
 /types/react-intl-redux/                        @LKay
 /types/react-is-deprecated/                     @seansfkelley
 /types/react-joyride/                           @DanielRosenwasser @bendxn
@@ -2997,7 +3136,7 @@
 /types/react-lazyload/                          @m0a
 /types/react-leaflet/                           @danzel @davschne @yuit
 /types/react-list/                              @buptyyf @tomshen
-/types/react-loadable/                          @Kovensky @odensc
+/types/react-loadable/                          @Kovensky @odensc @ianks @tlaziuk
 /types/react-loader/                            @artfuldev
 /types/react-maskedinput/                       @LKay @lavoaster @CarlosBonetti
 /types/react-mce/                               @morphologue
@@ -3006,7 +3145,7 @@
 /types/react-mixin/                             @tkqubo
 /types/react-modal/                             @radziksh @drewnoakes @homburg @ttamminen @hallowatcher @peterblazejewicz
 /types/react-monaco-editor/                     @jnetterf
-/types/react-motion/                            @stepancar @asvetliakov
+/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
@@ -3023,19 +3162,21 @@
 /types/react-native-google-signin/              @j-fro
 /types/react-native-keep-awake/                 @huhuanming
 /types/react-native-linear-gradient/            @j-fro
+/types/react-native-loading-spinner-overlay/    @fhelwanger
 /types/react-native-material-design-searchbar/  @iRoachie
 /types/react-native-material-kit/               @iRoachie @timwangdev
 /types/react-native-material-ui/                @iRoachie
 /types/react-native-mixpanel/                   @r3nya
 /types/react-native-modalbox/                   @iRoachie
+/types/react-native-navigation/                 @egorshulga
 /types/react-native-orientation/                @MoLow
 /types/react-native-popup-dialog/               @PaitoAnderson @connectdotz
-/types/react-native-push-notification/          @PaitoAnderson
+/types/react-native-push-notification/          @PaitoAnderson @tomSawkins
 /types/react-native-qrcode/                     @plantain-00
 /types/react-native-safari-view/                @mrand01
-/types/react-native-scrollable-tab-view/        @CaiHuan
+/types/react-native-scrollable-tab-view/        @CaiHuan @egorshulga
 /types/react-native-sensor-manager/             @SahinVardar
-/types/react-native-snap-carousel/              @jnbt
+/types/react-native-snap-carousel/              @jnbt @j-fro
 /types/react-native-sortable-grid/              @j-fro
 /types/react-native-sortable-list/              @sivolobov
 /types/react-native-svg-uri/                    @iRoachie
@@ -3045,12 +3186,13 @@
 /types/react-native-touch-id/                   @huhuanming
 /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
+/types/react-navigation/                        @huhuanming @mhcgrq @fangpenlin @abrahambotros @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @robertohuertasm @YourGamesBeOver
 /types/react-notification-system/               @GiedriusGrabauskas @DeividasBakanas @LKay @sztobar
 /types/react-notification-system-redux/         @LKay
 /types/react-numeric-input/                     @heatherbooker
 /types/react-onclickoutside/v5/                 @LKay
 /types/react-onclickoutside/                    @LKay
+/types/react-onsenui/                           @salim7 @jemmyw
 /types/react-overlays/                          @aaronbeall @vitosamson
 /types/react-paginate/                          @deevus @wouterhardeman @pegel03 @archy-bold
 /types/react-pointable/                         @istefo @mdibyo
@@ -3058,29 +3200,32 @@
 /types/react-props-decorators/                  @tkqubo
 /types/react-recaptcha/                         @mhegazy @zzanol
 /types/react-redux/                             @tkqubo @thasner @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva
+/types/react-redux-epic/                        @forabi
 /types/react-redux-i18n/                        @clementdevos
 /types/react-redux-toastr/                      @Smiche @artyomsv @kulmajaba
-/types/react-relay/                             @graphcool @voxmatt @alloy
+/types/react-relay/                             @graphcool @voxmatt @alloy @npirotte
 /types/react-resolver/                          @forabi
 /types/react-responsive/v1/                     @asvetliakov
 /types/react-responsive/                        @asvetliakov @alechill @xaviergonz
 /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
+/types/react-router/                            @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy
 /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-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-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
+/types/react-select/                            @Hesquibet @giladgray @iebaker @skirsdeda @vujevits @devrelm @MartynasZilinskas @onatm @ninjaferret @tehbi4 @misantronic
 /types/react-side-effect/                       @remojansen
 /types/react-sidebar/                           @jeroenvervaeke
-/types/react-sketchapp/                         @ricokahler
+/types/react-sketchapp/                         @ricokahler @DomiR
 /types/react-slick/                             @andrewBalekha @GiedriusGrabauskas @r3nya
 /types/react-smooth-scrollbar/                  @asvetliakov
 /types/react-sortable-hoc/                      @NoHomey @charlesrey
@@ -3105,6 +3250,7 @@
 /types/react-test-renderer/v15/                 @arvitaly @lochbrunner @lochbrunner @johnnyreilly
 /types/react-test-renderer/                     @arvitaly @lochbrunner @johnnyreilly @jgoz
 /types/react-tether/                            @ryprice
+/types/react-text-mask/                         @guilhermehubner
 /types/react-textarea-autosize/                 @asvetliakov @zry656565
 /types/react-toastr/                            @shssoichiro
 /types/react-toggle/v2/                         @LKay
@@ -3116,28 +3262,31 @@
 /types/react-transition-group/                  @LKay
 /types/react-treeview/                          @janslow
 /types/react-truncate/                          @mattvperry
+/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-select/                @seansfkelley
 /types/react-weui/                              @tairan
-/types/react-widgets/                           @rogierschouten @sanyatuning @frodehansen2
+/types/react-widgets/                           @rogierschouten @sanyatuning @frodehansen2 @r3nya
 /types/react-widgets-moment/                    @dawnmist
 /types/react-youtube/                           @kgtkr
 /types/reactable/                               @spielc
 /types/reactcss/                                @chrisgervang @LKay
 /types/reactstrap/v4/                           @alihammad @mfal @danilobjr @fabiopaiva
-/types/reactstrap/                              @alihammad @mfal @danilobjr @fabiopaiva @FaithForHumans @KurtPreston
+/types/reactstrap/                              @alihammad @mfal @danilobjr @fabiopaiva @FaithForHumans @KurtPreston @kraenhansen @timc13
 /types/read/                                    @timjk
 /types/read-chunk/                              @crispybee
 /types/read-package-tree/                       @mgroenhoff
 /types/read-pkg/                                @jdxcode
 /types/read-pkg-up/                             @dudeofawesome @jdxcode
+/types/readdir-enhanced/                        @mrmlnc
 /types/readdir-stream/                          @Bartvds
 /types/readline-sync/                           @jonestristand
+/types/readline-transform/                      @dex4er
 /types/reapop/                                  @Barrokgl
 /types/recase/                                  @18steps
-/types/recharts/                                @mthmulders @rapmue @royxue @ZheyangSong
+/types/recharts/                                @mthmulders @rapmue @royxue @ZheyangSong @richbai90
 /types/recompose/                               @iskandersierra @mrapogee @clayne11
 /types/reconnectingwebsocket/                   @nguarracino
 /types/recursive-readdir/v1/                    @elisee
@@ -3171,6 +3320,7 @@
 /types/redux-immutable-state-invariant/         @remojansen @highflying
 /types/redux-infinite-scroll/                   @silkyfray
 /types/redux-injectable-store/                  @unindented
+/types/redux-little-router/                     @priecint
 /types/redux-localstorage/                      @LKay
 /types/redux-localstorage-debounce/             @LKay
 /types/redux-localstorage-filter/               @LKay
@@ -3184,6 +3334,7 @@
 /types/redux-promise-middleware/                @ianks
 /types/redux-recycle/                           @LKay
 /types/redux-router/                            @stepancar
+/types/redux-socket.io/                         @snakeego
 /types/redux-storage/                           @asvetliakov
 /types/redux-storage-engine-jsurl/              @screendriver
 /types/redux-storage-engine-localstorage/       @screendriver
@@ -3196,20 +3347,23 @@
 /types/relateurl/                               @tkrotoff
 /types/relaxed-json/                            @18steps
 /types/relay-runtime/                           @voxmatt @alloy
+/types/remarkable/                              @makepost
 /types/remote-redux-devtools/                   @ColinEberhardt @unindented
 /types/remove-markdown/                         @RagibHasin
 /types/replace-ext/                             @DeividasBakanas
 /types/request/                                 @soywiz @bonnici @Bartvds @joeskeen @ccurrens @lookfirst @mastermatt
 /types/request-ip/                              @mrhen
-/types/request-promise/                         @cglantschnig @joeskeen @AyaMorisawa
-/types/request-promise-native/                  @gustavohenke
+/types/request-promise/                         @cglantschnig @joeskeen @AyaMorisawa @mastermatt
+/types/request-promise-native/                  @gustavohenke @mastermatt
 /types/requestretry/                            @EricByers @trainerbill
 /types/require-dir/                             @weekens
 /types/require-directory/                       @Igmat
 /types/require-from-string/                     @ikatyang
+/types/require-relative/                        @MattiasBuelens
 /types/requirejs/                               @jbaldwin
 /types/requirejs-domready/                      @lefb766
 /types/resemblejs/                              @pimterry
+/types/reservoir/                               @danvk
 /types/resolve/                                 @marionebl @ajafff
 /types/resolve-from/                            @unional
 /types/resourcejs/                              @shaunluttin
@@ -3228,12 +3382,14 @@
 /types/resumablejs/                             @DanielMcAssey
 /types/rethinkdb/                               @alexgorbatchev
 /types/retry/                                   @krenor
+/types/retry-as-promised/                       @Raigen
 /types/rev-hash/                                @ikatyang
 /types/revalidate/                              @alex3165
 /types/revalidator/                             @brewsoftware
 /types/reveal/                                  @robertop87 @Nava2
 /types/rewire/                                  @borislavjivkov @CaselIT
 /types/rfc2047/                                 @mugifly
+/types/rgrove__parse-xml/                       @petejohanson
 /types/rheostat/                                @SashaBayan @kourge
 /types/rickshaw/                                @niemyjski
 /types/rimraf/                                  @soywiz @e-cloud @bash
@@ -3244,16 +3400,16 @@
 /types/riotjs/                                  @vvakame
 /types/rison/                                   @impworks
 /types/rivets/                                  @TrevorDev @matjanos
-/types/rollup/                                  @flying-sheep @csvn
+/types/roads/                                   @dancespiele
 /types/rollup-plugin-json/                      @asmockler
 /types/ronomon__crypto-async/                   @BendingBender
 /types/rosie/                                   @abner @subvertallchris
-/types/roslib/                                  @Pro @skycoop
+/types/roslib/                                  @Pro @skycoop @dgorobopec
 /types/rot-js/                                  @atiaxi
 /types/route-parser/                            @ianks @bobbuehler
 /types/routie/                                  @Adilson
 /types/royalslider/                             @csrakowski
-/types/rpio/                                    @DominikPalo
+/types/rpio/                                    @DominikPalo @Pencl
 /types/rrc/                                     @DeividasBakanas
 /types/rrule/                                   @waratuman
 /types/rsmq/                                    @MugeSo
@@ -3280,6 +3436,7 @@
 /types/rx-lite-time/                            @Igorbek
 /types/rx-lite-virtualtime/                     @Igorbek
 /types/rx.wamp/                                 @darkl
+/types/s3-download-stream/                      @everettcaleb
 /types/s3-upload-stream/                        @geoffreak
 /types/safari-extension/                        @luukd
 /types/safari-extension-content/                @luukd
@@ -3298,6 +3455,7 @@
 /types/sanitize-html/                           @rogierschouten @afshin @BehindTheMath
 /types/sap__xsenv/                              @mad-mike
 /types/sass-graph/                              @marvinhagemeister
+/types/sass-webpack-plugin/                     @AepKill
 /types/sat/                                     @omni360
 /types/satnav/                                  @DotNetNerd
 /types/saywhen/                                 @SeanSobey
@@ -3310,7 +3468,7 @@
 /types/scroller/                                @haskellcamargo
 /types/scrollreveal/                            @Davidblkx
 /types/scrolltofixed/                           @bmdixon
-/types/scrypt-async/                            @xStrom
+/types/scrypt-async/                            @xStrom @stesix
 /types/scryptsy/                                @micksatana
 /types/seamless/                                @danmana
 /types/seamless-immutable/                      @alex3165 @xsburg @geirsagberg
@@ -3350,7 +3508,7 @@
 /types/send/                                    @MikeJerred
 /types/seneca/                                  @psnider
 /types/sequelize/v3/                            @samuelneff @codeanimal @drinchev @morpheusxaut @torhal
-/types/sequelize/                               @samuelneff @codeanimal @drinchev @babolivier @kukoo1 @oktapodia @morpheusxaut @TitaneBoy @zjy01
+/types/sequelize/                               @samuelneff @codeanimal @drinchev @babolivier @kukoo1 @oktapodia @morpheusxaut @TitaneBoy @zjy01 @nidzov @Raigen @todd
 /types/sequelize-fixtures/                      @cschwarz
 /types/sequencify/                              @npenin
 /types/sequester/                               @Strate
@@ -3363,6 +3521,7 @@
 /types/server-destroy/                          @gyszalai
 /types/session-file-store/                      @blendsdk @rokt33r
 /types/set-cookie-parser/                       @nickp10
+/types/set-value/                               @DanielRosenwasser
 /types/sha1/                                    @arcdev1
 /types/shallowequal/                            @seansfkelley
 /types/shapefile/                               @DenisCarriere
@@ -3379,6 +3538,7 @@
 /types/shopify-buy/                             @openminder
 /types/shortid/                                 @stpettersens @despairblue
 /types/shot/                                    @AJamesPhillips
+/types/should-sinon/                            @Arylo
 /types/showdown/                                @cbowdon @tan9
 /types/shrink-ray/                              @forabi
 /types/siema/                                   @Irmiz @0x6368656174 @samnau
@@ -3391,33 +3551,37 @@
 /types/signature_pad/                           @AbubakerB @jrmihalick
 /types/simple-assign/                           @NoHomey
 /types/simple-cw-node/                          @vvakame
+/types/simple-lru/                              @NN---
 /types/simple-mock/                             @leonyu
 /types/simple-oauth2/                           @mad-mike
 /types/simple-peer/                             @tlaziuk
 /types/simple-url-cache/                        @a-lucas
 /types/simple-xml/                              @notVitaliy
 /types/simplebar/v1/                            @gregonnet @leonard-thieu
-/types/simplebar/                               @leonard-thieu
+/types/simplebar/                               @gregonnet @leonard-thieu
 /types/simplemde/                               @Scalesoft
 /types/simplesmtp/                              @rogierschouten
 /types/simplestorage.js/                        @axelcostaspena @mxl
+/types/single-line-log/                         @ffflorian
 /types/sinon/                                   @mrbigdog2u @rationull @lumaxis @nicojs @43081j
 /types/sinon-as-promised/                       @igrayson
 /types/sinon-chai/                              @kazimanzurrashid @jedmao
-/types/sinon-chrome/                            @pimterry
+/types/sinon-chrome/                            @pimterry @crimx
 /types/sinon-express-mock/                      @jpchip @tlaziuk
 /types/sinon-mongoose/                          @stevehipwell
-/types/sinon-stub-promise/                      @vintem
+/types/sinon-stub-promise/                      @vintem @tstackhouse
 /types/sinon-test/                              @mummybot
 /types/sip.js/                                  @decyrus
 /types/sipml/                                   @chookies
 /types/sitemap2/                                @shundy
 /types/sizzle/                                  @leonard-thieu
 /types/sjcl/                                    @Evgenus
+/types/skatejs/                                 @Hotell
 /types/ski/                                     @AyaMorisawa
 /types/skyway/                                  @nakakura
 /types/slack-node/                              @geoffreak
 /types/slack-winston/                           @BlueHatbRit
+/types/slackdown/                               @nju33
 /types/slackify-html/                           @hypexr
 /types/slate-irc/                               @elisee
 /types/sleep/                                   @rajarz
@@ -3439,8 +3603,9 @@
 /types/socket.io/                               @progre @divillysausages @florentpoujol @KentarouTakeda @gigi
 /types/socket.io-client/                        @progre @divillysausages @florentpoujol
 /types/socket.io-parser/                        @plantain-00
-/types/socket.io-redis/                         @nupplaphil
+/types/socket.io-redis/                         @nupplaphil @seeLuck
 /types/socket.io.users/                         @kataras
+/types/socketio-jwt-auth/                       @codeanimal
 /types/socketio-wildcard/                       @BendingBender
 /types/socketty/                                @Nax
 /types/sockjs/                                  @pmccloghrylaing
@@ -3461,7 +3626,7 @@
 /types/spdx-correct/                            @jinwoo
 /types/spdx-satisfies/                          @jinwoo
 /types/spdy/                                    @tony19
-/types/speakeasy/                               @legendecas @mrOlorin
+/types/speakeasy/                               @legendecas @mrOlorin @xeoneux
 /types/speakingurl/                             @Goldsmith42
 /types/spectacle/                               @zmaybury
 /types/spectrum/                                @M-Zuber
@@ -3469,7 +3634,7 @@
 /types/split.js/                                @icholy
 /types/split2/                                  @mugeso
 /types/spotify-api/                             @skovmand
-/types/spotify-web-playback-sdk/                @Festify
+/types/spotify-web-playback-sdk/                @Festify @mraerino @NeoLegends
 /types/sprintf/                                 @soywiz @BendingBender
 /types/sprintf-js/                              @jasonswearingen @BendingBender
 /types/sql.js/                                  @Hozuki
@@ -3493,21 +3658,24 @@
 /types/stats.js/                                @gregolai @hberntsen @danvk
 /types/statsd-client/                           @peterkooijmans @chrisleck
 /types/statuses/                                @tkrotoff @BendingBender
+/types/std-mocks/                               @jdxcode
 /types/steam/                                   @kant2002
 /types/steed/                                   @Paul-Isache
 /types/stemmer/                                 @will-ockmore
 /types/sticky-cluster/                          @paustint
-/types/stompjs/                                 @jimic
+/types/stompjs/                                 @jimic @Dr4k4n
 /types/stoppable/                               @EricByers
 /types/storejs/                                 @vbortone @harry0000
+/types/storybook__addon-a11y/                   @hyunseob
 /types/storybook__addon-actions/                @joscha
 /types/storybook__addon-backgrounds/            @hyunseob
 /types/storybook__addon-info/                   @mkornblum @fyrkant
 /types/storybook__addon-knobs/                  @joscha @martynaskadisa
-/types/storybook__addon-links/                  @joscha
+/types/storybook__addon-links/                  @joscha @jessepinho
 /types/storybook__addon-notes/                  @joscha
 /types/storybook__addon-options/                @joscha
 /types/storybook__react/                        @joscha @wapgear
+/types/storybook__vue/                          @pntgupta
 /types/stream-buffers/                          @Jason3S
 /types/stream-meter/                            @mugeso
 /types/stream-series/                           @k-kagurazaka
@@ -3530,7 +3698,9 @@
 /types/stripe-v2/                               @ejsmith @amritk @adamcmiel @jleider @galuszkak
 /types/stripe-v3/                               @ejsmith @amritk @adamcmiel @jleider @galuszkak
 /types/strong-cluster-control/                  @shuntksh
+/types/strong-log-transformer/                  @azasypkin
 /types/strophe/                                 @DavidKDeutsch
+/types/structured-source/                       @azu
 /types/styled-jsx/                              @R1ZZU
 /types/stylelint/                               @alan-agius4
 /types/stylelint-webpack-plugin/                @bahlo
@@ -3541,7 +3711,7 @@
 /types/suitescript/                             @darrenhillconsulting
 /types/sumo-logger/                             @forabi
 /types/superagent/v2/                           @varju @NicoZelaya @mxl
-/types/superagent/                              @NicoZelaya @mxl @paplorinc
+/types/superagent/                              @NicoZelaya @mxl @paplorinc @shreyjain1994
 /types/superagent-no-cache/                     @mxl
 /types/superagent-prefix/                       @mxl
 /types/supercluster/                            @DenisCarriere
@@ -3555,7 +3725,7 @@
 /types/svg4everybody/                           @BendingBender
 /types/svgjs.draggable/                         @LiFeleSs
 /types/svgjs.resize/                            @jkevingutierrez
-/types/svgo/                                    @bradleyayers
+/types/svgo/                                    @bradleyayers @giladgray
 /types/swag/                                    @shiwano
 /types/swagger-express-middleware/              @alexandreroba
 /types/swagger-express-mw/                      @micmro
@@ -3588,6 +3758,7 @@
 /types/tapable/                                 @e-cloud
 /types/tape/                                    @Bartvds @sodatea @DennisSchwartz @mikehenrty
 /types/tar/                                     @SomaticIT @connor4312
+/types/tar-fs/                                  @Umoxfo
 /types/tcp-ping/                                @stegano
 /types/tedious/                                 @rogierschouten @cjthompson
 /types/tedious-connection-pool/                 @sandorfr
@@ -3604,7 +3775,7 @@
 /types/text-buffer/                             @GlenCFL
 /types/text-encoding/                           @pine613
 /types/text-encoding-utf-8/                     @trxcllnt
-/types/three/                                   @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner @PsychoSTS @dhritzkiv
+/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
 /types/throttle/                                @BendingBender
@@ -3623,7 +3794,7 @@
 /types/tinder/                                  @pingec
 /types/tinycolor2/                              @M-Zuber @geertjansen @nvh
 /types/tinycopy/                                @vvatanabe
-/types/tinymce/                                 @martinduparc @ipoul
+/types/tinymce/                                 @martinduparc @ipoul @nicohartto
 /types/titanium/                                @cyounkins
 /types/title/                                   @fa7ad
 /types/tldjs/                                   @geoffreak
@@ -3660,17 +3831,19 @@
 /types/tweezer.js/                              @praxxis
 /types/twig/                                    @soywiz @enko
 /types/twilio/                                  @nickiannone @ashleybrener
-/types/twit/                                    @Volox @lostfictions
+/types/twit/                                    @Volox @lostfictions @sapphiredev
 /types/twitter/                                 @chitoku-k
 /types/twitter-stream-channels/                 @adrianbardan
 /types/twitter-text/                            @rhysd
 /types/twix/                                    @j3ko
 /types/type-check/                              @hansrwindhoff
+/types/type-detect/v0/                          @Bartvds
 /types/type-detect/                             @Bartvds
 /types/type-is/                                 @BendingBender
 /types/type-name/                               @armorik83
 /types/typeahead/                               @igochkov @gjunge
 /types/typedarray-pool/                         @pawsong
+/types/typeof/                                  @OpenByteDev
 /types/typescript-deferred/                     @DirtyHairy
 /types/tz-format/                               @samverschueren
 /types/ua-parser-js/                            @superduper @legendecas @MeLlamoPablo
@@ -3703,26 +3876,31 @@
 /types/untildify/                               @BendingBender
 /types/unused-filename/                         @BendingBender
 /types/unzip/                                   @coding2012
+/types/unzipper/                                @s73obrien
+/types/update-notifier/v1/                      @vvakame @nchen63
 /types/update-notifier/                         @vvakame @nchen63
+/types/upng-js/                                 @plantain-00
 /types/uppercamelcase/                          @plantain-00
 /types/urbanairship-cordova/                    @Justin-Credible
 /types/uri-templates/                           @Bartvds
-/types/urijs/                                   @RodneyJT @xt0rted
+/types/urijs/                                   @RodneyJT @xt0rted @petejohanson
 /types/uritemplate/                             @teyc @rubensworks
 /types/url-assembler/                           @wolfgang42
 /types/url-join/                                @rogierschouten @devrelm
 /types/url-metadata/                            @mrkmg
 /types/url-parse/                               @ChernenkoPaul
 /types/url-regex/                               @unindented
-/types/url-search-params/                       @nick121212
+/types/url-search-params/                       @nick121212 @nrathi
 /types/url-template/                            @marcinporebski
+/types/urllib/                                  @sorayama
+/types/urlparser/                               @OpenByteDev
 /types/urlrouter/                               @soywiz
 /types/urlsafe-base64/                          @tkrotoff
 /types/usage/                                   @pvomhoff
-/types/usb/                                     @underscorebrody
+/types/usb/                                     @underscorebrody @thegecko
 /types/user-home/                               @mhegazy
 /types/useragent/                               @geoffreak
-/types/username/                                @kayahr
+/types/username/                                @kayahr @krivachy
 /types/utf8/                                    @zelein
 /types/util-deprecate/                          @BendingBender
 /types/util.promisify/                          @adamvoss
@@ -3752,13 +3930,14 @@
 /types/vex-js/                                  @gdcohan
 /types/vexflow/                                 @rquiring @sebastianhaas @bohoffi
 /types/vfile/                                   @bizen241 @rokt33r
+/types/vfile-location/                          @ikatyang
 /types/victory/                                 @asvetliakov @snerks @Havret
 /types/video.js/                                @vbortone @scleriot @SWBennett06 @IgelCampus
 /types/viewability-helper/                      @lironzluf
 /types/viewerjs/                                @lrh3321
 /types/viewporter/                              @borisyankov
 /types/vimeo/                                   @DazWilkin
-/types/vimeo__player/                           @denisyilmaz
+/types/vimeo__player/                           @denisyilmaz @timc13
 /types/vinyl/v0/                                @jedmao
 /types/vinyl/                                   @vvakame @jedmao @thorn0
 /types/vinyl-buffer/                            @tkQubo
@@ -3767,11 +3946,14 @@
 /types/virtual-dom/                             @chbrown
 /types/virtual-keyboard/                        @bsurai
 /types/vis/                                     @MichaelBitard @macleodbroad-wf @adripanico @seveves @kaktus40 @mmaitre314 @supercargo @takato1314
-/types/vision/                                  @jasonswearingen @AJamesPhillips
+/types/vision/v4/                               @jasonswearingen @AJamesPhillips
+/types/vision/                                  @jasonswearingen @AJamesPhillips @lenovouser
 /types/vitalsigns/                              @cyrilschumacher
 /types/vivus/                                   @DanielRosenwasser @lekhmanrus
 /types/vkbeautify/                              @sch3lp
+/types/vnu-jar/                                 @Umoxfo
 /types/voca/                                    @pine
+/types/void-elements/                           @ajafff
 /types/voronoi-diagram/                         @michaelneu
 /types/vortex-web-client/                       @Pro
 /types/voximplant-websdk/                       @aylarov
@@ -3794,7 +3976,7 @@
 /types/watchpack/                               @e-cloud
 /types/waterline/                               @arvitaly
 /types/watson-developer-cloud/                  @waldo000000 @Naktibalda
-/types/waypoints/                               @dominikbulaj @Koloto
+/types/waypoints/                               @dominikbulaj @Koloto @evil-shrike
 /types/wcwidth/                                 @rokt33r
 /types/weak/                                    @int0h
 /types/weapp-api/                               @vargeek
@@ -3809,9 +3991,8 @@
 /types/webfontloader/                           @doskallemaskin
 /types/webgl-ext/                               @zenmumbler
 /types/webgl2/                                  @nkemnitz
-/types/webix/                                   @mkozhukh
 /types/webmidi/                                 @lostfictions
-/types/webpack/                                 @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4
+/types/webpack/                                 @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4 @elliottsj @jason0x43
 /types/webpack-bundle-analyzer/                 @kryops
 /types/webpack-chain/                           @eirikurn @psachs21
 /types/webpack-chunk-hash/                      @mtraynham
@@ -3832,7 +4013,7 @@
 /types/webpack-stream/                          @iclanton @bumbleblym
 /types/webpack-validator/                       @deevus
 /types/webrtc/                                  @nakakura
-/types/websocket/                               @loyd @flynetworks @zhaoleimxd
+/types/websocket/                               @loyd @flynetworks @zhaoleimxd @jdneo
 /types/webspeechapi/                            @saschanaz
 /types/websql/                                  @TeamworkGuy2
 /types/webtorrent/                              @niieani @tlaziuk
@@ -3869,7 +4050,8 @@
 /types/wrench/                                  @soywiz
 /types/write-file-atomic/                       @BendingBender
 /types/write-json-file/                         @DenisCarriere
-/types/ws/                                      @loyd @elithrar @mlamp
+/types/write-pkg/                               @azasypkin
+/types/ws/                                      @loyd @elithrar @mlamp @TitaneBoy
 /types/wtfnode/                                 @dex4er
 /types/wu/                                      @phiresky
 /types/wx-js-sdk-dt/                            @agasbzj
@@ -3878,13 +4060,12 @@
 /types/x-ray-crawler/                           @mtraynham
 /types/xdate/                                   @yamada28go
 /types/xdg-basedir/                             @tlaziuk
-/types/xhr-mock/                                @joscha
 /types/xml/                                     @YuJianrong
 /types/xml-parser/                              @mhfrantz
 /types/xml2js/                                  @michelsalib @jasonrm @ccurrens @edwardhinkle @BehindTheMath
 /types/xml2json/                                @dolanmiu
 /types/xmlbuilder/                              @wallymathieu
-/types/xmldoc/                                  @Xstoudi @ajsheehan
+/types/xmldoc/                                  @Xstoudi @ajsheehan @notlaforge
 /types/xmldom/                                  @tkqubo
 /types/xmlpoke/                                 @garthk
 /types/xmltojson/                               @traviscrowe
@@ -3895,18 +4076,19 @@
 /types/xrm/                                     @6ix4our @mattngan @markusmauch @daryllabar @clownwilleatme @scottdurow
 /types/xsd-schema-validator/                    @Goldsmith42
 /types/xsockets/                                @pushplay
-/types/xterm/                                   @blink1073 @LucianBuzzo
 /types/xxhashjs/                                @mDibyo
 /types/yallist/                                 @BendingBender
 /types/yandex-maps/                             @Delagen
 /types/yandex-money-sdk/                        @chrootsu
+/types/yar/                                     @SimonSchick
 /types/yargs/v8/                                @poelstra @mizunashi-mana @pushplay @jeffkenney
+/types/yargs/v10/                               @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC
 /types/yargs/                                   @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC
+/types/yauzl/                                   @ffflorian
 /types/yayson/                                  @Codesleuth
 /types/ydn-db/                                  @yathit @gabrielmaldi
 /types/yeoman-generator/                        @armorik83 @janslow @ikatyang
 /types/yeoman-test/                             @ikatyang
-/types/yfiles/                                  @yGuy
 /types/yog-bigpipe/                             @ssddi456
 /types/yog-log/                                 @ssddi456
 /types/yog2-kernel/                             @ssddi456
@@ -3914,7 +4096,7 @@
 /types/youtube/                                 @DazWilkin @JoshuaKGoldberg @eliotfallon213
 /types/youtube-dl/                              @bsurai
 /types/yui/                                     @giabao
-/types/yup/                                     @dhardtke @vtserman
+/types/yup/                                     @dhardtke @vtserman @MoretonBayRC
 /types/z-schema/                                @pgonzal
 /types/zapier-platform-core/                    @bradleyayers
 /types/zen-observable/                          @aicest
@@ -3923,9 +4105,13 @@
 /types/zepto/                                   @jbaldwin
 /types/zeroclipboard/v1/                        @ejsmith @niemyjski @balassy @leonyu
 /types/zeroclipboard/                           @ejsmith @niemyjski @balassy @leonyu
-/types/zeromq/                                  @davemckeown @erikma
+/types/zeromq/                                  @davemckeown @erikma @TitaneBoy
 /types/zip.js/                                  @lgrignon
 /types/zipcodes/                                @headdetect
+/types/zipkin-context-cls/                      @plantain-00
+/types/zipkin-instrumentation-express/          @plantain-00
+/types/zipkin-instrumentation-fetch/            @plantain-00
+/types/zipkin-transport-http/                   @plantain-00
 /types/zmq/                                     @davemckeown
 /types/zookeeper/                               @xialeistudio
 /types/zui/                                     @yuanxu

From 58bc7a9ca4c40d86e5b1cc0b732ea12ad2f6733c Mon Sep 17 00:00:00 2001
From: Saulo Tauil <saulogt@users.noreply.github.com>
Date: Tue, 27 Feb 2018 10:13:09 -0800
Subject: [PATCH 339/388] [parse] Adding `original` optional field to
 `BeforeSaveRequest` and overloading response.error (#23887)

* Missing request.original for Parse.Cloud

* Adding parameter to response.error function as it support 1 or 2 parameters

* restoring original state

* fixing cloud code response.error signature. Supporting 2 arguments

* Missing `original` optional field in BeforeSaveRequest.

* Testing `request.original` and the two possible formats of response.erro
---
 types/parse/index.d.ts     |  9 ++++++---
 types/parse/parse-tests.ts | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 95331fe0d7..9e91eb024d 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -891,7 +891,8 @@ declare namespace Parse {
 
         interface FunctionResponse {
             success: (response: any) => void;
-            error: (response: any) => void;
+            error (code: number, response: any): void;
+            error (response: any): void;
         }
 
         interface Cookie {
@@ -912,7 +913,9 @@ declare namespace Parse {
         interface AfterDeleteRequest extends TriggerRequest { }
         interface BeforeDeleteRequest extends TriggerRequest { }
         interface BeforeDeleteResponse extends FunctionResponse { }
-        interface BeforeSaveRequest extends TriggerRequest { }
+        interface BeforeSaveRequest extends TriggerRequest {
+            original?: Parse.Object;
+        }
         interface BeforeSaveResponse extends FunctionResponse {
             success: () => void;
         }
@@ -1147,4 +1150,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 b8d0d0dd0e..5063c1ae53 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -385,6 +385,27 @@ function test_cloud_functions() {
         // result
     });
 
+    const CUSTOM_ERROR_INVALID_CONDITION = 1001
+    const CUSTOM_ERROR_IMMUTABLE_FIELD = 1002
+
+    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 {
+                const original = request.original;
+                if (original == null) { // When the object is not new, request.original must be defined
+                    return response.error(CUSTOM_ERROR_INVALID_CONDITION, 'Original must me defined for an existing object')
+                }
+
+                if (original.get('immutable') !== request.object.get('immutable')) {
+                    return response.error(CUSTOM_ERROR_IMMUTABLE_FIELD, 'This field cannot be changed')
+                }
+            }
+            response.success()
+    });
+
     Parse.Cloud.beforeFind('MyCustomClass', (request: Parse.Cloud.BeforeFindRequest) => {
         let query = request.query; // the Parse.Query
         let user = request.user; // the user

From 3a46aa4c5bc4fc1cc3be5b87c21ff58b088b1296 Mon Sep 17 00:00:00 2001
From: jewbre <jewbre18@gmail.com>
Date: Tue, 27 Feb 2018 19:37:31 +0100
Subject: [PATCH 340/388] soupbintcp type definitions

---
 types/soupbintcp/index.d.ts          | 110 +++++++++++++++++++++++++++
 types/soupbintcp/soupbintcp-tests.ts |  77 +++++++++++++++++++
 types/soupbintcp/tsconfig.json       |  23 ++++++
 types/soupbintcp/tslint.json         |   1 +
 4 files changed, 211 insertions(+)
 create mode 100644 types/soupbintcp/index.d.ts
 create mode 100644 types/soupbintcp/soupbintcp-tests.ts
 create mode 100644 types/soupbintcp/tsconfig.json
 create mode 100644 types/soupbintcp/tslint.json

diff --git a/types/soupbintcp/index.d.ts b/types/soupbintcp/index.d.ts
new file mode 100644
index 0000000000..0158c8e7e3
--- /dev/null
+++ b/types/soupbintcp/index.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for soupbintcp 0.2
+// Project: https://github.com/jvirtanen/node-soupbintcp#readme
+// Definitions by: Vilim Stubičan <https://github.com/jewbre>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+export as namespace soupbintcp;
+
+import { EventEmitter } from 'events';
+import { Socket } from "net";
+
+export class Client extends EventEmitter {
+    constructor(options: { port: number, host: string }, callback?: () => void);
+
+    login(payload: LoginRequestPayload, callback?: (data?: any) => void): void;
+
+    logout(callback?: (data?: any) => void): void;
+
+    send(payload: any, callback?: (data?: any) => void): void;
+
+    end(): void;
+}
+
+export interface ConnectionOptions {
+    rxTimeoutMillis?: number;
+    txIntervalMillis?: number;
+    heartbeatPacketType: PacketType;
+    keepAliveMillis?: number;
+}
+
+export class Connection extends EventEmitter {
+    constructor(socket: Socket, options: ConnectionOptions);
+
+    send(packetType: PacketType, payload: any, callback?: (data?: any) => void): void;
+
+    end(): void;
+}
+
+export enum PacketType {
+    DEBUG = 0x2b, // +
+
+    LOGIN_ACCEPTED = 0x41, // A
+    LOGIN_REJECTED = 0x4a, // J
+    SEQUENCED_DATA = 0x53, // S
+    SERVER_HEARTBEAT = 0x48, // H
+    END_OF_SESSION = 0x5a, // Z
+
+    LOGIN_REQUEST = 0x4c, // L
+    UNSEQUENCED_DATA = 0x55, // U
+    CLIENT_HEARTBEAT = 0x52, // R
+    LOGOUT_REQUEST = 0x4f // O
+}
+
+export interface LoginRequestPayload {
+    username: string;
+    password: string;
+    requestedSession: string;
+    requestedSequenceNumber: number;
+}
+
+export function formatLoginRequest(payload: LoginRequestPayload): Buffer;
+
+export function parseLoginRequest(payload: Buffer): LoginRequestPayload;
+
+export interface LoginAcceptedPayload {
+    username: string;
+    sequenceNumber: number;
+}
+
+export function formatLoginAccepted(payload: LoginAcceptedPayload): Buffer;
+
+export function parseLoginAccepted(payload: Buffer): LoginAcceptedPayload;
+
+export interface LoginRejectedPayload {
+    rejectReasonCode: string;
+}
+
+export function formatLoginRejected(payload: LoginRejectedPayload): Buffer;
+
+export function parseLoginRejected(payload: Buffer): LoginRejectedPayload;
+
+export class Parser {
+    constructor(callback: (packetType: PacketType, payload: Buffer) => void);
+
+    parse(data: Buffer): void;
+}
+
+export class Server extends EventEmitter {
+    constructor(options: { port: number, host: string }, callback?: (data?: any) => void);
+
+    address(): { port: number; family: string; address: string; };
+
+    close(callback: () => void): void;
+}
+
+export class Session extends EventEmitter {
+    constructor(socket: Socket);
+
+    accept(payload: LoginAcceptedPayload, callback?: (data?: any) => void): void;
+
+    reject(payload: LoginRejectedPayload, callback?: (data?: any) => void): void;
+
+    send(payload: any, callback?: (data?: any) => void): void;
+
+    ending(callback?: (data?: any) => void): void;
+
+    end(): void;
+}
\ No newline at end of file
diff --git a/types/soupbintcp/soupbintcp-tests.ts b/types/soupbintcp/soupbintcp-tests.ts
new file mode 100644
index 0000000000..c7fc43c35f
--- /dev/null
+++ b/types/soupbintcp/soupbintcp-tests.ts
@@ -0,0 +1,77 @@
+import { Client, Server } from 'soupbintcp';
+
+// Arrange
+const client = new Client({port: 8000, host: ''});
+const server = new Server({port: 8000, host: ''});
+
+// Act & Assert
+// $ExpectType Client
+new Client({port: 8000, host: ''});
+
+// $ExpectType Server
+new Server({port: 8000, host: ''});
+
+// Invalid type
+// $ExpectError
+new Client({host: ''});
+// Invalid type
+
+// $ExpectError
+new Client({host: 8000});
+
+// $ExpectError
+new Client({port: ''});
+
+// $ExpectError
+new Client({port: 8000});
+
+// $ExpectError
+new Client();
+
+// Invalid type
+// $ExpectError
+new Server({host: ''});
+// Invalid type
+
+// $ExpectError
+new Server({host: 8000});
+
+// $ExpectError
+new Server({port: ''});
+
+// $ExpectError
+new Server({port: 8000});
+
+// $ExpectError
+new Server();
+
+// $ExpectError
+client.login({
+    password: '',
+    requestedSession: '',
+    requestedSequenceNumber: 8000
+});
+
+// $ExpectError
+client.login({
+    username: '',
+    requestedSession: '',
+    requestedSequenceNumber: 8000
+});
+
+// $ExpectError
+client.login({
+    username: '',
+    password: '',
+    requestedSequenceNumber: 8000
+});
+
+// $ExpectError
+client.login({
+    username: '',
+    password: '',
+    requestedSession: '',
+});
+
+// $ExpectError
+client.login();
\ No newline at end of file
diff --git a/types/soupbintcp/tsconfig.json b/types/soupbintcp/tsconfig.json
new file mode 100644
index 0000000000..e934988e2b
--- /dev/null
+++ b/types/soupbintcp/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",
+        "soupbintcp-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/soupbintcp/tslint.json b/types/soupbintcp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/soupbintcp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 8584b12befc2b66e774ae6acf428e7ea14aabcb9 Mon Sep 17 00:00:00 2001
From: jewbre <jewbre18@gmail.com>
Date: Tue, 27 Feb 2018 19:40:31 +0100
Subject: [PATCH 341/388] new lines at the end

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

diff --git a/types/soupbintcp/index.d.ts b/types/soupbintcp/index.d.ts
index 0158c8e7e3..d5ca4146c7 100644
--- a/types/soupbintcp/index.d.ts
+++ b/types/soupbintcp/index.d.ts
@@ -107,4 +107,4 @@ export class Session extends EventEmitter {
     ending(callback?: (data?: any) => void): void;
 
     end(): void;
-}
\ No newline at end of file
+}
diff --git a/types/soupbintcp/soupbintcp-tests.ts b/types/soupbintcp/soupbintcp-tests.ts
index c7fc43c35f..1ad62a8d11 100644
--- a/types/soupbintcp/soupbintcp-tests.ts
+++ b/types/soupbintcp/soupbintcp-tests.ts
@@ -74,4 +74,4 @@ client.login({
 });
 
 // $ExpectError
-client.login();
\ No newline at end of file
+client.login();

From 81260d4bd0d58150f16485703959623227401215 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 27 Feb 2018 19:21:14 +0000
Subject: [PATCH 342/388] Add @babel/code-frame (#23817)

* Add @babel/code-frame

This is based on the definition for babel-code-frame, but adds the new codeFrameColumns method. See https://github.com/babel/babel/tree/master/packages/babel-code-frame for project documentation.

* Rename "Location" to "SourceLocation" to avoid confusion with DOM Location

* Update based on feedback
---
 .../babel__code-frame-tests.ts                | 26 +++++++++
 types/babel__code-frame/index.d.ts            | 54 +++++++++++++++++++
 types/babel__code-frame/tsconfig.json         | 19 +++++++
 types/babel__code-frame/tslint.json           |  1 +
 4 files changed, 100 insertions(+)
 create mode 100644 types/babel__code-frame/babel__code-frame-tests.ts
 create mode 100644 types/babel__code-frame/index.d.ts
 create mode 100644 types/babel__code-frame/tsconfig.json
 create mode 100644 types/babel__code-frame/tslint.json

diff --git a/types/babel__code-frame/babel__code-frame-tests.ts b/types/babel__code-frame/babel__code-frame-tests.ts
new file mode 100644
index 0000000000..380134532e
--- /dev/null
+++ b/types/babel__code-frame/babel__code-frame-tests.ts
@@ -0,0 +1,26 @@
+import codeFrame, { codeFrameColumns } from "@babel/code-frame";
+
+const code = `
+    const number = 1;
+    var string = 'foo';
+
+    function print(name: string) {
+        console.log(string + name);
+    }
+`;
+
+codeFrame(code, 5, 22);
+codeFrame(code, 5, 22, { forceColor: true });
+codeFrame(code, 2, 2, { highlightCode: true });
+
+codeFrameColumns(code, { start: { line: 5, column: 22 } });
+codeFrameColumns(
+    code,
+    { start: { line: 5, column: 22 } },
+    { forceColor: true }
+);
+codeFrameColumns(
+    code,
+    { start: { line: 2, column: 2 } },
+    { highlightCode: true }
+);
diff --git a/types/babel__code-frame/index.d.ts b/types/babel__code-frame/index.d.ts
new file mode 100644
index 0000000000..5a32040bb2
--- /dev/null
+++ b/types/babel__code-frame/index.d.ts
@@ -0,0 +1,54 @@
+// Type definitions for @babel/code-frame 7.0
+// Project: https://github.com/babel/babel/tree/master/packages/babel-code-frame
+// Definitions by: Mohsen Azimi <https://github.com/mohsen1>
+//                 Forbes Lindesay <https://github.com/ForbesLindesay>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface SourceLocation {
+    start: { line: number; column?: number };
+    end?: { line: number; column?: number };
+}
+export function codeFrameColumns(
+    rawLines: string,
+    location: SourceLocation,
+    options?: BabelCodeFrameOptions
+): string;
+
+export interface BabelCodeFrameOptions {
+    /** Syntax highlight the code as JavaScript for terminals. default: false */
+    highlightCode?: boolean;
+    /**  The number of lines to show above the error. default: 2 */
+    linesAbove?: number;
+    /**  The number of lines to show below the error. default: 3 */
+    linesBelow?: number;
+    /**
+     * Forcibly syntax highlight the code as JavaScript (for non-terminals);
+     * overrides highlightCode.
+     * default: false
+     */
+    forceColor?: boolean;
+    /**
+     * Pass in a string to be displayed inline (if possible) next to the
+     * highlighted location in the code. If it can't be positioned inline,
+     * it will be placed above the code frame.
+     * default: nothing
+     */
+    message?: string;
+}
+
+/**
+ * Generate errors that contain a code frame that point to source locations.
+ *
+ * @param rawLines Raw lines to frame
+ * @param lineNumber Line number (1 indexed)
+ * @param colNumber Column number
+ * @param options Additional options
+ *
+ * @returns Framed code
+ */
+export default function codeFrame(
+    rawLines: string,
+    lineNumber: number,
+    colNumber: number,
+    options?: BabelCodeFrameOptions
+): string;
diff --git a/types/babel__code-frame/tsconfig.json b/types/babel__code-frame/tsconfig.json
new file mode 100644
index 0000000000..49bd833b58
--- /dev/null
+++ b/types/babel__code-frame/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@babel/code-frame": ["babel__code-frame"]
+        }
+    },
+    "files": ["index.d.ts", "babel__code-frame-tests.ts"]
+}
diff --git a/types/babel__code-frame/tslint.json b/types/babel__code-frame/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/babel__code-frame/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 564db62a5c528a0675ac58b1cac2ef04d569023a Mon Sep 17 00:00:00 2001
From: Ram Zallan <ramzallan@gmail.com>
Date: Tue, 27 Feb 2018 11:41:43 -0800
Subject: [PATCH 343/388] Add fetchAll definition to google-apps-script

---
 types/google-apps-script/google-apps-script.url-fetch.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/google-apps-script/google-apps-script.url-fetch.d.ts b/types/google-apps-script/google-apps-script.url-fetch.d.ts
index fc24727f67..4e8d45ec16 100644
--- a/types/google-apps-script/google-apps-script.url-fetch.d.ts
+++ b/types/google-apps-script/google-apps-script.url-fetch.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Google Apps Script 2017-05-12
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
+//                 ramzallan <https://github.com/ramzallan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="google-apps-script.types.d.ts" />
@@ -92,6 +93,7 @@ declare namespace GoogleAppsScript {
      */
     export interface UrlFetchApp {
       fetch(url: string, params?: URLFetchRequestOptions): HTTPResponse;
+      fetchAll(requests: Object[]): HTTPResponse[];
       getRequest(url: string, params?: URLFetchRequestOptions): Object;
     }
 

From 258aaf6d62897bdf38ac17661cfa81bd8fcc971e Mon Sep 17 00:00:00 2001
From: Ken Lim <ken.limcf@gmail.com>
Date: Wed, 28 Feb 2018 10:19:46 +0800
Subject: [PATCH 344/388] [react-native] Add injectJavaScript method to WebView

---
 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 717135e7d4..1faa31da8f 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -2184,6 +2184,11 @@ export interface WebViewStatic extends React.ClassicComponentClass<WebViewProper
      * Returns the native webview node.
      */
     getWebViewHandle: () => any;
+
+    /**
+     * Inject JavaScript to be executed immediately.
+     */
+    injectJavaScript: (script: string) => void;
 }
 
 /**

From 2bd4bc0984abab28a61c84214e5ae2bf553a8451 Mon Sep 17 00:00:00 2001
From: Erik Trom <eriktrom@users.noreply.github.com>
Date: Tue, 27 Feb 2018 21:13:30 -0800
Subject: [PATCH 345/388] Add `QUnit.todo(name, callback)` function signature

- see https://api.qunitjs.com/QUnit/todo for docs used

@waratuman - I've only added this function to the interface, but
I bumped the type definitions for QUnit at the top of the file from
`v2.0.1` to `v2.5.0`. This may not accurately reflect the 2.5.0 QUnit
api in full, fyi. (advise if this concerns you).
---
 types/qunit/index.d.ts     | 17 ++++++++++++++++-
 types/qunit/qunit-tests.ts |  4 ++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/types/qunit/index.d.ts b/types/qunit/index.d.ts
index d793a68c3e..a0276a3488 100644
--- a/types/qunit/index.d.ts
+++ b/types/qunit/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for QUnit v2.0.1
+// Type definitions for QUnit v2.5.0
 // Project: http://qunitjs.com/
 // Definitions by: James Bracy <https://github.com/waratuman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -580,6 +580,21 @@ interface QUnit {
      */
     testStart(callback: (details: { name: string; module: string;}) => void): void;
 
+    /**
+     * Adds a test which expects at least one failing assertion during its run.
+     *
+     * Use this method to test a unit of code which is still under development
+     * (in a “todo” state). The test will pass as long as one failing assertion
+     * is present.
+     *
+     * If all assertions pass, then the test will fail signaling that QUnit.todo
+     * should be replaced by QUnit.test.
+     *
+     * @param {string} Title of unit being tested
+     * @param callback Function to close over assertions
+     */
+    todo(name: string, callback?: (assert: Assert) => void): void;
+
     /**
      * Are the test running from the server or not.
      */ 
diff --git a/types/qunit/qunit-tests.ts b/types/qunit/qunit-tests.ts
index f6b645875f..25ffc9fbf1 100644
--- a/types/qunit/qunit-tests.ts
+++ b/types/qunit/qunit-tests.ts
@@ -552,3 +552,7 @@ QUnit.module( "module", {
 QUnit.test( "test with beforeEach and afterEach", function( assert ) {
   assert.expect( 2 );
 });
+
+QUnit.todo( "a todo test", function( assert ) {
+  assert.equal( 0, 1, "0 does not equal 1, so this todo should pass" );
+});

From 331f58b3b8a2a2f2e997617fbb1ac261d0a77292 Mon Sep 17 00:00:00 2001
From: CodeAnimal <codeanimal@outlook.com>
Date: Wed, 28 Feb 2018 09:50:46 +0000
Subject: [PATCH 346/388] Add `days_until_due` argument when creating/updating
 subscription

With tests.

https://stripe.com/docs/api#create_subscription-days_until_due
---
 types/stripe/index.d.ts      | 11 +++++++++++
 types/stripe/stripe-tests.ts |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 12f2b4abea..f35dcbd979 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -4384,6 +4384,12 @@ declare namespace Stripe {
              * instructions. Defaults to "charge_automatically".
              */
             billing?: SubscriptionBilling;
+
+            /**
+             * Number of days a customer has to pay invoices generated by this subscription. 
+             * Only valid for subscriptions where billing=send_invoice.
+             */
+            days_until_due?: number;
         }
 
         interface ISubscriptionCreationOptions extends ISubscriptionCustCreationOptions {
@@ -4456,6 +4462,11 @@ declare namespace Stripe {
              */
             billing?: SubscriptionBilling;
 
+            /**
+             * Number of days a customer has to pay invoices generated by this subscription. Only valid for subscriptions where billing=send_invoice.
+             */
+            days_until_due?: number;
+
             /**
              * List of subscription items, each with an attached plan.
              */
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index b887ae6228..47c58b0f7c 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -253,12 +253,13 @@ stripe.customers.create({
 
     customer.subscriptions.create({ items: [{ plan: "gold" }] }).then(function (subscription) { });
     customer.subscriptions.create({ items: [{ plan: "gold" }], trial_end: "now" }).then(function (subscription) { });
-    customer.subscriptions.create({ items: [{ plan: "gold" }], trial_end: 1516881177 }).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) {
         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" });
-    customer.subscriptions.update("sub_8Eluur5KoIKxuy", { trial_end: 1516881177 });
+    customer.subscriptions.update("sub_8Eluur5KoIKxuy", { trial_end: 1516881177, billing: "send_invoice", days_until_due: 7 });
     customer.subscriptions.list().then(function (subscriptions) { });
     customer.subscriptions.del("sub_8Eluur5KoIKxuy").then(function (subscription) { });
     customer.subscriptions.deleteDiscount("sub_8Eluur5KoIKxuy").then(function (confirmation) { });

From 82bfcaea76889b46198ca634a6055427264b2b70 Mon Sep 17 00:00:00 2001
From: CodeAnimal <codeanimal@outlook.com>
Date: Wed, 28 Feb 2018 09:57:36 +0000
Subject: [PATCH 347/388] Add `billing_cycle_anchor` argument when
 creating/updating subscription

With tests.

https://stripe.com/docs/api#create_subscription-billing_cycle_anchor
https://stripe.com/docs/api#update_subscription-billing_cycle_anchor
---
 types/stripe/index.d.ts      | 11 +++++++++++
 types/stripe/stripe-tests.ts |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index f35dcbd979..b96acc1206 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -4390,6 +4390,12 @@ declare namespace Stripe {
              * Only valid for subscriptions where billing=send_invoice.
              */
             days_until_due?: number;
+
+            /**
+             * A future timestamp to anchor the subscription’s billing cycle. This is used to determine the date of the first full invoice, and, for plans
+             * with month or year intervals, the day of the month for subsequent invoices.
+             */
+            billing_cycle_anchor?: number;
         }
 
         interface ISubscriptionCreationOptions extends ISubscriptionCustCreationOptions {
@@ -4471,6 +4477,11 @@ declare namespace Stripe {
              * List of subscription items, each with an attached plan.
              */
             items?: ISubscriptionUpdateItem[];
+
+            /**
+             * String, unchanged (default) or now. This allows you to reset the billing cycle of a subscription.
+             */
+            billing_cycle_anchor?: "unchanged" | "now";
         }
 
         interface ISubscriptionCancellationOptions extends IDataOptions {
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 47c58b0f7c..ee1a7f9f21 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -252,14 +252,14 @@ stripe.customers.create({
     customer.cards.del("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (confirmation) {});
 
     customer.subscriptions.create({ items: [{ plan: "gold" }] }).then(function (subscription) { });
-    customer.subscriptions.create({ items: [{ plan: "gold" }], trial_end: "now" }).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: 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) {
         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" });
-    customer.subscriptions.update("sub_8Eluur5KoIKxuy", { trial_end: 1516881177, billing: "send_invoice", days_until_due: 7 });
+    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.list().then(function (subscriptions) { });
     customer.subscriptions.del("sub_8Eluur5KoIKxuy").then(function (subscription) { });
     customer.subscriptions.deleteDiscount("sub_8Eluur5KoIKxuy").then(function (confirmation) { });

From aaac8968919260048678961ea9ab0d3b37cdc760 Mon Sep 17 00:00:00 2001
From: CodeAnimal <codeanimal@outlook.com>
Date: Wed, 28 Feb 2018 10:00:33 +0000
Subject: [PATCH 348/388] Add `trial_period_days` argument when creating
 subscription

With tests.

https://stripe.com/docs/api#create_subscription-trial_period_days
---
 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 b96acc1206..57c97f4790 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -4373,6 +4373,11 @@ declare namespace Stripe {
              */
             trial_end?: number | "now";
 
+            /**
+             * Integer representing the number of trial period days before the customer is charged for the first time.
+             */
+            trial_period_days?: number;
+
             /**
              * List of subscription items, each with an attached plan.
              */
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index ee1a7f9f21..7f3a42d4c6 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -251,7 +251,7 @@ stripe.customers.create({
     customer.cards.list().then(function (cards) {});
     customer.cards.del("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (confirmation) {});
 
-    customer.subscriptions.create({ items: [{ plan: "gold" }] }).then(function (subscription) { });
+    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: 1516881177, billing: "send_invoice", days_until_due: 7 }).then(function (subscription) { });
     customer.subscriptions.create({ items: [{ plan: "gold" }], billing: "charge_automatically" }).then(function (subscription) { });

From 5e8c77c4bc456984644c5ee6362e28e2ccfcc4dc Mon Sep 17 00:00:00 2001
From: Ernest Galbrun <ernest.galbrun@gmail.com>
Date: Wed, 28 Feb 2018 12:33:07 +0100
Subject: [PATCH 349/388] Fix the type of the window object provided by the
 PanelShownEvent

---
 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 cd12179213..cde1de9092 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -1740,7 +1740,7 @@ declare namespace chrome.devtools.network {
  * Availability: Since Chrome 18.
  */
 declare namespace chrome.devtools.panels {
-    export interface PanelShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
+    export interface PanelShownEvent extends chrome.events.Event<(window: Window) => void> {}
 
     export interface PanelHiddenEvent extends chrome.events.Event<() => void> {}
 

From 6ba4e9c43a7d11fb0a0553a14e0d469f9687a418 Mon Sep 17 00:00:00 2001
From: s0m3on3 <amedvedev@ciferox.com>
Date: Wed, 28 Feb 2018 14:27:20 +0200
Subject: [PATCH 350/388] [adone] fix util.throttle options

---
 types/adone/glosses/utils.d.ts    | 2 +-
 types/adone/test/glosses/utils.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/adone/glosses/utils.d.ts b/types/adone/glosses/utils.d.ts
index d1a0aa49bc..5d2eb5f198 100644
--- a/types/adone/glosses/utils.d.ts
+++ b/types/adone/glosses/utils.d.ts
@@ -536,7 +536,7 @@ declare namespace adone {
         namespace throttle {
             namespace I {
                 interface Options {
-                    max?: number;
+                    concurrency?: number;
                     interval?: number;
                     ordered?: boolean;
                     waitForReturn?: boolean;
diff --git a/types/adone/test/glosses/utils.ts b/types/adone/test/glosses/utils.ts
index f0b789c78b..a01d010608 100644
--- a/types/adone/test/glosses/utils.ts
+++ b/types/adone/test/glosses/utils.ts
@@ -472,7 +472,7 @@ namespace utilTests {
         const c: (a: number, b: string) => Promise<string> = util.throttle.create((a: number, b: string) => String(a) + b);
         const d = util.throttle.create(() => { }, {});
         const e = util.throttle.create(() => { }, { interval: 1000 });
-        const f = util.throttle.create(() => { }, { max: 10 });
+        const f = util.throttle.create(() => { }, { concurrency: 10 });
         const g = util.throttle.create(() => { }, { ordered: true });
         const h = util.throttle.create(() => { }, { waitForReturn: true });
         const i = util.throttle.create(() => { }, { onDone() {} });

From 848d5c5ebc6f8fc6c6ae95c95f4282d10edc192c Mon Sep 17 00:00:00 2001
From: Tiger Oakes <tigeroakes@gmail.com>
Date: Wed, 28 Feb 2018 08:04:04 -0800
Subject: [PATCH 351/388] Added requestRenderAll, pathOffset, fixed loadImage
 (#23962)

---
 types/fabric/fabric-impl.d.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index f2570b9542..397ea8984a 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -1073,6 +1073,12 @@ export class StaticCanvas {
 	 */
 	renderAll(allOnTop?: boolean): this;
 
+	/**
+	 * Append a renderAll request to next animation frame. a boolean flag will avoid appending more.
+	 * @chainable
+	 */
+	requestRenderAll(): this;
+
 	/**
 	 * Method to render only the top canvas.
 	 * Also used to render the group selection box.
@@ -2688,6 +2694,8 @@ export class Path {
 	 */
 	constructor(path?: string|any[], options?: IPathOptions);
 
+	pathOffset: Point;
+
 	initialize(path?: any[], options?: IPathOptions): Path;
 
 	/**
@@ -4326,7 +4334,7 @@ interface IUtilMisc {
 	 * @param [context] Context to invoke callback in
 	 * @param [crossOrigin] crossOrigin value to set image element to
 	 */
-	loadImage(url: string, callback: (image: HTMLImageElement) => {}, context?: any, crossOrigin?: boolean): void;
+	loadImage(url: string, callback: (image: HTMLImageElement) => void, context?: any, crossOrigin?: boolean): void;
 
 	/**
 	 * Creates corresponding fabric instances from their object representations

From 3f7c783b0a9add99477f9b88cb20886fca443b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?bartek=20szczepa=C5=84ski?= <hello@barnski.pl>
Date: Wed, 28 Feb 2018 17:04:29 +0100
Subject: [PATCH 352/388] Change redis.print declaration to comply to callback
 signature. (#23964)

As shown in node_redis examples redis.print is nice utility to be used as callback.

With current type declarations it was not possible due to mismatch null vs. undefined.

I decided to update redis.print signature to not break other methods by changing Callback
---
 types/redis/index.d.ts     | 3 ++-
 types/redis/redis-tests.ts | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/redis/index.d.ts b/types/redis/index.d.ts
index 85dfc05596..c45eb9a1f8 100644
--- a/types/redis/index.d.ts
+++ b/types/redis/index.d.ts
@@ -6,6 +6,7 @@
 //                 Stuart Schechter <https://github.com/UppaJung>
 //                 Junyoung Choi <https://github.com/Rokt33r>
 //                 James Garbutt <https://github.com/43081j>
+//                 Bartek Szczepański <https://github.com/barnski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Imported from: https://github.com/types/npm-redis
@@ -1238,4 +1239,4 @@ export function createClient(unix_socket: string, options?: ClientOpts): RedisCl
 export function createClient(redis_url: string, options?: ClientOpts): RedisClient;
 export function createClient(options?: ClientOpts): RedisClient;
 
-export function print(err: Error | undefined, reply: any): void;
+export function print(err: Error | null, reply: any): void;
diff --git a/types/redis/redis-tests.ts b/types/redis/redis-tests.ts
index 4c38b9046e..278887518b 100644
--- a/types/redis/redis-tests.ts
+++ b/types/redis/redis-tests.ts
@@ -121,3 +121,7 @@ client.uncork();
 // Add command
 client.add_command('my command');
 client.addCommand('my other command');
+
+// redis.print as callback
+client.set(str, str, redis.print);
+client.get(str, redis.print);

From 2fd2776cb89f9e0bcac17465b6c3099b4c771cec Mon Sep 17 00:00:00 2001
From: Daniel McGraw <dan.j.mcgraw@gmail.com>
Date: Wed, 28 Feb 2018 09:08:25 -0700
Subject: [PATCH 353/388] JWPlayer :: Add missing getContainer function def

---
 types/jwplayer/index.d.ts    | 4 +++-
 types/jwplayer/tsconfig.json | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index 87a7526267..cb40e26da7 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Martin Duparc <https://github.com/martinduparc>
 //                 Tomer Kruvi <https://github.com/kutomer>
 //                 Philipp Gürtler <https://github.com/philippguertler>
+//                 Daniel McGraw <https://github.com/danielmcgraw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // JW Player is the leading HTML5 & Flash video player, optimized for mobile and the desktop. Easy enough for beginners, advanced enough for pros.
@@ -254,7 +255,8 @@ interface JWPlayer {
 	getSafeRegion(): Region;
 	getState(): string;
 	getVolume(): number;
-    getEnvironment(): Environment;
+  getContainer(): HTMLElement;
+  getEnvironment(): Environment;
 	getWidth(): number;
 	load(playlist: any[]): void;
 	load(playlist: string): void;
diff --git a/types/jwplayer/tsconfig.json b/types/jwplayer/tsconfig.json
index abf333c6bf..71e6b79545 100644
--- a/types/jwplayer/tsconfig.json
+++ b/types/jwplayer/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -19,4 +20,4 @@
     "files": [
         "index.d.ts"
     ]
-}
\ No newline at end of file
+}

From e274bfb6e46d6f9ad53333b01344b376f177f4ef Mon Sep 17 00:00:00 2001
From: Brian Surowiec <xtorted@optonline.net>
Date: Wed, 28 Feb 2018 14:17:33 -0500
Subject: [PATCH 354/388] Add typings for anchor-js (#23957)

---
 types/anchor-js/anchor-js-tests.ts | 16 ++++++++++++
 types/anchor-js/index.d.ts         | 41 ++++++++++++++++++++++++++++++
 types/anchor-js/tsconfig.json      | 23 +++++++++++++++++
 types/anchor-js/tslint.json        |  3 +++
 4 files changed, 83 insertions(+)
 create mode 100644 types/anchor-js/anchor-js-tests.ts
 create mode 100644 types/anchor-js/index.d.ts
 create mode 100644 types/anchor-js/tsconfig.json
 create mode 100644 types/anchor-js/tslint.json

diff --git a/types/anchor-js/anchor-js-tests.ts b/types/anchor-js/anchor-js-tests.ts
new file mode 100644
index 0000000000..a27e09605a
--- /dev/null
+++ b/types/anchor-js/anchor-js-tests.ts
@@ -0,0 +1,16 @@
+anchors.add();
+anchors.add('h1');
+anchors.add().add('h2');
+
+anchors.remove();
+anchors.remove('h1');
+anchors.remove().remove('h2');
+
+anchors.removeAll();
+
+const headerAnchors = new AnchorJS();
+
+const footerAnchors = new AnchorJS({
+    placement: 'right',
+});
+footerAnchors.remove('.links');
diff --git a/types/anchor-js/index.d.ts b/types/anchor-js/index.d.ts
new file mode 100644
index 0000000000..1f59c295e2
--- /dev/null
+++ b/types/anchor-js/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for anchor-js 4.1
+// Project: https://github.com/bryanbraun/anchorjs
+// Definitions by: Brian Surowiec <https://github.com/xt0rted>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace anchorjs {
+    interface Anchor {
+        options: AnchorOptions;
+
+        add(selector?: string): Anchor;
+        remove(selector?: string): Anchor;
+        removeAll(): void;
+    }
+
+    type AnchorPlacement = 'left' | 'right';
+    type AnchorVisibility = 'always' | 'hover' | 'touch';
+
+    interface AnchorOptions {
+        arialabel?: string;
+        class?: string;
+        icons?: string;
+        placement?: AnchorPlacement;
+        truncate?: number;
+        visible?: AnchorVisibility;
+    }
+
+    interface AnchorStatic {
+        new(options?: AnchorOptions): Anchor;
+    }
+}
+
+declare const anchors: anchorjs.Anchor;
+declare const AnchorJS: anchorjs.AnchorStatic;
+
+export = AnchorJS;
+
+export as namespace AnchorJS;
+
+declare global {
+    const anchors: anchorjs.Anchor;
+}
diff --git a/types/anchor-js/tsconfig.json b/types/anchor-js/tsconfig.json
new file mode 100644
index 0000000000..19f6891217
--- /dev/null
+++ b/types/anchor-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",
+        "anchor-js-tests.ts"
+    ]
+}
diff --git a/types/anchor-js/tslint.json b/types/anchor-js/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/anchor-js/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 5befd021c25eea46dd1e164e77c70672467e74fa Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Wed, 28 Feb 2018 12:17:33 -0800
Subject: [PATCH 355/388] angular-touchspin: Provides its own types (#23878)

---
 notNeededPackages.json                        |  6 ++
 .../angular-touchspin-tests.ts                | 29 -------
 types/angular-touchspin/index.d.ts            | 43 ----------
 types/angular-touchspin/tsconfig.json         | 24 ------
 types/angular-touchspin/tslint.json           | 79 -------------------
 5 files changed, 6 insertions(+), 175 deletions(-)
 delete mode 100644 types/angular-touchspin/angular-touchspin-tests.ts
 delete mode 100644 types/angular-touchspin/index.d.ts
 delete mode 100644 types/angular-touchspin/tsconfig.json
 delete mode 100644 types/angular-touchspin/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 3abaa12d26..a3423d479c 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -24,6 +24,12 @@
             "sourceRepoURL": "https://github.com/epoberezkin/ajv",
             "asOfVersion": "1.0.0"
         },
+        {
+            "libraryName": "angular-touchspin",
+            "typingsPackageName": "angular-touchspin",
+            "sourceRepoURL": "https://github.com/nkovacic/angular-touchspin",
+            "asOfVersion": "1.8.2"
+        },
         {
             "libraryName": "angular-ui-router-default",
             "typingsPackageName": "angular-ui-router-default",
diff --git a/types/angular-touchspin/angular-touchspin-tests.ts b/types/angular-touchspin/angular-touchspin-tests.ts
deleted file mode 100644
index 32396365d9..0000000000
--- a/types/angular-touchspin/angular-touchspin-tests.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import angularTouchSpin = require("angular-touchspin");
-import * as angular from 'angular';
-
-angular
-    .module('touchspin-tests', ['nk.touchspin'])
-    .config(function(touchspinConfigProvider: angular.touchspin.ITouchSpinConfigProvider) {
-        touchspinConfigProvider.defaults(<angular.touchspin.ITouchSpinOptions>{
-            min: 0,
-            max: 0,
-            step: 0,
-            decimals: 0,
-            stepInterval: 0,
-            forceStepDivisibility: '', // none | floor | round | ceil
-            stepIntervalDelay: 0,
-            verticalButtons: true,
-            verticalUpClass: '',
-            verticalDownClass: '',
-            initVal: 0,
-            prefix: '',
-            postfix: '',
-            prefixExtraClass: '',
-            postfixExtraClass: '',
-            mousewheel: true,
-            buttonDownClass: '',
-            buttonUpClass: '',
-            buttonDownTxt: '',
-            buttonUpTxt: ''
-        });
-    });
diff --git a/types/angular-touchspin/index.d.ts b/types/angular-touchspin/index.d.ts
deleted file mode 100644
index 305a033275..0000000000
--- a/types/angular-touchspin/index.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Type definitions for Angular Touchspin v1.0.0
-// Project: https://github.com/nkovacic/angular-touchspin
-// Definitions by: Niko Kovačič <https://github.com/nkovacic>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="angular" />
-
-declare let angularTouchSpin: string;
-export = angularTouchSpin;
-
-declare module "angular" {
-    namespace touchspin {
-        interface ITouchSpinOptions {
-            min?: number;
-            max?: number;
-            step?: number;
-            decimals?: number;
-            stepInterval?: number;
-            forceStepDivisibility?: string; // none | floor | round | ceil
-            stepIntervalDelay?: number;
-            verticalButtons?: boolean;
-            verticalUpClass?: string;
-            verticalDownClass?: string;
-            initVal?: number;
-            prefix?: string;
-            postfix?: string;
-            prefixExtraClass?: string;
-            postfixExtraClass?: string;
-            mousewheel?: boolean;
-            buttonDownClass?: string;
-            buttonUpClass?: string;
-            buttonDownTxt?: string;
-            buttonUpTxt?: string;
-        }
-
-        interface ITouchSpinConfig extends ITouchSpinOptions { }
-
-        interface ITouchSpinConfigProvider {
-            defaults(touchSpinOptions: ITouchSpinOptions): void;
-        }
-    }
-}
diff --git a/types/angular-touchspin/tsconfig.json b/types/angular-touchspin/tsconfig.json
deleted file mode 100644
index 8c3d5338c4..0000000000
--- a/types/angular-touchspin/tsconfig.json
+++ /dev/null
@@ -1,24 +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",
-        "angular-touchspin-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/angular-touchspin/tslint.json b/types/angular-touchspin/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/angular-touchspin/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 72a7f7bbb3d95ccc19d8b034f3afc59b154e5ece Mon Sep 17 00:00:00 2001
From: desahaMS <36082685+desahaMS@users.noreply.github.com>
Date: Thu, 1 Mar 2018 01:51:01 +0530
Subject: [PATCH 356/388] Update index.d.ts (#23790)

---
 types/office-js/index.d.ts | 2268 ++++++++++++++++++++++++++++++++++++
 1 file changed, 2268 insertions(+)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 138e12c7b5..159293057e 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -2607,7 +2607,22 @@ declare namespace OfficeExtension {
         /** Synchronizes the state between JavaScript proxy objects and the Office document, by executing instructions queued on the request context and retrieving properties of loaded Office objects for use in your code.�This method returns a promise, which is resolved when the synchronization is complete. */
         sync<T>(passThroughValue?: T): IPromise<T>;
     }
+
+    export interface EmbeddedOptions {
+		sessionKey?: string,
+		container?: HTMLElement,
+		id?: string;
+		timeoutInMilliseconds?: number;
+		height?: string;
+		width?: string;
+    }
+
+    class EmbeddedSession {
+        constructor(url: string, options?: EmbeddedOptions);
+        public init(): IPromise<any>;
+    }
 }
+
 declare namespace OfficeExtension {
     /** Contains the result for methods that return primitive types. The object's value property is retrieved from the document after "context.sync()" is invoked. */
     class ClientResult<T> {
@@ -22311,3 +22326,2256 @@ declare namespace OneNote {
 ////////////////////////////////////////////////////////////////
 /////////////////////// End OneNote APIs ///////////////////////
 ////////////////////////////////////////////////////////////////
+
+
+
+////////////////////////////////////////////////////////////////
+/////////////////////// Begin Visio APIs ///////////////////////
+////////////////////////////////////////////////////////////////
+
+
+
+declare namespace Visio {
+    /**
+     *
+     * Provides information about the shape that raised the ShapeMouseEnter event.
+     *
+     * [Api set:  1.1]
+     */
+    interface ShapeMouseEnterEventArgs {
+        /**
+         *
+         * Gets the name of the page which has the shape object that raised the ShapeMouseEnter event.
+         *
+         * [Api set:  1.1]
+         */
+        pageName: string;
+        /**
+         *
+         * Gets the shape object that raised the ShapeMouseEnter event.
+         *
+         * [Api set:  1.1]
+         */
+        shapeName: string;
+    }
+    /**
+     *
+     * Provides information about the shape that raised the ShapeMouseLeave event.
+     *
+     * [Api set:  1.1]
+     */
+    interface ShapeMouseLeaveEventArgs {
+        /**
+         *
+         * Gets the name of the page which has the shape object that raised the ShapeMouseLeave event.
+         *
+         * [Api set:  1.1]
+         */
+        pageName: string;
+        /**
+         *
+         * Gets the shape object that raised the ShapeMouseLeave event.
+         *
+         * [Api set:  1.1]
+         */
+        shapeName: string;
+    }
+    /**
+     *
+     * Provides information about the page that raised the PageLoadComplete event.
+     *
+     * [Api set:  1.1]
+     */
+    interface PageLoadCompleteEventArgs {
+        /**
+         *
+         * Gets the name of the page that raised the PageLoad event.
+         *
+         * [Api set:  1.1]
+         */
+        pageName: string;
+        /**
+         *
+         * Gets the success/failure of the PageLoadComplete event.
+         *
+         * [Api set:  1.1]
+         */
+        success: boolean;
+    }
+    /**
+     *
+     * Provides information about the document that raised the DataRefreshComplete event.
+     *
+     * [Api set:  1.1]
+     */
+    interface DataRefreshCompleteEventArgs {
+        /**
+         *
+         * Gets the document object that raised the DataRefreshComplete event.
+         *
+         * [Api set:  1.1]
+         */
+        document: Visio.Document;
+        /**
+         *
+         * Gets the success/failure of the DataRefreshComplete event.
+         *
+         * [Api set:  1.1]
+         */
+        success: boolean;
+    }
+    /**
+     *
+     * Provides information about the shape collection that raised the SelectionChanged event.
+     *
+     * [Api set:  1.1]
+     */
+    interface SelectionChangedEventArgs {
+        /**
+         *
+         * Gets the name of the page which has the ShapeCollection object that raised the SelectionChanged event.
+         *
+         * [Api set:  1.1]
+         */
+        pageName: string;
+        /**
+         *
+         * Gets the ShapeCollection object that raised the SelectionChanged event.
+         *
+         * [Api set:  1.1]
+         */
+        shapeNames: Array<string>;
+    }
+    /**
+     *
+     * Provides information about the drawing that raised the DiagramLoadComplete event.
+     *
+     * [Api set:  1.1]
+     */
+    interface DocumentLoadCompleteEventArgs {
+        /**
+         *
+         * Gets the success/failure of the DocumentLoadComplete event.
+         *
+         * [Api set:  1.1]
+         */
+        success: boolean;
+    }
+    /**
+     *
+     * Represents the Application.
+     *
+     * [Api set:  1.1]
+     */
+    class Application extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Show/Hide the application borders.
+         *
+         * [Api set:  1.1]
+         */
+        showBorders: boolean;
+        /**
+         *
+         * Show or Hide the standard toolbars.
+         *
+         * [Api set:  1.1]
+         */
+        showToolbars: boolean;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ApplicationUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Application): void;
+        /**
+         *
+         * Show or Hide a particular toolbar.
+         *
+         * [Api set:  1.1]
+         */
+        showToolbar(id: string, show: boolean): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.ApplicationLoadOptions): Visio.Application;
+        load(option?: string | string[]): Visio.Application;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.Application;
+        toJSON(): Visio.Interfaces.ApplicationData;
+    }
+    /**
+     *
+     * Represents the Document class.
+     *
+     * [Api set:  1.1]
+     */
+    class Document extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Represents a Visio application instance that contains this document. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly application: Visio.Application;
+        /**
+         *
+         * Represents a collection of pages associated with the document. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly pages: Visio.PageCollection;
+        /**
+         *
+         * Returns the DocumentView object.
+         *
+         * [Api set:  1.1]
+         */
+        readonly view: Visio.DocumentView;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.DocumentUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Document): void;
+        /**
+         *
+         * Returns the Active Page of the document.
+         *
+         * [Api set:  1.1]
+         */
+        getActivePage(): Visio.Page;
+        /**
+         *
+         * Set the Active Page of the document.
+         *
+         * [Api set:  1.1]
+         *
+         * @param PageName Name of the page
+         */
+        setActivePage(PageName: string): void;
+        /**
+         *
+         * Triggers the refresh of the data in the Diagram, for all pages.
+         *
+         * [Api set:  1.1]
+         */
+        startDataRefresh(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.DocumentLoadOptions): Visio.Document;
+        load(option?: string | string[]): Visio.Document;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.Document;
+        /**
+         *
+         * Occurs when the data is refreshed in the diagram.
+         *
+         * [Api set:  1.1]
+         */
+        readonly onDataRefreshComplete: OfficeExtension.EventHandlers<Visio.DataRefreshCompleteEventArgs>;
+        /**
+         *
+         * Occurs when the Document is loaded, refreshed, or changed.
+         *
+         * [Api set:  1.1]
+         */
+        readonly onDocumentLoadComplete: OfficeExtension.EventHandlers<Visio.DocumentLoadCompleteEventArgs>;
+        /**
+         *
+         * Occurs when the page is finished loading.
+         *
+         * [Api set:  1.1]
+         */
+        readonly onPageLoadComplete: OfficeExtension.EventHandlers<Visio.PageLoadCompleteEventArgs>;
+        /**
+         *
+         * Occurs when the current selection of shapes changes.
+         *
+         * [Api set:  1.1]
+         */
+        readonly onSelectionChanged: OfficeExtension.EventHandlers<Visio.SelectionChangedEventArgs>;
+        /**
+         *
+         * Occurs when the user moves the mouse pointer into the bounding box of a shape.
+         *
+         * [Api set:  1.1]
+         */
+        readonly onShapeMouseEnter: OfficeExtension.EventHandlers<Visio.ShapeMouseEnterEventArgs>;
+        /**
+         *
+         * Occurs when the user moves the mouse out of the bounding box of a shape.
+         *
+         * [Api set:  1.1]
+         */
+        readonly onShapeMouseLeave: OfficeExtension.EventHandlers<Visio.ShapeMouseLeaveEventArgs>;
+        toJSON(): Visio.Interfaces.DocumentData;
+    }
+    /**
+     *
+     * Represents the DocumentView class.
+     *
+     * [Api set:  1.1]
+     */
+    class DocumentView extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Disable Hyperlinks.
+         *
+         * [Api set:  1.1]
+         */
+        disableHyperlinks: boolean;
+        /**
+         *
+         * Disable Pan.
+         *
+         * [Api set:  1.1]
+         */
+        disablePan: boolean;
+        /**
+         *
+         * Disable Zoom.
+         *
+         * [Api set:  1.1]
+         */
+        disableZoom: boolean;
+        /**
+         *
+         * Disable Hyperlinks.
+         *
+         * [Api set:  1.1]
+         */
+        hideDiagramBoundary: boolean;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.DocumentViewUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: DocumentView): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.DocumentViewLoadOptions): Visio.DocumentView;
+        load(option?: string | string[]): Visio.DocumentView;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.DocumentView;
+        toJSON(): Visio.Interfaces.DocumentViewData;
+    }
+    /**
+     *
+     * Represents the Page class.
+     *
+     * [Api set:  1.1]
+     */
+    class Page extends OfficeExtension.ClientObject {
+        /**
+         *
+         * All shapes in the page. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly allShapes: Visio.ShapeCollection;
+        /**
+         *
+         * Returns the Comments Collection
+         *
+         * [Api set:  1.1]
+         */
+        readonly comments: Visio.CommentCollection;
+        /**
+         *
+         * Shapes at root level, in the page. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly shapes: Visio.ShapeCollection;
+        /**
+         *
+         * Returns the view of the page. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly view: Visio.PageView;
+        /**
+         *
+         * Returns the height of the page. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly height: number;
+        /**
+         *
+         * Index of the Page.
+         *
+         * [Api set:  1.1]
+         */
+        readonly index: number;
+        /**
+         *
+         * Whether the page is a background page or not. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly isBackground: boolean;
+        /**
+         *
+         * Page name. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly name: string;
+        /**
+         *
+         * Returns the width of the page. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly width: number;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.PageUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Page): void;
+        /**
+         *
+         * Set the page as Active Page of the document.
+         *
+         * [Api set:  1.1]
+         */
+        activate(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.PageLoadOptions): Visio.Page;
+        load(option?: string | string[]): Visio.Page;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.Page;
+        toJSON(): Visio.Interfaces.PageData;
+    }
+    /**
+     *
+     * Represents the PageView class.
+     *
+     * [Api set:  1.1]
+     */
+    class PageView extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Get/Set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
+         *
+         * [Api set:  1.1]
+         */
+        zoom: number;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.PageViewUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: PageView): void;
+        /**
+         *
+         * Pans the Visio drawing to place the specified shape in the center of the view.
+         *
+         * [Api set:  1.1]
+         *
+         * @param ShapeId ShapeId to be seen in the center.
+         */
+        centerViewportOnShape(ShapeId: number): void;
+        /**
+         *
+         * Fit Page to current window.
+         *
+         * [Api set:  1.1]
+         */
+        fitToWindow(): void;
+        /**
+         *
+         * Returns the position object that specifies the position of the page in the view.
+         *
+         * [Api set:  1.1]
+         */
+        getPosition(): OfficeExtension.ClientResult<Visio.Position>;
+        /**
+         *
+         * Represents the Selection in the page.
+         *
+         * [Api set:  1.1]
+         */
+        getSelection(): Visio.Selection;
+        /**
+         *
+         * To check if the shape is in view of the page or not.
+         *
+         * [Api set:  1.1]
+         *
+         * @param Shape Shape to be checked.
+         */
+        isShapeInViewport(Shape: Visio.Shape): OfficeExtension.ClientResult<boolean>;
+        /**
+         *
+         * Sets the position of the page in the view.
+         *
+         * [Api set:  1.1]
+         *
+         * @param Position Position object that specifies the new position of the page in the view.
+         */
+        setPosition(Position: Visio.Position): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.PageViewLoadOptions): Visio.PageView;
+        load(option?: string | string[]): Visio.PageView;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.PageView;
+        toJSON(): Visio.Interfaces.PageViewData;
+    }
+    /**
+     *
+     * Represents a collection of Page objects that are part of the document.
+     *
+     * [Api set:  1.1]
+     */
+    class PageCollection extends OfficeExtension.ClientObject {
+        /** Gets the loaded child items in this collection. */
+        readonly items: Array<Visio.Page>;
+        /**
+         *
+         * Gets the number of pages in the collection.
+         *
+         * [Api set:  1.1]
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets a page using its key (name or Id).
+         *
+         * [Api set:  1.1]
+         *
+         * @param key Key is the name or Id of the page to be retrieved.
+         */
+        getItem(key: number | string): Visio.Page;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.PageCollectionLoadOptions & Visio.Interfaces.CollectionLoadOptions): Visio.PageCollection;
+        load(option?: string | string[]): Visio.PageCollection;
+        load(option?: OfficeExtension.LoadOption): Visio.PageCollection;
+        toJSON(): Visio.Interfaces.PageCollectionData;
+    }
+    /**
+     *
+     * Represents the Shape Collection.
+     *
+     * [Api set:  1.1]
+     */
+    class ShapeCollection extends OfficeExtension.ClientObject {
+        /** Gets the loaded child items in this collection. */
+        readonly items: Array<Visio.Shape>;
+        /**
+         *
+         * Gets the number of Shapes in the collection.
+         *
+         * [Api set:  1.1]
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets a Shape using its key (name or Index).
+         *
+         * [Api set:  1.1]
+         *
+         * @param key Key is the Name or Index of the shape to be retrieved.
+         */
+        getItem(key: number | string): Visio.Shape;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.ShapeCollectionLoadOptions & Visio.Interfaces.CollectionLoadOptions): Visio.ShapeCollection;
+        load(option?: string | string[]): Visio.ShapeCollection;
+        load(option?: OfficeExtension.LoadOption): Visio.ShapeCollection;
+        toJSON(): Visio.Interfaces.ShapeCollectionData;
+    }
+    /**
+     *
+     * Represents the Shape class.
+     *
+     * [Api set:  1.1]
+     */
+    class Shape extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Returns the Comments Collection
+         *
+         * [Api set:  1.1]
+         */
+        readonly comments: Visio.CommentCollection;
+        /**
+         *
+         * Returns the Hyperlinks collection for a Shape object. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly hyperlinks: Visio.HyperlinkCollection;
+        /**
+         *
+         * Returns the Shape's Data Section. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly shapeDataItems: Visio.ShapeDataItemCollection;
+        /**
+         *
+         * Gets SubShape Collection.
+         *
+         * [Api set:  1.1]
+         */
+        readonly subShapes: Visio.ShapeCollection;
+        /**
+         *
+         * Returns the view of the shape. Read-only.
+         *
+         * [Api set:  1.1]
+         */
+        readonly view: Visio.ShapeView;
+        /**
+         *
+         * Shape's Identifier.
+         *
+         * [Api set:  1.1]
+         */
+        readonly id: number;
+        /**
+         *
+         * Shape's name.
+         *
+         * [Api set:  1.1]
+         */
+        readonly name: string;
+        /**
+         *
+         * Returns true, if shape is selected. User can set true to select the shape explicitly.
+         *
+         * [Api set:  1.1]
+         */
+        select: boolean;
+        /**
+         *
+         * Shape's Text.
+         *
+         * [Api set:  1.1]
+         */
+        readonly text: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ShapeUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Shape): void;
+        /**
+         *
+         * Returns the BoundingBox object that specifies bounding box of the shape.
+         *
+         * [Api set:  1.1]
+         */
+        getBounds(): OfficeExtension.ClientResult<Visio.BoundingBox>;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.ShapeLoadOptions): Visio.Shape;
+        load(option?: string | string[]): Visio.Shape;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.Shape;
+        toJSON(): Visio.Interfaces.ShapeData;
+    }
+    /**
+     *
+     * Represents the ShapeView class.
+     *
+     * [Api set:  1.1]
+     */
+    class ShapeView extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Represents the highlight around the shape.
+         *
+         * [Api set:  1.1]
+         */
+        highlight: Visio.Highlight;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ShapeViewUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: ShapeView): void;
+        /**
+         *
+         * Adds an overlay on top of the shape.
+         *
+         * [Api set:  1.1]
+         *
+         * @param OverlayType An Overlay Type -Text, Image.
+         * @param Content Content of Overlay.
+         * @param OverlayHorizontalAlignment Horizontal Alignment of Overlay - Left, Center, Right
+         * @param OverlayVerticalAlignment Vertical Alignment of Overlay - Top, Middle, Bottom
+         * @param Width Overlay Width.
+         * @param Height Overlay Height.
+         */
+        addOverlay(OverlayType: string, Content: string, OverlayHorizontalAlignment: string, OverlayVerticalAlignment: string, Width: number, Height: number): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Removes particular overlay or all overlays on the Shape.
+         *
+         * [Api set:  1.1]
+         *
+         * @param OverlayId An Overlay Id. Removes the specific overlay id from the shape.
+         */
+        removeOverlay(OverlayId: number): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.ShapeViewLoadOptions): Visio.ShapeView;
+        load(option?: string | string[]): Visio.ShapeView;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.ShapeView;
+        toJSON(): Visio.Interfaces.ShapeViewData;
+    }
+    /**
+     *
+     * Represents the Position of the object in the view.
+     *
+     * [Api set:  1.1]
+     */
+    interface Position {
+        /**
+         *
+         * An integer that specifies the x-coordinate of the object, which is the signed value of the distance in pixels from the viewport's center to the left boundary of the page.
+         *
+         * [Api set:  1.1]
+         */
+        x: number;
+        /**
+         *
+         * An integer that specifies the y-coordinate of the object, which is the signed value of the distance in pixels from the viewport's center to the top boundary of the page.
+         *
+         * [Api set:  1.1]
+         */
+        y: number;
+    }
+    /**
+     *
+     * Represents the BoundingBox of the shape.
+     *
+     * [Api set:  1.1]
+     */
+    interface BoundingBox {
+        /**
+         *
+         * The distance between the top and bottom edges of the bounding box of the shape, excluding any data graphics associated with the shape.
+         *
+         * [Api set:  1.1]
+         */
+        height: number;
+        /**
+         *
+         * The distance between the left and right edges of the bounding box of the shape, excluding any data graphics associated with the shape.
+         *
+         * [Api set:  1.1]
+         */
+        width: number;
+        /**
+         *
+         * An integer that specifies the x-coordinate of the bounding box.
+         *
+         * [Api set:  1.1]
+         */
+        x: number;
+        /**
+         *
+         * An integer that specifies the y-coordinate of the bounding box.
+         *
+         * [Api set:  1.1]
+         */
+        y: number;
+    }
+    /**
+     *
+     * Represents the highlight data added to the shape.
+     *
+     * [Api set:  1.1]
+     */
+    interface Highlight {
+        /**
+         *
+         * A string that specifies the color of the highlight. It must have the form "#RRGGBB", where each letter represents a hexadecimal digit between 0 and F, and where RR is the red value between 0 and 0xFF (255), GG the green value between 0 and 0xFF (255), and BB is the blue value between 0 and 0xFF (255).
+         *
+         * [Api set:  1.1]
+         */
+        color: string;
+        /**
+         *
+         * A positive integer that specifies the width of the highlight's stroke in pixels.
+         *
+         * [Api set:  1.1]
+         */
+        width: number;
+    }
+    /**
+     *
+     * Represents the ShapeDataItemCollection for a given Shape.
+     *
+     * [Api set:  1.1]
+     */
+    class ShapeDataItemCollection extends OfficeExtension.ClientObject {
+        /** Gets the loaded child items in this collection. */
+        readonly items: Array<Visio.ShapeDataItem>;
+        /**
+         *
+         * Gets the number of Shape Data Items.
+         *
+         * [Api set:  1.1]
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets the ShapeDataItem using its name.
+         *
+         * [Api set:  1.1]
+         *
+         * @param key Key is the name of the ShapeDataItem to be retrieved.
+         */
+        getItem(key: string): Visio.ShapeDataItem;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.ShapeDataItemCollectionLoadOptions & Visio.Interfaces.CollectionLoadOptions): Visio.ShapeDataItemCollection;
+        load(option?: string | string[]): Visio.ShapeDataItemCollection;
+        load(option?: OfficeExtension.LoadOption): Visio.ShapeDataItemCollection;
+        toJSON(): Visio.Interfaces.ShapeDataItemCollectionData;
+    }
+    /**
+     *
+     * Represents the ShapeDataItem.
+     *
+     * [Api set:  1.1]
+     */
+    class ShapeDataItem extends OfficeExtension.ClientObject {
+        /**
+         *
+         * A string that specifies the format of the shape data item.
+         *
+         * [Api set:  1.1]
+         */
+        readonly format: string;
+        /**
+         *
+         * A string that specifies the formatted value of the shape data item.
+         *
+         * [Api set:  1.1]
+         */
+        readonly formattedValue: string;
+        /**
+         *
+         * A string that specifies the label of the shape data item.
+         *
+         * [Api set:  1.1]
+         */
+        readonly label: string;
+        /**
+         *
+         * A string that specifies the value of the shape data item.
+         *
+         * [Api set:  1.1]
+         */
+        readonly value: string;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.ShapeDataItemLoadOptions): Visio.ShapeDataItem;
+        load(option?: string | string[]): Visio.ShapeDataItem;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.ShapeDataItem;
+        toJSON(): Visio.Interfaces.ShapeDataItemData;
+    }
+    /**
+     *
+     * Represents the Hyperlink Collection.
+     *
+     * [Api set:  1.1]
+     */
+    class HyperlinkCollection extends OfficeExtension.ClientObject {
+        /** Gets the loaded child items in this collection. */
+        readonly items: Array<Visio.Hyperlink>;
+        /**
+         *
+         * Gets the number of hyperlinks.
+         *
+         * [Api set:  1.1]
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets a Hyperlink using its key (name or Id).
+         *
+         * [Api set:  1.1]
+         *
+         * @param Key Key is the name or index of the Hyperlink to be retrieved.
+         */
+        getItem(Key: number | string): Visio.Hyperlink;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.HyperlinkCollectionLoadOptions & Visio.Interfaces.CollectionLoadOptions): Visio.HyperlinkCollection;
+        load(option?: string | string[]): Visio.HyperlinkCollection;
+        load(option?: OfficeExtension.LoadOption): Visio.HyperlinkCollection;
+        toJSON(): Visio.Interfaces.HyperlinkCollectionData;
+    }
+    /**
+     *
+     * Represents the Hyperlink.
+     *
+     * [Api set:  1.1]
+     */
+    class Hyperlink extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Gets the address of the Hyperlink object.
+         *
+         * [Api set:  1.1]
+         */
+        readonly address: string;
+        /**
+         *
+         * Gets the description of a hyperlink.
+         *
+         * [Api set:  1.1]
+         */
+        readonly description: string;
+        /**
+         *
+         * Gets the extra info of a hyperlink.
+         *
+         * [Api set:  1.1]
+         */
+        readonly extraInfo: string;
+        /**
+         *
+         * Gets the sub-address of the Hyperlink object.
+         *
+         * [Api set:  1.1]
+         */
+        readonly subAddress: string;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.HyperlinkLoadOptions): Visio.Hyperlink;
+        load(option?: string | string[]): Visio.Hyperlink;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.Hyperlink;
+        toJSON(): Visio.Interfaces.HyperlinkData;
+    }
+    /**
+     *
+     * Represents the CommentCollection for a given Shape.
+     *
+     * [Api set:  1.1]
+     */
+    class CommentCollection extends OfficeExtension.ClientObject {
+        /** Gets the loaded child items in this collection. */
+        readonly items: Array<Visio.Comment>;
+        /**
+         *
+         * Gets the number of Shape Data Items.
+         *
+         * [Api set:  1.1]
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets the Comment using its name.
+         *
+         * [Api set:  1.1]
+         *
+         * @param key Key is the name of the Comment to be retrieved.
+         */
+        getItem(key: string): Visio.Comment;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.CommentCollectionLoadOptions & Visio.Interfaces.CollectionLoadOptions): Visio.CommentCollection;
+        load(option?: string | string[]): Visio.CommentCollection;
+        load(option?: OfficeExtension.LoadOption): Visio.CommentCollection;
+        toJSON(): Visio.Interfaces.CommentCollectionData;
+    }
+    /**
+     *
+     * Represents the Comment.
+     *
+     * [Api set:  1.1]
+     */
+    class Comment extends OfficeExtension.ClientObject {
+        /**
+         *
+         * A string that specifies the label of the shape data item.
+         *
+         * [Api set:  1.1]
+         */
+        author: string;
+        /**
+         *
+         * A string that specifies the format of the shape data item.
+         *
+         * [Api set:  1.1]
+         */
+        date: string;
+        /**
+         *
+         * A string that specifies the value of the shape data item.
+         *
+         * [Api set:  1.1]
+         */
+        text: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.CommentUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Comment): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Visio.Interfaces.CommentLoadOptions): Visio.Comment;
+        load(option?: string | string[]): Visio.Comment;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.Comment;
+        toJSON(): Visio.Interfaces.CommentData;
+    }
+    /**
+     *
+     * Represents the Selection in the page.
+     *
+     * [Api set:  1.1]
+     */
+    class Selection extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Gets the Shapes of the Selection
+         *
+         * [Api set:  1.1]
+         */
+        readonly shapes: Visio.ShapeCollection;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[]): Visio.Selection;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Visio.Selection;
+        toJSON(): Visio.Interfaces.SelectionData;
+    }
+    /**
+     *
+     * Represents the Horizontal Alignment of the Overlay relative to the shape.
+     *
+     * [Api set:  1.1]
+     */
+    namespace OverlayHorizontalAlignment {
+        /**
+         *
+         * left
+         *
+         */
+        var left: string;
+        /**
+         *
+         * center
+         *
+         */
+        var center: string;
+        /**
+         *
+         * right
+         *
+         */
+        var right: string;
+    }
+    /**
+     *
+     * Represents the Vertical Alignment of the Overlay relative to the shape.
+     *
+     * [Api set:  1.1]
+     */
+    namespace OverlayVerticalAlignment {
+        /**
+         *
+         * top
+         *
+         */
+        var top: string;
+        /**
+         *
+         * middle
+         *
+         */
+        var middle: string;
+        /**
+         *
+         * bottom
+         *
+         */
+        var bottom: string;
+    }
+    /**
+     *
+     * Represents the type of the overlay.
+     *
+     * [Api set:  1.1]
+     */
+    namespace OverlayType {
+        /**
+         *
+         * text
+         *
+         */
+        var text: string;
+        /**
+         *
+         * image
+         *
+         */
+        var image: string;
+    }
+    /**
+     *
+     * Toolbar IDs of the app
+     *
+     * [Api set:  1.1]
+     */
+    namespace ToolBarType {
+        /**
+         *
+         * CommandBar
+         *
+         */
+        var commandBar: string;
+        /**
+         *
+         * PageNavigationBar
+         *
+         */
+        var pageNavigationBar: string;
+        /**
+         *
+         * StatusBar
+         *
+         */
+        var statusBar: string;
+    }
+    namespace ErrorCodes {
+        var accessDenied: string;
+        var generalException: string;
+        var invalidArgument: string;
+        var itemNotFound: string;
+        var notImplemented: string;
+        var unsupportedOperation: string;
+    }
+    module Interfaces {
+        interface CollectionLoadOptions {
+            $top?: number;
+            $skip?: number;
+        }
+        /** An interface for updating data on the Application object, for use in "application.set({ ... })". */
+        interface ApplicationUpdateData {
+            /**
+             *
+             * Show/Hide the application borders.
+             *
+             * [Api set:  1.1]
+             */
+            showBorders?: boolean;
+            /**
+             *
+             * Show or Hide the standard toolbars.
+             *
+             * [Api set:  1.1]
+             */
+            showToolbars?: boolean;
+        }
+        /** An interface for updating data on the Document object, for use in "document.set({ ... })". */
+        interface DocumentUpdateData {
+            /**
+            *
+            * Represents a Visio application instance that contains this document.
+            *
+            * [Api set:  1.1]
+            */
+            application?: Visio.Interfaces.ApplicationUpdateData;
+            /**
+            *
+            * Returns the DocumentView object.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.DocumentViewUpdateData;
+        }
+        /** An interface for updating data on the DocumentView object, for use in "documentView.set({ ... })". */
+        interface DocumentViewUpdateData {
+            /**
+             *
+             * Disable Hyperlinks.
+             *
+             * [Api set:  1.1]
+             */
+            disableHyperlinks?: boolean;
+            /**
+             *
+             * Disable Pan.
+             *
+             * [Api set:  1.1]
+             */
+            disablePan?: boolean;
+            /**
+             *
+             * Disable Zoom.
+             *
+             * [Api set:  1.1]
+             */
+            disableZoom?: boolean;
+            /**
+             *
+             * Disable Hyperlinks.
+             *
+             * [Api set:  1.1]
+             */
+            hideDiagramBoundary?: boolean;
+        }
+        /** An interface for updating data on the Page object, for use in "page.set({ ... })". */
+        interface PageUpdateData {
+            /**
+            *
+            * Returns the view of the page.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.PageViewUpdateData;
+        }
+        /** An interface for updating data on the PageView object, for use in "pageView.set({ ... })". */
+        interface PageViewUpdateData {
+            /**
+             *
+             * Get/Set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
+             *
+             * [Api set:  1.1]
+             */
+            zoom?: number;
+        }
+        /** An interface for updating data on the PageCollection object, for use in "pageCollection.set({ ... })". */
+        interface PageCollectionUpdateData {
+            items?: Visio.Interfaces.PageData[];
+        }
+        /** An interface for updating data on the ShapeCollection object, for use in "shapeCollection.set({ ... })". */
+        interface ShapeCollectionUpdateData {
+            items?: Visio.Interfaces.ShapeData[];
+        }
+        /** An interface for updating data on the Shape object, for use in "shape.set({ ... })". */
+        interface ShapeUpdateData {
+            /**
+            *
+            * Returns the view of the shape.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.ShapeViewUpdateData;
+            /**
+             *
+             * Returns true, if shape is selected. User can set true to select the shape explicitly.
+             *
+             * [Api set:  1.1]
+             */
+            select?: boolean;
+        }
+        /** An interface for updating data on the ShapeView object, for use in "shapeView.set({ ... })". */
+        interface ShapeViewUpdateData {
+            /**
+             *
+             * Represents the highlight around the shape.
+             *
+             * [Api set:  1.1]
+             */
+            highlight?: Visio.Highlight;
+        }
+        /** An interface for updating data on the ShapeDataItemCollection object, for use in "shapeDataItemCollection.set({ ... })". */
+        interface ShapeDataItemCollectionUpdateData {
+            items?: Visio.Interfaces.ShapeDataItemData[];
+        }
+        /** An interface for updating data on the HyperlinkCollection object, for use in "hyperlinkCollection.set({ ... })". */
+        interface HyperlinkCollectionUpdateData {
+            items?: Visio.Interfaces.HyperlinkData[];
+        }
+        /** An interface for updating data on the CommentCollection object, for use in "commentCollection.set({ ... })". */
+        interface CommentCollectionUpdateData {
+            items?: Visio.Interfaces.CommentData[];
+        }
+        /** An interface for updating data on the Comment object, for use in "comment.set({ ... })". */
+        interface CommentUpdateData {
+            /**
+             *
+             * A string that specifies the label of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            author?: string;
+            /**
+             *
+             * A string that specifies the format of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            date?: string;
+            /**
+             *
+             * A string that specifies the value of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            text?: string;
+        }
+        /** An interface describing the data returned by calling "application.toJSON()". */
+        interface ApplicationData {
+            /**
+             *
+             * Show/Hide the application borders.
+             *
+             * [Api set:  1.1]
+             */
+            showBorders?: boolean;
+            /**
+             *
+             * Show or Hide the standard toolbars.
+             *
+             * [Api set:  1.1]
+             */
+            showToolbars?: boolean;
+        }
+        /** An interface describing the data returned by calling "document.toJSON()". */
+        interface DocumentData {
+            /**
+            *
+            * Represents a Visio application instance that contains this document. Read-only.
+            *
+            * [Api set:  1.1]
+            */
+            application?: Visio.Interfaces.ApplicationData;
+            /**
+            *
+            * Represents a collection of pages associated with the document. Read-only.
+            *
+            * [Api set:  1.1]
+            */
+            pages?: Visio.Interfaces.PageData[];
+            /**
+            *
+            * Returns the DocumentView object.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.DocumentViewData;
+        }
+        /** An interface describing the data returned by calling "documentView.toJSON()". */
+        interface DocumentViewData {
+            /**
+             *
+             * Disable Hyperlinks.
+             *
+             * [Api set:  1.1]
+             */
+            disableHyperlinks?: boolean;
+            /**
+             *
+             * Disable Pan.
+             *
+             * [Api set:  1.1]
+             */
+            disablePan?: boolean;
+            /**
+             *
+             * Disable Zoom.
+             *
+             * [Api set:  1.1]
+             */
+            disableZoom?: boolean;
+            /**
+             *
+             * Disable Hyperlinks.
+             *
+             * [Api set:  1.1]
+             */
+            hideDiagramBoundary?: boolean;
+        }
+        /** An interface describing the data returned by calling "page.toJSON()". */
+        interface PageData {
+            /**
+            *
+            * All shapes in the page. Read-only.
+            *
+            * [Api set:  1.1]
+            */
+            allShapes?: Visio.Interfaces.ShapeData[];
+            /**
+            *
+            * Returns the Comments Collection
+            *
+            * [Api set:  1.1]
+            */
+            comments?: Visio.Interfaces.CommentData[];
+            /**
+            *
+            * Shapes at root level, in the page. Read-only.
+            *
+            * [Api set:  1.1]
+            */
+            shapes?: Visio.Interfaces.ShapeData[];
+            /**
+            *
+            * Returns the view of the page. Read-only.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.PageViewData;
+            /**
+             *
+             * Returns the height of the page. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            height?: number;
+            /**
+             *
+             * Index of the Page.
+             *
+             * [Api set:  1.1]
+             */
+            index?: number;
+            /**
+             *
+             * Whether the page is a background page or not. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            isBackground?: boolean;
+            /**
+             *
+             * Page name. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            name?: string;
+            /**
+             *
+             * Returns the width of the page. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            width?: number;
+        }
+        /** An interface describing the data returned by calling "pageView.toJSON()". */
+        interface PageViewData {
+            /**
+             *
+             * Get/Set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
+             *
+             * [Api set:  1.1]
+             */
+            zoom?: number;
+        }
+        /** An interface describing the data returned by calling "pageCollection.toJSON()". */
+        interface PageCollectionData {
+            items?: Visio.Interfaces.PageData[];
+        }
+        /** An interface describing the data returned by calling "shapeCollection.toJSON()". */
+        interface ShapeCollectionData {
+            items?: Visio.Interfaces.ShapeData[];
+        }
+        /** An interface describing the data returned by calling "shape.toJSON()". */
+        interface ShapeData {
+            /**
+            *
+            * Returns the Comments Collection
+            *
+            * [Api set:  1.1]
+            */
+            comments?: Visio.Interfaces.CommentData[];
+            /**
+            *
+            * Returns the Hyperlinks collection for a Shape object. Read-only.
+            *
+            * [Api set:  1.1]
+            */
+            hyperlinks?: Visio.Interfaces.HyperlinkData[];
+            /**
+            *
+            * Returns the Shape's Data Section. Read-only.
+            *
+            * [Api set:  1.1]
+            */
+            shapeDataItems?: Visio.Interfaces.ShapeDataItemData[];
+            /**
+            *
+            * Gets SubShape Collection.
+            *
+            * [Api set:  1.1]
+            */
+            subShapes?: Visio.Interfaces.ShapeData[];
+            /**
+            *
+            * Returns the view of the shape. Read-only.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.ShapeViewData;
+            /**
+             *
+             * Shape's Identifier.
+             *
+             * [Api set:  1.1]
+             */
+            id?: number;
+            /**
+             *
+             * Shape's name.
+             *
+             * [Api set:  1.1]
+             */
+            name?: string;
+            /**
+             *
+             * Returns true, if shape is selected. User can set true to select the shape explicitly.
+             *
+             * [Api set:  1.1]
+             */
+            select?: boolean;
+            /**
+             *
+             * Shape's Text.
+             *
+             * [Api set:  1.1]
+             */
+            text?: string;
+        }
+        /** An interface describing the data returned by calling "shapeView.toJSON()". */
+        interface ShapeViewData {
+            /**
+             *
+             * Represents the highlight around the shape.
+             *
+             * [Api set:  1.1]
+             */
+            highlight?: Visio.Highlight;
+        }
+        /** An interface describing the data returned by calling "shapeDataItemCollection.toJSON()". */
+        interface ShapeDataItemCollectionData {
+            items?: Visio.Interfaces.ShapeDataItemData[];
+        }
+        /** An interface describing the data returned by calling "shapeDataItem.toJSON()". */
+        interface ShapeDataItemData {
+            /**
+             *
+             * A string that specifies the format of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            format?: string;
+            /**
+             *
+             * A string that specifies the formatted value of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            formattedValue?: string;
+            /**
+             *
+             * A string that specifies the label of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            label?: string;
+            /**
+             *
+             * A string that specifies the value of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            value?: string;
+        }
+        /** An interface describing the data returned by calling "hyperlinkCollection.toJSON()". */
+        interface HyperlinkCollectionData {
+            items?: Visio.Interfaces.HyperlinkData[];
+        }
+        /** An interface describing the data returned by calling "hyperlink.toJSON()". */
+        interface HyperlinkData {
+            /**
+             *
+             * Gets the address of the Hyperlink object.
+             *
+             * [Api set:  1.1]
+             */
+            address?: string;
+            /**
+             *
+             * Gets the description of a hyperlink.
+             *
+             * [Api set:  1.1]
+             */
+            description?: string;
+            /**
+             *
+             * Gets the extra info of a hyperlink.
+             *
+             * [Api set:  1.1]
+             */
+            extraInfo?: string;
+            /**
+             *
+             * Gets the sub-address of the Hyperlink object.
+             *
+             * [Api set:  1.1]
+             */
+            subAddress?: string;
+        }
+        /** An interface describing the data returned by calling "commentCollection.toJSON()". */
+        interface CommentCollectionData {
+            items?: Visio.Interfaces.CommentData[];
+        }
+        /** An interface describing the data returned by calling "comment.toJSON()". */
+        interface CommentData {
+            /**
+             *
+             * A string that specifies the label of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            author?: string;
+            /**
+             *
+             * A string that specifies the format of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            date?: string;
+            /**
+             *
+             * A string that specifies the value of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            text?: string;
+        }
+        /** An interface describing the data returned by calling "selection.toJSON()". */
+        interface SelectionData {
+            /**
+            *
+            * Gets the Shapes of the Selection
+            *
+            * [Api set:  1.1]
+            */
+            shapes?: Visio.Interfaces.ShapeData[];
+        }
+        /**
+         *
+         * Represents the Application.
+         *
+         * [Api set:  1.1]
+         */
+        interface ApplicationLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Show/Hide the application borders.
+             *
+             * [Api set:  1.1]
+             */
+            showBorders?: boolean;
+            /**
+             *
+             * Show or Hide the standard toolbars.
+             *
+             * [Api set:  1.1]
+             */
+            showToolbars?: boolean;
+        }
+        /**
+         *
+         * Represents the Document class.
+         *
+         * [Api set:  1.1]
+         */
+        interface DocumentLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents a Visio application instance that contains this document.
+            *
+            * [Api set:  1.1]
+            */
+            application?: Visio.Interfaces.ApplicationLoadOptions;
+            /**
+            *
+            * Returns the DocumentView object.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.DocumentViewLoadOptions;
+        }
+        /**
+         *
+         * Represents the DocumentView class.
+         *
+         * [Api set:  1.1]
+         */
+        interface DocumentViewLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Disable Hyperlinks.
+             *
+             * [Api set:  1.1]
+             */
+            disableHyperlinks?: boolean;
+            /**
+             *
+             * Disable Pan.
+             *
+             * [Api set:  1.1]
+             */
+            disablePan?: boolean;
+            /**
+             *
+             * Disable Zoom.
+             *
+             * [Api set:  1.1]
+             */
+            disableZoom?: boolean;
+            /**
+             *
+             * Disable Hyperlinks.
+             *
+             * [Api set:  1.1]
+             */
+            hideDiagramBoundary?: boolean;
+        }
+        /**
+         *
+         * Represents the Page class.
+         *
+         * [Api set:  1.1]
+         */
+        interface PageLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns the view of the page.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.PageViewLoadOptions;
+            /**
+             *
+             * Returns the height of the page. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            height?: boolean;
+            /**
+             *
+             * Index of the Page.
+             *
+             * [Api set:  1.1]
+             */
+            index?: boolean;
+            /**
+             *
+             * Whether the page is a background page or not. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            isBackground?: boolean;
+            /**
+             *
+             * Page name. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * Returns the width of the page. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Represents the PageView class.
+         *
+         * [Api set:  1.1]
+         */
+        interface PageViewLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Get/Set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
+             *
+             * [Api set:  1.1]
+             */
+            zoom?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of Page objects that are part of the document.
+         *
+         * [Api set:  1.1]
+         */
+        interface PageCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the view of the page.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.PageViewLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns the height of the page. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            height?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Index of the Page.
+             *
+             * [Api set:  1.1]
+             */
+            index?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Whether the page is a background page or not. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            isBackground?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Page name. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns the width of the page. Read-only.
+             *
+             * [Api set:  1.1]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Represents the Shape Collection.
+         *
+         * [Api set:  1.1]
+         */
+        interface ShapeCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the view of the shape.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.ShapeViewLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Shape's Identifier.
+             *
+             * [Api set:  1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Shape's name.
+             *
+             * [Api set:  1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns true, if shape is selected. User can set true to select the shape explicitly.
+             *
+             * [Api set:  1.1]
+             */
+            select?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Shape's Text.
+             *
+             * [Api set:  1.1]
+             */
+            text?: boolean;
+        }
+        /**
+         *
+         * Represents the Shape class.
+         *
+         * [Api set:  1.1]
+         */
+        interface ShapeLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns the view of the shape.
+            *
+            * [Api set:  1.1]
+            */
+            view?: Visio.Interfaces.ShapeViewLoadOptions;
+            /**
+             *
+             * Shape's Identifier.
+             *
+             * [Api set:  1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Shape's name.
+             *
+             * [Api set:  1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * Returns true, if shape is selected. User can set true to select the shape explicitly.
+             *
+             * [Api set:  1.1]
+             */
+            select?: boolean;
+            /**
+             *
+             * Shape's Text.
+             *
+             * [Api set:  1.1]
+             */
+            text?: boolean;
+        }
+        /**
+         *
+         * Represents the ShapeView class.
+         *
+         * [Api set:  1.1]
+         */
+        interface ShapeViewLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Represents the highlight around the shape.
+             *
+             * [Api set:  1.1]
+             */
+            highlight?: boolean;
+        }
+        /**
+         *
+         * Represents the ShapeDataItemCollection for a given Shape.
+         *
+         * [Api set:  1.1]
+         */
+        interface ShapeDataItemCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: A string that specifies the format of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            format?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: A string that specifies the formatted value of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            formattedValue?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: A string that specifies the label of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            label?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: A string that specifies the value of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            value?: boolean;
+        }
+        /**
+         *
+         * Represents the ShapeDataItem.
+         *
+         * [Api set:  1.1]
+         */
+        interface ShapeDataItemLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * A string that specifies the format of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            format?: boolean;
+            /**
+             *
+             * A string that specifies the formatted value of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            formattedValue?: boolean;
+            /**
+             *
+             * A string that specifies the label of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            label?: boolean;
+            /**
+             *
+             * A string that specifies the value of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            value?: boolean;
+        }
+        /**
+         *
+         * Represents the Hyperlink Collection.
+         *
+         * [Api set:  1.1]
+         */
+        interface HyperlinkCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the address of the Hyperlink object.
+             *
+             * [Api set:  1.1]
+             */
+            address?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the description of a hyperlink.
+             *
+             * [Api set:  1.1]
+             */
+            description?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the extra info of a hyperlink.
+             *
+             * [Api set:  1.1]
+             */
+            extraInfo?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the sub-address of the Hyperlink object.
+             *
+             * [Api set:  1.1]
+             */
+            subAddress?: boolean;
+        }
+        /**
+         *
+         * Represents the Hyperlink.
+         *
+         * [Api set:  1.1]
+         */
+        interface HyperlinkLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets the address of the Hyperlink object.
+             *
+             * [Api set:  1.1]
+             */
+            address?: boolean;
+            /**
+             *
+             * Gets the description of a hyperlink.
+             *
+             * [Api set:  1.1]
+             */
+            description?: boolean;
+            /**
+             *
+             * Gets the extra info of a hyperlink.
+             *
+             * [Api set:  1.1]
+             */
+            extraInfo?: boolean;
+            /**
+             *
+             * Gets the sub-address of the Hyperlink object.
+             *
+             * [Api set:  1.1]
+             */
+            subAddress?: boolean;
+        }
+        /**
+         *
+         * Represents the CommentCollection for a given Shape.
+         *
+         * [Api set:  1.1]
+         */
+        interface CommentCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: A string that specifies the label of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            author?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: A string that specifies the format of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            date?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: A string that specifies the value of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            text?: boolean;
+        }
+        /**
+         *
+         * Represents the Comment.
+         *
+         * [Api set:  1.1]
+         */
+        interface CommentLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * A string that specifies the label of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            author?: boolean;
+            /**
+             *
+             * A string that specifies the format of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            date?: boolean;
+            /**
+             *
+             * A string that specifies the value of the shape data item.
+             *
+             * [Api set:  1.1]
+             */
+            text?: boolean;
+        }
+    }
+}
+declare module Visio {
+    /**
+     * The RequestContext object facilitates requests to the Visio application. Since the Office add-in and the Visio application run in two different processes, the request context is required to get access to the Visio object model from the add-in.
+     */
+    class RequestContext extends OfficeExtension.ClientRequestContext {
+        constructor(url?: string | OfficeExtension.EmbeddedSession);
+        readonly document: Document;
+    }
+    /**
+     * Executes a batch script that performs actions on the Visio object model, using a new request context. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * @param batch - A function that takes in an Visio.RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Visio application. Since the Office add-in and the Visio application run in two different processes, the request context is required to get access to the Visio object model from the add-in.
+     */
+    function run<T>(batch: (context: Visio.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    /**
+     * Executes a batch script that performs actions on the Visio object model, using the request context of a previously-created API object.
+     * @param object - A previously-created API object. The batch will use the same request context as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
+     * @param batch - A function that takes in an Visio.RequestContext and returns a promise (typically, just the result of "context.sync()"). When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     */
+    function run<T>(object: OfficeExtension.ClientObject | OfficeExtension.EmbeddedSession, batch: (context: Visio.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    /**
+     * Executes a batch script that performs actions on the Visio object model, using the RequestContext of a previously-created object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * @param contextObject - A previously-created Visio.RequestContext. This context will get re-used by the batch function (instead of having a new context created). This means that the batch will be able to pick up changes made to existing API objects, if those objects were derived from this same context.
+     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Visio application. Since the Office add-in and the Visio application run in two different processes, the RequestContext is required to get access to the Visio object model from the add-in.
+     */
+    function run<T>(contextObject: OfficeExtension.ClientRequestContext, batch: (context: Visio.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    /**
+     * Executes a batch script that performs actions on the Visio object model, using the request context of previously-created API objects.
+     * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared request context, which means that any changes applied to these objects will be picked up by "context.sync()".
+     * @param batch - A function that takes in a Visio.RequestContext and returns a promise (typically, just the result of "context.sync()"). When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     */
+    function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Visio.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+}
+
+
+
+////////////////////////////////////////////////////////////////
+//////////////////////// End Visio APIs ////////////////////////
+////////////////////////////////////////////////////////////////

From e8cf3405c000e96cc66b52a344101ca8113b2351 Mon Sep 17 00:00:00 2001
From: Thomas Bruun <thomas.bruun@gmail.com>
Date: Fri, 23 Feb 2018 10:47:35 +0100
Subject: [PATCH 357/388] Stripe: Rename remaining 'transfer*' attributes to
 payout

https://github.com/DefinitelyTyped/DefinitelyTyped/commit/07012f916096b32aef525442ab184f11d5a88f53 did a great job of adding the Payouts types. This commit also rewords the existing attributes that used to be called transfer before the Transfer/Payout split (see https://stripe.com/docs/transfer-payout-split).
---
 types/stripe/index.d.ts      | 54 ++++++++++++++++++++----------------
 types/stripe/stripe-tests.ts | 30 +++++++++++++++++++-
 2 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 12f2b4abea..01b3a7a394 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -122,7 +122,7 @@ declare namespace Stripe {
              * is only false when Stripe is waiting for additional information from the
              * account holder.
              */
-            transfers_enabled: boolean;
+            payouts_enabled: boolean;
 
             /**
              * The state of the account’s information requests, including what
@@ -161,7 +161,7 @@ declare namespace Stripe {
              * established in. For example, if you are in the United States and the
              * business you’re creating an account for is legally represented in Canada,
              * you would use “CA” as the country for the account being created.
-             * 
+             *
              * optional, default is your own country
              */
             country?: string;
@@ -171,7 +171,7 @@ declare namespace Stripe {
              * will email your user with instructions for how to set up their account. For
              * managed accounts, this is only to make the account easier to identify to
              * you: Stripe will never directly reach out to your users.
-             * 
+             *
              * required if type is "standard"
              */
             email?: string;
@@ -316,11 +316,11 @@ declare namespace Stripe {
             };
 
             /**
-             * Details on when this account will make funds from charges available, and
-             * when they will be paid out to the account holder’s bank account. See our
-             * managed account bank transfer guide for more information
+             * Details on when funds from charges are available,
+             * and when they are paid out to an external account.
+             * See our Setting Bank and Debit Card Payouts documentation for details.
              */
-            transfer_schedule?: {
+            payout_schedule?: {
                 /**
                  * The number of days charges for the account will be held before being
                  * paid out. May also be the string “minimum” for the lowest available
@@ -333,7 +333,7 @@ declare namespace Stripe {
                  * How frequently funds will be paid out. One of "manual" (for only
                  * triggered via API call), "daily", "weekly", or "monthly". Default is "daily".
                  */
-                interval?: string;
+                interval?: "manual" | "daily" | "weekly" | "monthly";
 
                 /**
                  * The day of the month funds will be paid out. Required and available
@@ -345,8 +345,14 @@ declare namespace Stripe {
                  * The day of the week funds will be paid out, of the style ‘monday’,
                  * ‘tuesday’, etc. Required and available only if interval is weekly.
                  */
-                weekly_anchor?: string;
+                weekly_anchor?: "monday" | "tuesday" | "wednesday" | "thursday" | "friday" | "saturday" | "sunday";
             }
+
+            /**
+             * The text that appears on the bank account statement for payouts.
+             * If not set, this defaults to the platform’s bank descriptor as set in the Dashboard.
+             */
+            payout_statement_descriptor?: string;
         }
 
         interface IAccountUpdateOptions extends IDataOptions, IAccountShared {
@@ -4277,9 +4283,9 @@ declare namespace Stripe {
             ended_at: number;
 
             metadata: IMetadata;
-            
+
             items: IList<subscriptionItems.ISubscriptionItem>;
-            
+
             /**
              * Hash describing the plan the customer is subscribed to
              */
@@ -4322,8 +4328,8 @@ declare namespace Stripe {
             trial_start: number;
 
             /**
-             * Either "charge_automatically", or "send_invoice". When charging automatically, Stripe will attempt to pay this subscription at the 
-             * end of the cycle using the default source attached to the customer. When sending an invoice, Stripe will email your customer an 
+             * Either "charge_automatically", or "send_invoice". When charging automatically, Stripe will attempt to pay this subscription at the
+             * end of the cycle using the default source attached to the customer. When sending an invoice, Stripe will email your customer an
              * invoice with payment instructions.
              */
             billing: SubscriptionBilling;
@@ -4379,8 +4385,8 @@ declare namespace Stripe {
             items?: ISubscriptionCreationItem[];
 
             /**
-             * Either "charge_automatically", or "send_invoice". When charging automatically, Stripe will attempt to pay this subscription at the end of the 
-             * cycle using the default source attached to the customer. When sending an invoice, Stripe will email your customer an invoice with payment 
+             * Either "charge_automatically", or "send_invoice". When charging automatically, Stripe will attempt to pay this subscription at the end of the
+             * cycle using the default source attached to the customer. When sending an invoice, Stripe will email your customer an invoice with payment
              * instructions. Defaults to "charge_automatically".
              */
             billing?: SubscriptionBilling;
@@ -4450,8 +4456,8 @@ declare namespace Stripe {
             trial_end?: number | "now";
 
             /**
-             * Either "charge_automatically", or "send_invoice". When charging automatically, Stripe will attempt to pay this subscription at the end of the 
-             * cycle using the default source attached to the customer. When sending an invoice, Stripe will email your customer an invoice with payment 
+             * Either "charge_automatically", or "send_invoice". When charging automatically, Stripe will attempt to pay this subscription at the end of the
+             * cycle using the default source attached to the customer. When sending an invoice, Stripe will email your customer an invoice with payment
              * instructions.
              */
             billing?: SubscriptionBilling;
@@ -4496,7 +4502,7 @@ declare namespace Stripe {
              * Plan ID for this item.
              */
             plan: string;
-            
+
             /**
              * Quantity for this item.
              */
@@ -4510,7 +4516,7 @@ declare namespace Stripe {
             id?: string;
 
             /**
-             * Delete all usage for a given subscription item. Only allowed when deleted is set to true and the current plan’s 
+             * Delete all usage for a given subscription item. Only allowed when deleted is set to true and the current plan’s
              * usage_type is metered.
              */
             clear_usage?: boolean;
@@ -4530,7 +4536,7 @@ declare namespace Stripe {
              * Plan ID for this item.
              */
             plan?: string;
-            
+
             /**
              * Quantity for this item.
              */
@@ -4552,7 +4558,7 @@ declare namespace Stripe {
             created: number;
 
             /**
-             * Set of key/value pairs that you can attach to an object. It can be useful for storing additional information 
+             * Set of key/value pairs that you can attach to an object. It can be useful for storing additional information
              * about the object in a structured format.
              */
             metadata: IMetadata;
@@ -4626,7 +4632,7 @@ declare namespace Stripe {
             prorate?: boolean;
 
             /**
-             * If set, the proration will be calculated as though the subscription was updated at the given time. This can be used to apply the same 
+             * If set, the proration will be calculated as though the subscription was updated at the given time. This can be used to apply the same
              * proration that was previewed with the upcoming invoice endpoint.
              */
             proration_date?: number;
@@ -5961,7 +5967,7 @@ declare namespace Stripe {
              */
             create(data: subscriptionItems.ISubscriptionItemCreationOptions, options: HeaderOptions, response?: IResponseFn<subscriptionItems.ISubscriptionItem>): Promise<subscriptionItems.ISubscriptionItem>;
             create(data: subscriptionItems.ISubscriptionItemCreationOptions, response?: IResponseFn<subscriptionItems.ISubscriptionItem>): Promise<subscriptionItems.ISubscriptionItem>;
-            
+
             /**
              * Retrieves the subscription item with the given ID.
              *
@@ -5984,7 +5990,7 @@ declare namespace Stripe {
             /**
              * Deletes an item from the subscription. Removing a subscription item from a subscription will not cancel the subscription.
              *
-             * @returns An subscription item object with a deleted flag upon success. Otherwise, this call throws an error, such as if the 
+             * @returns An subscription item object with a deleted flag upon success. Otherwise, this call throws an error, such as if the
              * subscription item has already been deleted.
              *
              * @param subscriptionItemId The identifier of the subscription item to delete.
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index b887ae6228..c901b6a2ad 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -3,7 +3,7 @@ import { customers } from 'stripe';
 
 var stripe = new Stripe("sk_test_BF573NobVn98OiIsPAv7A04K")
 
-stripe.setApiVersion('2016-03-07');
+stripe.setApiVersion('2017-04-06');
 
 //#region Balance tests
 // ##################################################################################
@@ -650,6 +650,29 @@ stripe.accounts.update("acct_17wV8KBoqMA9o2xk",
     }
 );
 
+stripe.accounts.update("acct_17wV8KBoqMA9o2xk",
+    {
+        payout_statement_descriptor: "From Stripe"
+    }).then(
+    function (account) {
+        // asynchronously called
+    }
+);
+
+stripe.accounts.update("acct_17wV8KBoqMA9o2xk",
+    {
+        payout_schedule: {
+            delay_days: 5,
+            interval: "monthly",
+            monthly_anchor: 4,
+            weekly_anchor: "monday"
+        }
+    }).then(
+    function (account) {
+        // asynchronously called
+    }
+);
+
 stripe.accounts.del("acct_17wV8KBoqMA9o2xk", function (err, confirmation) { });
 stripe.accounts.del("acct_17wV8KBoqMA9o2xk").then(function (confirmation) { });
 
@@ -672,6 +695,11 @@ stripe.accounts.list(
         // asynchronously called
     }
 );
+stripe.accounts.retrieve("acct_17wV8KBoqMA9o2xk").then(
+    function (accounts) {
+        var payouts_enabled: boolean = accounts.payouts_enabled;
+    }
+);
 //#endregion
 
 //#region Application Fee Refunds tests

From ab0791e8eb28bc0979da42bcae16732af3a19875 Mon Sep 17 00:00:00 2001
From: "Matt R. Wilson" <mwilson@shutterstock.com>
Date: Wed, 28 Feb 2018 15:45:47 -0700
Subject: [PATCH 358/388] [@types/request-promise-native] Update response in
 errors.

The response value on the errors is the modified Response instance not
the basic `http.IncomingMessage`. The `Response` interface in
`@types/request` is relatively new and this file was missed during the
update.
---
 types/request-promise-native/errors.d.ts | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/types/request-promise-native/errors.d.ts b/types/request-promise-native/errors.d.ts
index 2658b0dd7c..c3ec209564 100644
--- a/types/request-promise-native/errors.d.ts
+++ b/types/request-promise-native/errors.d.ts
@@ -1,15 +1,14 @@
 import rp = require('.');
-import http = require('http');
 
 export interface RequestError extends Error {
     cause: any;
     error: any;
     options: rp.Options;
-    response: http.IncomingMessage;
+    response: rp.FullResponse;
 }
 export interface RequestErrorConstructor {
-    new(cause: any, options: rp.Options, response: http.IncomingMessage): RequestError;
-    (cause: any, options: rp.Options, response: http.IncomingMessage): RequestError;
+    new(cause: any, options: rp.Options, response: rp.FullResponse): RequestError;
+    (cause: any, options: rp.Options, response: rp.FullResponse): RequestError;
     prototype: RequestError;
 }
 export const RequestError: RequestErrorConstructor;
@@ -18,11 +17,11 @@ export interface StatusCodeError extends Error {
     statusCode: number;
     error: any;
     options: rp.Options;
-    response: http.IncomingMessage;
+    response: rp.FullResponse;
 }
 export interface StatusCodeErrorConstructor extends Error {
-    new(statusCode: number, body: any, options: rp.Options, response: http.IncomingMessage): StatusCodeError;
-    (statusCode: number, body: any, options: rp.Options, response: http.IncomingMessage): StatusCodeError;
+    new(statusCode: number, body: any, options: rp.Options, response: rp.FullResponse): StatusCodeError;
+    (statusCode: number, body: any, options: rp.Options, response: rp.FullResponse): StatusCodeError;
     prototype: StatusCodeError;
 }
 export const StatusCodeError: StatusCodeErrorConstructor;
@@ -31,11 +30,11 @@ export interface TransformError extends Error {
     cause: any;
     error: any;
     options: rp.Options;
-    response: http.IncomingMessage;
+    response: rp.FullResponse;
 }
 export interface TransformErrorConstructor extends Error {
-    new(cause: any, options: rp.Options, response: http.IncomingMessage): TransformError;
-    (cause: any, options: rp.Options, response: http.IncomingMessage): TransformError;
+    new(cause: any, options: rp.Options, response: rp.FullResponse): TransformError;
+    (cause: any, options: rp.Options, response: rp.FullResponse): TransformError;
     prototype: TransformError;
 }
 export const TransformError: TransformErrorConstructor;

From 2bac294b89913d45acfd608e92cb2c4e719a23cc Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Wed, 28 Feb 2018 15:00:58 -0800
Subject: [PATCH 359/388] Remove comments.

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

diff --git a/types/johnny-five/index.d.ts b/types/johnny-five/index.d.ts
index f394d67c56..689a78050a 100644
--- a/types/johnny-five/index.d.ts
+++ b/types/johnny-five/index.d.ts
@@ -510,10 +510,10 @@ export declare module Led {
 
         on(): void;
         off(): void;
-        color(value: string): void; // color method expects string.
+        color(value: string): void;
         toggle(): void;
         strobe(ms: number): void;
-        intensity(value: number): void;  // intensity is the correct method here instead of brightness.        
+        intensity(value: number): void;
         fadeIn(ms: number): void;
         fadeOut(ms: number): void;
         pulse(ms: number): void;

From b3b075efae243589e1b8f7cbc54a2ccd24fc5591 Mon Sep 17 00:00:00 2001
From: Josh Headapohl <joshhead@gmail.com>
Date: Wed, 28 Feb 2018 15:34:21 -0500
Subject: [PATCH 360/388] @types/react: Update React.Component setState

Allow setState to accept an updater which is null or is a function that
may return null.

In React 16, passing null to setState or returning null from the updater
function does not cause an update.
---
 types/react/index.d.ts   | 2 +-
 types/react/test/tsx.tsx | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 93b143b7bf..05398e49b4 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -284,7 +284,7 @@ declare namespace React {
         // See: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/18365#issuecomment-351013257
         // Also, the ` | S` allows intellisense to not be dumbisense
         setState<K extends keyof S>(
-            state: ((prevState: Readonly<S>, props: P) => (Pick<S, K> | S)) | (Pick<S, K> | S),
+            state: ((prevState: Readonly<S>, props: P) => (Pick<S, K> | S | null)) | (Pick<S, K> | S | null),
             callback?: () => void
         ): void;
 
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index bc48add9a4..4ad5a3e2c8 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -95,6 +95,7 @@ class SetStateTest extends React.Component<{}, { foo: boolean, bar: boolean }> {
       this.setState({ foo: true });
       this.setState({ foo: true, bar: true });
       this.setState({});
+      this.setState(null);
       this.setState({ foo: true, foo2: true }); // $ExpectError
       this.setState(() => ({ foo: '' })); // $ExpectError
       this.setState(() => ({ foo: true }));
@@ -103,6 +104,7 @@ class SetStateTest extends React.Component<{}, { foo: boolean, bar: boolean }> {
       this.setState(() => ({ foo: '', foo2: true })); // $ExpectError
       this.setState(() => ({ })); // ok!
       this.setState({ foo: true, bar: undefined}); // $ExpectError
+      this.setState(prevState => (prevState.bar ? { bar: false } : null));
     }
 }
 

From f25c28b648bd19ccc5f8272e7c0e154dd11cf917 Mon Sep 17 00:00:00 2001
From: Luigi Baute <36426974+LuigiBaute@users.noreply.github.com>
Date: Thu, 1 Mar 2018 01:09:27 -0400
Subject: [PATCH 361/388] Create README.es.md

---
 README.es.md | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 200 insertions(+)
 create mode 100644 README.es.md

diff --git a/README.es.md b/README.es.md
new file mode 100644
index 0000000000..2d2e7acc29
--- /dev/null
+++ b/README.es.md
@@ -0,0 +1,200 @@
+# DefinitelyTyped [![Build Status](https://travis-ci.org/DefinitelyTyped/DefinitelyTyped.svg?branch=master)](https://travis-ci.org/DefinitelyTyped/DefinitelyTyped)
+
+[![Join the chat at https://gitter.im/borisyankov/DefinitelyTyped](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/borisyankov/DefinitelyTyped?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+> El repositorio de definiciones de TypeScript de alta calidad.
+
+Vea también el sitio web [definitelytyped.org](http://definitelytyped.org), aunque la información en este README está más actualizada.
+
+
+## ¿Qué son los `declaration files`?
+
+vea el [Manual de TypeScript](http://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html).
+
+
+## ¿Cómo los obtengo?
+
+### npm
+
+Este es el método preferido. Solo está disponible para usuarios TypeScript 2.0+. Por Ejemplo:
+
+```sh
+npm install --save-dev @types/node
+```
+
+Los types deberían ser incluidos automáticamentes por el compilador.
+Vea más en el [manual](http://www.typescriptlang.org/docs/handbook/declaration-files/consumption.html).
+
+Para un paquete NPM "foo", Estos `typings` estarán en "@types/foo".
+Si no puedes encontrar tu paquete, búscalo en [TypeSearch](https://microsoft.github.io/TypeSearch/).
+
+Si aún no puedes encontrarlo, comprueba si el type ha sido [bundled](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) por su cuenta.
+Este provee usualmente un archivo `"types"` o `"typings"` en el `package.json`,
+o solo busca por cualquier archivo ".d.ts" en el paquete y manualmente puedes incluirlos con un `/// <reference path="" />`.
+
+
+### Otros metodos
+
+Estos pueden ser utilizados por TypeScript 1.0.
+
+* [Typings](https://github.com/typings/typings)
+* ~~[NuGet](http://nuget.org/packages?q=DefinitelyTyped)~~ (use las alternativas preferidas, la publicación DT type de nuget ha sido desactivada)
+* Descarguelo manualmente desde la branch de el `master` de este repositorio
+
+Tal vez debas añadir manualmente [referencias](http://www.typescriptlang.org/docs/handbook/triple-slash-directives.html).
+
+
+## ¿Cómo puedo contribuir?
+
+¡DefinitelyTyped solo trabaja gracias a contribuidores como tú!
+
+### Prueba
+
+Antes de compartir tu mejora con el mundo, úselo usted mismo.
+
+#### Prueba de edición de un paquete existente
+
+Para agregar nuevas funciones puedes usar el [module augmentation](http://www.typescriptlang.org/docs/handbook/declaration-merging.html).
+También puedes editar directamente los types en `node_modules/@types/foo/index.d.ts`, o copiarlos de ahi y seguir los pasos explicados a continuación.
+
+
+#### Prueba un nuevo paquete
+
+Añade a tu `tsconfig.json`:
+
+```json
+"baseUrl": "types",
+"typeRoots": ["types"],
+```
+
+(También puedes usar `src/types`.)
+Crea un `types/foo/index.d.ts` que contenga declaraciones del módulo "foo".
+Ahora deberías poder importar desde `"foo"` a tu código y te enviara a un nuevo tipo de definición.
+Entonces crea *y* ejecuta el código para asegurarte que el tipo de definición en realidad corresponde a lo que suceda en el momento de la ejecución.
+Una vez que hayas probado tus definiciones con el código real, haz un [PR](#make-a-pull-request)
+luego sigue las intrucciones para [editar un paquete existente](#edit-an-existing-package) o
+[crear un nuevo paquete](#create-a-new-package).
+
+
+### Haz un pull request
+
+Una vez que hayas probado tu paquete, podrás compartirlo en DefinitelyTyped.
+
+Primero, haz un [fork](https://guides.github.com/activities/forking/) en este repositorio, instala [node](https://nodejs.org/), y luego ejecuta la `npm install`.
+
+
+#### Editar un paquete existente
+
+* `cd types/my-package-to-edit`
+* Haz cambios. Recuerda editar las pruebas.
+* También puede que quieras añadirle la sección "Definitions by" en el encabezado del paquete.
+  - Esto hará que seas notificado (Através de tu nombre de usuario en GitHub) cada vez que alguien haga un pull request o issue sobre el paquete.
+  - Haz esto añadiendo tu nombre al final de la línea, asi como en `// Definitions by: Alice <https://github.com/alice>, Bob <https://github.com/bob>`.
+  - Y si hay más personas, puede ser multiline
+  ```typescript
+  // Definitions by: Alice <https://github.com/alice>
+  //                 Bob <https://github.com/bob>
+  //                 Steve <https://github.com/steve>
+  //                 John <https://github.com/john>
+  ```
+* Si hay un `tslint.json`, ejecuta `npm run lint package-name`. Otra manera seria, ejecutando `tsc` en el paquete del directorio.
+
+Cuando hagas un PR para editar un paquete existente, `dt-bot` deberá @-mencionar a los autores previos.
+Si no lo hace, puedes hacerlo en el comentario asociado con el PR.
+
+
+#### Crear un nuevo paquete
+
+Si eres el autor de la biblioteca, o puedes hacer un pull request a la biblioteca, [bundle types](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) En vez de publicarlo en DefinitelyTyped.
+
+Si estás agregando typings para un paquete NPM, crea un directorio con el mismo nombre.
+Si el paquete al que le estás agregando escritura no es para NPM, asegurate de que el nombre que escojas no genere problemas con el nombre del paquete en NPM.
+(Puedes usar `npm info foo` para verificar la existencia del paquete `foo`.)
+
+Tu paquete debería tener esta estructura:
+
+| File | Purpose |
+| --- | --- |
+| index.d.ts | Este contiene la escritura del paquete. |
+| foo-tests.ts | Este contiene una muestra del código con el que se realiza la prueba de escritura. Este código *no* es ejecutable, pero sí es type-checked. |
+| tsconfig.json | Este permite ejecutar `tsc` dentro del paquete. |
+| tslint.json | Permite linting. |
+
+Generalas ejecutando `npm install -g dts-gen` y `dts-gen --dt --name my-package-name --template module`.
+Ve todas las opciones en [dts-gen](https://github.com/Microsoft/dts-gen).
+
+También puedes configurar la `tsconfig.json` para añadir nuevos archivos, para agregar un `"target": "es6"` (necesita la función asincrónica), para agregar a la `"lib"`, o para agregar la opción de compilación `"jsx"`.
+
+Los miembros de DefinitelyTyped están en busqueda frecuente de nuevos PRs, Pero ten en mente que mientras hayan más PRs de otros podrían alentizar el proceso.
+
+Para un buen paquete de ejemplo, vea [base64-js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/base64-js).
+
+
+#### Errores comunes
+
+* Primero, sigue el consejo del [manual](http://www.typescriptlang.org/docs/handbook/declaration-files/do-s-and-don-ts.html).
+* Formatear: Ya sea utilizar todas las pestañas, o siempre utiliza 4 espacios.
+* `function sum(nums: number[]): number`: Utiliza `ReadonlyArray` si una funcion no se apega a sus parámetros.
+* `interface Foo { new(): Foo; }`:
+    Este define el tipo de objeto que esten nuevos. Probablemente quieras `declare class Foo { constructor(); }`.
+* `const Class: { new(): IClass; }`:
+    Prefiere usar una declaración de clase `class Class { constructor(); }` En vez de una nueva constante.
+* `getMeAT<T>(): T`:
+    Si un tipo de parámetro no aparece en los tipos de ningún parámetro, No tienes una función generica,solo tienes una afirmación de tipo disfrazada.
+     Prefiera utilizar una afirmación de tipo real, p.ej. `getMeAT() as number`.
+    Un ejemplo donde un tipo de parámetro es aceptable: `function id<T>(value: T): T;`.
+    Un ejemplo donde no es aceptable: `function parseJson<T>(json: string): T;`.
+    Una excepción: `new Map<string, number>()` está bien.
+* Utilizando los types `Function` y `Object` casi nunca es una buena idea. En 99% de los casos es posible especificar un tipo más especifico. Los ejemplos son `(x: number) => number` for [functions](http://www.typescriptlang.org/docs/handbook/functions.html#function-types) and `{ x: number, y: number }` for objects. If there is no certainty at all about the type, [`any`](http://www.typescriptlang.org/docs/handbook/basic-types.html#any) is the right choice, not `Object`. If the only known fact about the type is that it's some object, use the type [`object`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-2.html#object-type), not `Object` or `{ [key: string]: any }`.
+* `var foo: string | any`:
+    Cuando es usado `any` En un tipo de unión, El tipo resultante todavía es `any`. Así que mientras la porción `string` de este tipo de anotación puede _verse_ útil, de hecho, no ofrece ningún typechecking adicional más que un simple `any`.
+    Dependiendo de la intención, una alternativa aceptable puede ser `any`, `string`, o `string | object`.
+
+
+#### Remover un paquete
+
+Cuando un paquete [bundles](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) sus propios tipos, Estos tipos deberán ser removidos de DefinitelyTyped para evitar que generen confusión.
+
+Se puede remover ejecutando `npm run not-needed -- typingsPackageName asOfVersion sourceRepoURL [libraryName]`.
+- `typingsPackageName`: Este es el nombre del directorio que tienes que eliminar.
+- `asOfVersion`: Un stub será publicado a `@types/foo` con esta versión. Debería ser mas grande que cualquier versión publicada actualmente.
+- `sourceRepoURL`: Esto debería señalar el repositorio que contiene los typings.
+- `libraryName`: Un nombre descriptivo de la biblioteca, p.ej. "Angular 2" en vez de "angular2". (Si es omitido, será identico a "typingsPackageName".)
+
+Cualquier otro paquete en DefinitelyTyped que referencia el paquete eliminado deberá ser actualizado para referenciar los tipos de bundled. para hacer esto, añade `package.json` con `"dependencies": { "foo": "x.y.z" }`.
+
+Si un paquete nunca estuvo en DefinitelyTyped, no será necesario añadirlo a `notNeededPackages.json`.
+
+
+#### Lint
+
+Para realizar el lint a un paquete, solo añade `tslint.json` al paquete que contiene `{ "extends": "dtslint/dt.json" }`. Todos los paquetes nuevos deberán pasar por el proceso de linted.
+Si el `tslint.json` no sigue las reglas, esto se debe a que aún no se ha acomodado. por ejemplo:
+
+```js
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // This package uses the Function type, and it will take effort to fix.
+        "ban-types": false
+    }
+}
+```
+
+(Para indicar que la regla lint no siempre será aplicada, utiliza `// tslint:disable rule-name` o mejor, `//tslint:disable-next-line rule-name`.)
+
+Para afirmar que una expresión es de un tipo dado, utilice `$ExpectType`. Para afirmar que una expresión causa un error de compilación, utilice `$ExpectError`.
+
+```js
+// $ExpectType void
+f(1);
+
+// $ExpectError
+f("one");
+```
+
+Para más detalles, vea el [dtslint](https://github.com/Microsoft/dtslint#write-tests) readme.
+
+Realiza una prueba ejecutando `npm run lint package-name` donde  está el nombre de tu paquete `package-name`.
+Este script utiliza [dtslint](https://github.com/Microsoft/dtslint).
+

From 88f695c16c34cbbbc49d0256338fb42d7bd806ff Mon Sep 17 00:00:00 2001
From: Alex Sherwin <alex.sherwin@gmail.com>
Date: Thu, 1 Mar 2018 00:27:30 -0500
Subject: [PATCH 362/388] Changing import of types to use named variants
 instead of an aliased module

When "pg-native" is not available, importing the module as a wildcard
after tsc transpilation can cause the runtime to invoke the getter
for the 'native' export, which will print an annoying message from
the runtime (node, etc):

"Cannot find module 'pg-native'"
---
 types/pg/pg-tests.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/pg/pg-tests.ts b/types/pg/pg-tests.ts
index b9b3f80d4e..7f9fb04d69 100644
--- a/types/pg/pg-tests.ts
+++ b/types/pg/pg-tests.ts
@@ -1,10 +1,10 @@
-import * as pg from "pg";
+import { types, Client, QueryArrayConfig, Pool } from "pg";
 
 // https://github.com/brianc/node-pg-types
 // tslint:disable-next-line no-unnecessary-callback-wrapper
-pg.types.setTypeParser(20, val => Number(val));
+types.setTypeParser(20, val => Number(val));
 
-const client = new pg.Client({
+const client = new Client({
   host: 'my.database-server.com',
   port: 5334,
   user: 'database-user',
@@ -65,7 +65,7 @@ client.query(query)
     console.error(e.stack);
   });
 
-const queryArrMode: pg.QueryArrayConfig = {
+const queryArrMode: QueryArrayConfig = {
   name: 'get-name-array',
   text: 'SELECT $1::text',
   values: ['brianc'],
@@ -103,11 +103,11 @@ client.end()
   .then(() => console.log('client has disconnected'))
   .catch(err => console.error('error during disconnection', err.stack));
 
-const poolOne = new pg.Pool({
+const poolOne = new Pool({
   connectionString: 'postgresql://dbuser:secretpassword@database.server.com:3211/mydb'
 });
 
-const pool = new pg.Pool({
+const pool = new Pool({
   host: 'localhost',
   port: 5432,
   user: 'database-user',

From a4642b2901d6c9564c3d968a77a2d648ef64e7ac Mon Sep 17 00:00:00 2001
From: Nikolay Polukhin <polu-hin@mail.ru>
Date: Thu, 1 Mar 2018 10:34:43 +0400
Subject: [PATCH 363/388] [react-native-snap-carousel] Update to 3.6

---
 types/react-native-snap-carousel/index.d.ts | 147 ++++++++++++++++----
 1 file changed, 119 insertions(+), 28 deletions(-)

diff --git a/types/react-native-snap-carousel/index.d.ts b/types/react-native-snap-carousel/index.d.ts
index e62301d2fc..a9bae02802 100644
--- a/types/react-native-snap-carousel/index.d.ts
+++ b/types/react-native-snap-carousel/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for react-native-snap-carousel 3.5
+// Type definitions for react-native-snap-carousel 3.6
 // Project: https://github.com/archriss/react-native-snap-carousel
 // Definitions by: jnbt <https://github.com/jnbt>
 //                 Jacob Froman <https://github.com/j-fro>
+//                 Nikolay Polukhin <https://github.com/gazaret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -113,12 +114,6 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProperties> {
      * Whether to implement a shouldComponentUpdate strategy to minimize updates
      */
     shouldOptimizeUpdates?: boolean;
-    /**
-     * Snapping on android is kinda choppy, especially when swiping quickly so you
-     * can disable it.
-     * Warning: this prop can't be changed dynamically.
-     */
-    snapOnAndroid?: boolean;
     /**
      * Delta x when swiping to trigger the snap
      */
@@ -163,23 +158,25 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProperties> {
 
     // Style and animation
 
+    /**
+     * Custom animation options.
+     * Note that useNativeDriver will be enabled by default and that opacity's easing will always be kept linear.
+     * Setting this prop to something other than null will trigger custom animations and will completely change
+     * the way items are animated: rather than having their opacity and scale interpolated based the scroll value (default behavior),
+     * they will now play the custom animation you provide as soon as they become active.
+     * This means you cannot use props layout, scrollInterpolator or slideInterpolatedStyle in conjunction with activeAnimationOptions
+     */
+    activeAnimationOptions?: Animated.DecayAnimationConfig | Animated.TimingAnimationConfig | Animated.SpringAnimationConfig;
+    /**
+     * Custom animation type: either 'decay, 'spring' or 'timing'.
+     * Note that it will only be applied to the scale animation since opacity's animation type will always be set
+     * to timing (no one wants the opacity to 'bounce' around)
+     */
+    activeAnimationType?: string;
     /**
      * Determine active slide's alignment relative to the carousel
      */
     activeSlideAlignment?: 'start' | 'center' | 'end';
-    /**
-     * Animated animation to use. Provide the name of the method
-     */
-    animationFunc?: 'decay' | 'timing' | 'spring';
-    /**
-     * Animation options to be merged with the default ones. Can be used w/ animationFunc
-     */
-    customAnimationOptions?: Animated.DecayAnimationConfig | Animated.TimingAnimationConfig | Animated.SpringAnimationConfig;
-    /**
-     * Override container's inner padding (needed for slides's centering).
-     * Warning: be aware that overriding the default value can mess with carousel's behavior.
-     */
-    carouselHorizontalPadding?: number;
     /**
      * Optional styles for Scrollview's global wrapper
      */
@@ -201,6 +198,26 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProperties> {
      * `customAnimationOptions`
      */
     inactiveSlideShift?: number;
+    /**
+     * Define the way items are rendered and animated.
+     * Possible values are 'default', 'stack' and 'tinder'.
+     * See this for more info and visual examples.
+     * WARNING: setting this prop to either 'stack' or 'tinder' will activate useScrollView to prevent rendering bugs with FlatList.
+     * Therefore, those layouts will probably not be suited if you have a large data set.
+     */
+    layout?: 'default' | 'stack' | 'tinder';
+    /**
+     * Use to increase or decrease the default card offset in both 'stack' and 'tinder' layouts.
+     */
+    layoutCardOffset?: number;
+    /**
+     * Used to define custom interpolations
+     */
+    scrollInterpolator?(index: number, carouselProps: CarouselProps<any>): { inputRange: number[], outputRange: number[] };
+    /**
+     * Used to define custom interpolations
+     */
+    slideInterpolatedStyle?(animatedValue: number, carouselProps: CarouselProps<any>): StyleProp<ViewStyle>;
     /**
      * Optional style for each item's container (the one whose scale and opacity are animated)
      */
@@ -217,14 +234,6 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProperties> {
      */
     onScroll?(event: NativeSyntheticEvent<NativeScrollEvent>): void;
 
-    /**
-     * @deprecated: use onScroll instead
-     * Callback fired while scrolling; direct equivalent of ScrollView's onScroll
-     * Since onScroll is overriden by plugin's implementation, you should use prop onScrollViewScroll
-     * if you need a callback while scrolling.
-     */
-    onScrollViewScroll?(event: NativeSyntheticEvent<NativeScrollEvent>): void;
-
     /**
      * Callback fired when navigating to an item
      */
@@ -232,13 +241,41 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProperties> {
 }
 
 export interface CarouselStatic<T> extends React.ComponentClass<CarouselProps<T>> {
+    /**
+     * Current active item (int, starts at 0)
+     */
     currentIndex: number;
+    /**
+     * Underlying ScrollView's current content offset
+     * (int, starts at 0 if activeSlideAlignment is set to start, negative value otherwise)
+     */
     currentScrollPosition: number;
+    /**
+     * Start the autoplay manually
+     */
     startAutoplay(instantly?: boolean): void;
+    /**
+     * Stop the autoplay manually
+     */
     stopAutoplay(): void;
+    /**
+     * Snap to an item manually
+     */
     snapToItem(index: number, animated?: boolean, fireCallback?: boolean, initial?: boolean): void;
+    /**
+     * Snap to next item manually
+     */
     snapToNext(animated?: boolean): void;
+    /**
+     * Snap to previous item manually
+     */
     snapToPrev(animated?: boolean): void;
+    /**
+     * Call this when needed to work around a random FlatList bug that keeps content hidden until the carousel is scrolled
+     * (see #238). Note that the offset parameter is not required and will default to either 1 or -1 depending
+     * on the current scroll position
+     */
+    triggerRenderingHack(offset: number): void;
 }
 
 export type CarouselProperties<T> = ScrollViewProperties & CarouselProps<T> & React.Props<CarouselStatic<T>>;
@@ -285,14 +322,49 @@ export interface PaginationProps {
      * Currently focused dot
      */
     activeDotIndex: number;
+    /**
+     * Opacity of the dot when tapped. The prop has no effect if tappableDots hasn't been set to true
+     */
+    activeOpacity?: number;
+    /**
+     * Reference to the Carousel component to which pagination is linked.
+     * Needed only when setting tappableDots to true
+     */
+    carouselRef?: React.Component<FlatListProperties<any>>;
     /**
      * Style for dots' container that will be merged with the default one
      */
     containerStyle?: StyleProp<ViewStyle>;
+    /**
+     * Background color of the active dot.
+     * Use this if you want to animate the change between active and inactive colors,
+     * and always in conjunction with inactiveDotColor
+     */
+    dotColor?: string;
+    /**
+     * Style of each dot's container.
+     * Use this if you need to specify styles that wouldn't have any effect when defined with dotStyle (such as flex)
+     */
+    dotContainerStyle?: StyleProp<ViewStyle>;
+    /**
+     * Optional custom active dot element that will replace the default one.
+     * The element will receive a prop active set to true as well as a prop index
+     */
+    dotElement?: React.ReactNode;
     /**
      * Dots' style that will be merged with the default one
      */
     dotStyle?: StyleProp<ViewStyle>;
+    /**
+     * Background color of the inactive dots.
+     * Use this if you want to animate the change between active and inactive colors, and always in conjunction with dotColor
+     */
+    inactiveDotColor?: string;
+    /**
+     * Optional custom inactive dot element that will replace the default one.
+     * The element will receive a prop active set to false as well as a prop index
+     */
+    inactiveDotElement?: React.ReactNode;
     /**
      * Value of the opacity effect applied to inactive dots
      */
@@ -301,6 +373,25 @@ export interface PaginationProps {
      * Value of the 'scale' transform applied to inactive dots
      */
     inactiveDotScale?: number;
+    /**
+     * Dots' style that will be applied to inactive elements
+     */
+    inactiveDotStyle?: StyleProp<ViewStyle>;
+    /**
+     * Function that gives you complete control over pagination's rendering.
+     * It will receive three parameters : (activeIndex, total, context).
+     * This can be especially useful in order to replace dots with numbers
+     */
+    renderDots?(activeIndex: number, total: number, context: any): React.ReactNode;
+    /**
+     * Make default dots tappable, e.g. your carousel will slide to the corresponding item.
+     * Note that carouselRef must be specified for this to work
+     */
+    tappableDots?: boolean;
+    /**
+     * Whether to layout dots vertically or horizontally
+     */
+    vertical?: boolean;
 }
 
 export type PaginationStatic = React.ComponentClass<PaginationProps>;

From c3a16f1266abacf43031a1a0c5675d14a600e820 Mon Sep 17 00:00:00 2001
From: dominuskernel <promodominus@gmail.com>
Date: Thu, 1 Mar 2018 11:16:37 +0100
Subject: [PATCH 364/388] turn optional the error_handler argument

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

diff --git a/types/roads-server/index.d.ts b/types/roads-server/index.d.ts
index e624b2828e..f9fb7d1384 100644
--- a/types/roads-server/index.d.ts
+++ b/types/roads-server/index.d.ts
@@ -16,7 +16,7 @@ export class Server {
      * @param Roads The Road that handles all the routes
      * @param error_handler An overwrite to the standard error handler. Accepts a single parameter (the error) and should return a Roads.Response object
      */
-    constructor(Roads: Road, error_handler: (error: any) => any);
+    constructor(Roads: Road, error_handler?: (error: any) => any);
 
     /**
      * Start the http server. Accepts the same parameters as HttpServer.listen

From fbe268136f5130633608f58cd41f6f249e51ae69 Mon Sep 17 00:00:00 2001
From: dominuskernel <promodominus@gmail.com>
Date: Thu, 1 Mar 2018 11:22:46 +0100
Subject: [PATCH 365/388] remove comment in Http2Server

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

diff --git a/types/roads-server/index.d.ts b/types/roads-server/index.d.ts
index f9fb7d1384..9543d760f1 100644
--- a/types/roads-server/index.d.ts
+++ b/types/roads-server/index.d.ts
@@ -30,7 +30,6 @@ export class Http2Server {
     /**
      *
      * @param Roads The Road that handles all the routes
-     * @param error_handler An overwrite to the standard error handler. Accepts a single parameter (the error) and should return a Roads.Response object
      */
     constructor(Roads: Road);
 

From 14cb628011f03c6378ac41c26df4c243c13a6bfe Mon Sep 17 00:00:00 2001
From: Nikolay Polukhin <polu-hin@mail.ru>
Date: Thu, 1 Mar 2018 14:52:18 +0400
Subject: [PATCH 366/388] [react-native-snap-carousel] fix activeAnimationType
 type

---
 types/react-native-snap-carousel/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-native-snap-carousel/index.d.ts b/types/react-native-snap-carousel/index.d.ts
index a9bae02802..14be9e3bbf 100644
--- a/types/react-native-snap-carousel/index.d.ts
+++ b/types/react-native-snap-carousel/index.d.ts
@@ -172,7 +172,7 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProperties> {
      * Note that it will only be applied to the scale animation since opacity's animation type will always be set
      * to timing (no one wants the opacity to 'bounce' around)
      */
-    activeAnimationType?: string;
+    activeAnimationType?: 'decay' | 'spring' | 'timing';
     /**
      * Determine active slide's alignment relative to the carousel
      */

From b075015c9a00b2fe5142cb35b356942865c4c9d9 Mon Sep 17 00:00:00 2001
From: Budi Irawan <deerawan@gmail.com>
Date: Thu, 1 Mar 2018 23:01:54 +1100
Subject: [PATCH 367/388] Add _routing in GetResponse elasticsearch

---
 types/elasticsearch/elasticsearch-tests.ts | 9 +++++++++
 types/elasticsearch/index.d.ts             | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 2e90389126..10c4659998 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -169,6 +169,15 @@ client.index({
 }, (error, response) => {
 });
 
+client.get({
+  index: 'myindex',
+  type: 'mytype',
+  id: '1',
+  routing: '1'
+}, (error, response) => {
+    const routing = response._routing;
+});
+
 client.mget({
   body: {
     docs: [
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 4d53575749..c6b05da9a0 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -8,6 +8,7 @@
 //                 Ahmad Ferdous Bin Alam <https://github.com/ahmadferdous>
 //                 Simon Schick <https://github.com/SimonSchick>
 //                 Paul Brabban <https://github.com/brabster>
+//                 Budi Irawan <https://github.com/deerawan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -407,6 +408,7 @@ export interface GetResponse<T> {
     _type: string;
     _id: string;
     _version: number;
+    _routing?: string;
     found: boolean;
     _source: T;
 }

From 0525e27d3c298b82c5cdd24820913d5ffa253e57 Mon Sep 17 00:00:00 2001
From: CodeAnimal <codeanimal@outlook.com>
Date: Thu, 1 Mar 2018 13:23:14 +0000
Subject: [PATCH 368/388] Implement Plan/Product API changes on 2018-02-05

https://stripe.com/docs/upgrades#2018-02-05
https://stripe.com/docs/api#create_plan-product
https://stripe.com/docs/api#create_product-type
---
 types/stripe/index.d.ts      | 148 ++++++++++++++++++++++++++---------
 types/stripe/stripe-tests.ts |  66 ++++++++++++----
 2 files changed, 163 insertions(+), 51 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 57c97f4790..83fabae861 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -2820,27 +2820,23 @@ declare namespace Stripe {
             metadata: IMetadata;
 
             /**
-             * Display name of the plan
+             * A brief description of the plan, hidden from customers.
              */
-            name: string;
+            nickname?: string;
 
             /**
-             * Extra information about a charge for the customer's credit card statement.
+             * The product whose pricing this plan determines. [Expandable]
              */
-            statement_descriptor: string;
-
-            /**
-             * Number of trial period days granted when subscribing a customer to this plan. Null if the plan has no trial period.
-             */
-            trial_period_days: number;
+            product?: string | products.IProduct;
         }
 
         interface IPlanCreationOptions extends IDataOptionsWithMetadata {
             /**
-             * Unique string of your choice that will be used to identify this plan when subscribing a customer. This could be an identifier
-             * like "gold" or a primary key from your own database.
+             * An identifier randomly generated by Stripe. Used to identify this plan when subscribing a customer. You can optionally override this
+             * ID, but the ID must be unique across all plans in your Stripe account. You can, however, use the same plan ID in both live and test
+             * modes.
              */
-            id: string;
+            id?: string;
 
             /**
              * A positive integer in cents/pence (or 0 for a free plan) representing how much to charge (on a recurring basis).
@@ -2858,9 +2854,10 @@ declare namespace Stripe {
             interval: IntervalUnit;
 
             /**
-             * Name of the plan, to be displayed on invoices and in the web interface.
+             * The product whose pricing the created plan will represent. This can either be the ID of an existing product, or a dictionary containing
+             * fields used to create a service product.
              */
-            name: string;
+            product: string | IPlanCreationOptionsProductHash;
 
             /**
              * The number of intervals between each subscription billing. For example, interval=month and interval_count=3 bills every 3 months.
@@ -2869,31 +2866,45 @@ declare namespace Stripe {
             interval_count?: number;
 
             /**
-             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. As an example, if your website
-             * is RunClub and the item you’re charging for is your Silver Plan, you may want to specify a statement_descriptor of RunClub Silver Plan.
-             * The statement description may not include <>"' characters, and will appear on your customer’s statement in capital letters. Non-ASCII
-             * characters are automatically stripped. While most banks display this information consistently, some may display it incorrectly or not at all.
+             * A brief description of the plan, hidden from customers.
              */
-            statement_descriptor?: string;
-
-            /**
-             * Specifies a trial period in (an integer number of) days. If you include a trial period, the customer won't be billed for the first time
-             * until the trial period ends. If the customer cancels before the trial period is over, she'll never be billed at all.
-             */
-            trial_period_days?: number;
+            nickname?: string;
         }
 
         interface IPlanUpdateOptions extends IDataOptionsWithMetadata {
             /**
-             * Name of the plan, to be displayed on invoices and in the web interface.
+             * A brief description of the plan, hidden from customers. This can be unset by updating the value to null and then saving.
              */
-            name?: string;
+            nickname?: string;
 
             /**
-             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. As an example, if your website
-             * is RunClub and the item you’re charging for is your Silver Plan, you may want to specify a statement_descriptor of RunClub Silver Plan.
-             * The statement description may not include <>"' characters, and will appear on your customer’s statement in capital letters. Non-ASCII
-             * characters are automatically stripped. While most banks display this information consistently, some may display it incorrectly or not at all.
+             * The product the plan belongs to. Note that after updating, statement descriptors and line items of the plan in active subscriptions will
+             * be affected.
+             */
+            product?: string;
+        }
+
+        interface IPlanCreationOptionsProductHash {
+            /**
+             * The identifier for the product. Must be unique. If not provided, an identifier will be randomly generated.
+             */
+            id?: string;
+
+            /**
+             * The product’s name, meant to be displayable to the customer.
+             */
+            name: string;
+
+            /**
+             * Set of key/value pairs that you can attach to an object. It can be useful for storing additional information about the object in a structured
+             * format. Individual keys can be unset by posting an empty value to them. All keys can be unset by posting an empty value to metadata.
+             */
+            metadata?: IOptionsMetadata;
+
+            /**
+             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. The statement description may not
+             * include <>”’ characters, and will appear on your customer’s statement in capital letters. Non-ASCII characters are automatically stripped. While
+             * most banks display this information consistently, some may display it incorrectly or not at all.
              */
             statement_descriptor?: string;
         }
@@ -2923,6 +2934,9 @@ declare namespace Stripe {
              */
             caption: string;
 
+            /**
+             * Time at which the object was created. Measured in seconds since the Unix epoch.
+             */
             created: number;
 
             /**
@@ -2962,6 +2976,18 @@ declare namespace Stripe {
 
             updated: number;
 
+            /**
+             * Extra information about a product which will appear on your customer’s credit card statement. In the case that multiple products are billed
+             * at once, the first statement descriptor will be used. Only available on products of type=service.
+             */
+            statement_descriptor: string;
+
+            /**
+             * The type of the product. The product is either of type good, which is eligible for use with Orders and SKUs, or service, which is eligible for
+             * use with Subscriptions and Plans.
+             */
+            type: ProductType;
+
             /**
              * A URL of a publicly-accessible webpage for this product.
              */
@@ -2971,55 +2997,77 @@ declare namespace Stripe {
         interface IProductCreationOptions extends IDataOptionsWithMetadata {
             /**
              * The identifier for the product. Must be unique. If not provided, an identifier will be randomly generated.
+             * Applicable to both service and good types.
              */
             id?: string;
 
             /**
              * The product’s name, meant to be displayable to the customer.
+             * Applicable to both service and good types.
              */
             name: string;
 
             /**
-             * Whether or not the product is currently available for purchase. Defaults to true.
+             * The type of the product. The product is either of type service, which is eligible for use with Subscriptions
+             * and Plans or good, which is eligible for use with Orders and SKUs.
+             */
+            type: ProductType;
+
+            /**
+             * Whether or not the product is currently available for purchase. Defaults to true. May only be set if type=good.
              */
             active?: boolean;
 
             /**
              * 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>;
 
             /**
-             * A short one-line description of the product, meant to be displayable to the customer.
+             * A short one-line description of the product, meant to be displayable to the customer. May only be set if type=good.
              */
             caption?: string;
 
             /**
              * An array of Connect application names or identifiers that should not be able to order the SKUs for this product.
+             * May only be set if type=good.
              */
             deactivate_on?: Array<string>;
 
             /**
-             * The product’s description, meant to be displayable to the customer.
+             * The product’s description, meant to be displayable to the customer. May only be set if type=good.
              */
             description?: string;
 
             /**
-             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer.
+             * A list of up to 8 URLs of images for this product, meant to be displayable to the customer. May only be set if type=good.
              */
             images?: Array<string>;
 
+            /**
+             * The dimensions of this product for shipping purposes. A SKU associated with this product can override this value by having its own
+             * package_dimensions. May only be set if type=good.
+             */
             package_dimensions?: IPackageDimensions;
 
             /**
-             * Whether this product is shipped (i.e. physical goods). Defaults to true.
+             * Whether this product is shipped (i.e. physical goods). Defaults to true. May only be set if type=good.
              */
             shippable?: boolean;
 
             /**
-             * A URL of a publicly-accessible webpage for this product.
+             * A URL of a publicly-accessible webpage for this product. May only be set if type=good.
              */
             url?: string;
+
+            /**
+             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. The statement description
+             * may not include <>”’ characters, and will appear on your customer’s statement in capital letters. Non-ASCII characters are automatically
+             * stripped. While most banks display this information consistently, some may display it incorrectly or not at all.
+             * May only be set if type=service.
+             */
+            statement_descriptor?: string;
         }
 
         interface IProductUpdateOptions extends IDataOptionsWithMetadata {
@@ -3056,6 +3104,10 @@ declare namespace Stripe {
              */
             name?: string;
 
+            /**
+             * The dimensions of this product for shipping purposes. A SKU associated with this product can override this value by having its own
+             * package_dimensions.
+             */
             package_dimensions?: IPackageDimensions;
 
             /**
@@ -3067,6 +3119,14 @@ declare namespace Stripe {
              * A URL of a publicly-accessible webpage for this product.
              */
             url?: string;
+
+            /**
+             * An arbitrary string to be displayed on your customer’s credit card statement. This may be up to 22 characters. The statement description
+             * may not include <>”’ characters, and will appear on your customer’s statement in capital letters. Non-ASCII characters are automatically
+             * stripped. While most banks display this information consistently, some may display it incorrectly or not at all.
+             * May only be set if type=service.
+             */
+            statement_descriptor?: string;
         }
 
         interface IProductListOptions extends IListOptions {
@@ -3113,6 +3173,8 @@ declare namespace Stripe {
              */
             width: number;
         }
+
+        type ProductType = "service" | "good";
     }
 
     namespace recipientCards { }
@@ -7013,6 +7075,18 @@ declare namespace Stripe {
         stripe_account?: string;
 
         api_key?: string;
+
+        /**
+         * Many objects contain the ID of a related object in their response properties. For example, a Charge may have an associated Customer ID.
+         * Those objects can be expanded inline with the expand request parameter. Objects that can be expanded are noted in this documentation.
+         * This parameter is available on all API requests, and applies to the response of that request only.
+         * 
+         * You can nest expand requests with the dot property. For example, requesting invoice.customer on a charge will expand the invoice property
+         * into a full Invoice object, and will then expand the customer property on that invoice into a full Customer object.
+         * 
+         * You can expand multiple objects at once by identifying multiple items in the expand array.
+         */
+        expand?: string[];
     }
 
     /**
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 7f3a42d4c6..52e8579f45 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -757,7 +757,19 @@ stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkL
 //#region Products tests
 // ##################################################################################
 
-
+stripe.products.create({
+    name: "My amazing product",
+    type: "service"
+}, function (err, coupon) {
+    // asynchronously called
+});
+stripe.products.create({
+    name: "My amazing product",
+    type: "service"
+}).then(function (product) {
+    // asynchronously called
+    const prodType: "service" | "good" = product.type;
+});
 
 //#endregion
 
@@ -1069,51 +1081,77 @@ stripe.payouts.cancel(
 //#region Plans tests
 // ##################################################################################
 
+// all product hash options
 stripe.plans.create({
     amount: 2000,
     interval: "month",
-    name: "Amazing Gold Plan",
+    product: {
+        name: "Amazing Gold Plan",
+        statement_descriptor: "Gold Plan",
+        metadata: {
+            plan_id: "goldplan123"
+        }
+    },
+    nickname: "Something to remember me by",
     currency: "usd",
-    id: "gold"
+    id: "gold-plan"
 }, function (err, plan) {
     // asynchronously called
-    });
+});
+
+// minimum options with product hash
 stripe.plans.create({
     amount: 2000,
-    interval: "month",
-    name: "Amazing Gold Plan",
     currency: "usd",
-    id: "gold"
+    interval: "month",
+    product: {
+        name: "Amazing Gold Plan"
+    }
 }).then(function (plan) {
     // asynchronously called
 });
 
+// minimum options with product id
+stripe.plans.create({
+    amount: 2000,
+    currency: "usd",
+    interval: "month",
+    product: "prod_UT1t06yZ3iBEHi"
+}).then(function (plan) {
+    // asynchronously called
+    const productId = plan.product as string;
+});
+
 stripe.plans.retrieve(
-    "platypi-dev",
+    "gold-plan",
+    {
+        expand: ["product"]
+    },
     function (err, plan) {
         // asynchronously called
+        const product = plan.product as Stripe.products.IProduct;
     }
 );
-stripe.plans.retrieve("platypi-dev").then(function (plan) {
+stripe.plans.retrieve("gold-plan").then(function (plan) {
     // asynchronously called
 });
 
-stripe.plans.update("platypi-dev", {
-    name: "New plan name"
+stripe.plans.update("gold-plan", {
+    product: "prod_UT1t06yZ3iBEHi"
 }, function (err, plan) {
     // asynchronously called
 });
-stripe.plans.update("platypi-dev", { name: "New plan name" }).then(function (plan) {
+stripe.plans.update("gold-plan", { nickname: "New gold plan nickname" }).then(function (plan) {
     // asynchronously called
 });
 
 stripe.plans.del(
-    "platypi-dev",
+    "gold-plan",
     function (err, confirmation) {
         // asynchronously called
     }
 );
-stripe.plans.del("platypi-dev").then(function (confirmation) {
+stripe.plans.del("gold-plan").then(function (confirmation) {
     // asynchronously called
 });
 

From 445fc7323898b3216d60a37856d68826303cab83 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <granttimmerman@gmail.com>
Date: Thu, 1 Mar 2018 10:48:56 -0500
Subject: [PATCH 369/388] Re-add @grant (#23991)

* Re-add @grant

* Add grant to index.d.ts
---
 .github/CODEOWNERS                  | 2 +-
 types/google-apps-script/index.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ec7763f89a..a769c20dfc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1273,7 +1273,7 @@
 /types/gm/                                      @ChaosinaCan @maartenvanvliet
 /types/go/                                      @NorthwoodsSoftware
 /types/google-adwords-scripts/                  @jafaircl
-/types/google-apps-script/                      @motemen
+/types/google-apps-script/                      @motemen @grant
 /types/google-apps-script-oauth2/               @dhayab
 /types/google-cloud__datastore/                 @beaulac
 /types/google-cloud__pubsub/                    @pheromonez
diff --git a/types/google-apps-script/index.d.ts b/types/google-apps-script/index.d.ts
index df2cca1363..129e11d70f 100644
--- a/types/google-apps-script/index.d.ts
+++ b/types/google-apps-script/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for google-apps-script
 // Project: https://developers.google.com/apps-script/
-// Definitions by: motemen <https://github.com/motemen>
+// Definitions by: motemen <https://github.com/motemen>, grant <https://github.com/grant>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 

From 86513e7b28fe5ec2c3aeff8934a04b88e9d99ae5 Mon Sep 17 00:00:00 2001
From: Ben Barber <contact@benbarber.co.uk>
Date: Thu, 1 Mar 2018 16:16:05 +0000
Subject: [PATCH 370/388] Added invalid to InputProps

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

diff --git a/types/reactstrap/lib/Input.d.ts b/types/reactstrap/lib/Input.d.ts
index 7236e02fa6..3da3691ea8 100644
--- a/types/reactstrap/lib/Input.d.ts
+++ b/types/reactstrap/lib/Input.d.ts
@@ -32,6 +32,7 @@ export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement>
   bsSize?: 'lg' | 'sm';
   state?: string;
   valid?: boolean;
+  invalid?: boolean;
   tag?: React.ReactType;
   innerRef?: string | ((instance: HTMLInputElement) => any);
   plaintext?: boolean;

From 51b7608b3eaa1cfe11b4ac2b5668421d3c478589 Mon Sep 17 00:00:00 2001
From: Ben Grynhaus <bengr@microsoft.com>
Date: Thu, 1 Mar 2018 18:20:21 +0200
Subject: [PATCH 371/388] Added types for 'tryer' (1.0.0)

---
 types/tryer/index.d.ts     | 66 +++++++++++++++++++++++++++++++
 types/tryer/tryer-tests.ts | 80 ++++++++++++++++++++++++++++++++++++++
 types/tryer/tsconfig.json  | 16 ++++++++
 types/tryer/tslint.json    |  1 +
 4 files changed, 163 insertions(+)
 create mode 100644 types/tryer/index.d.ts
 create mode 100644 types/tryer/tryer-tests.ts
 create mode 100644 types/tryer/tsconfig.json
 create mode 100644 types/tryer/tslint.json

diff --git a/types/tryer/index.d.ts b/types/tryer/index.d.ts
new file mode 100644
index 0000000000..44835dc2b2
--- /dev/null
+++ b/types/tryer/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for tryer 1.0
+// Project: https://github.com/philbooth/tryer
+// Definitions by: Ben Grynhaus <https://github.com/bengry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare const tryer: tryer.TryerStatic;
+export = tryer;
+export as namespace tryer;
+
+declare namespace tryer {
+    interface Options {
+        /**
+         * The function that you want to invoke.
+         * If action returns a promise, iterations will not end until the promise is resolved or rejected.
+         * Alternatively, action may take a callback argument, done, to signal that it is asynchronous. In that case, you are responsible for calling done when the action is finished.
+         *
+         * If action is not set, it defaults to an empty function.
+         */
+        action?: (() => Promise<any>) | ((done: () => void) => any);
+
+        /**
+         * when: A predicate that tests the pre-condition for invoking action.
+         * Until when returns true (or a truthy value), action will not be called.
+         * Defaults to a function that immediately returns true.
+         */
+        when?: () => boolean;
+
+        /**
+         * until: A predicate that tests the post-condition for invoking action.
+         * After until returns true (or a truthy value), action will no longer be called.
+         * Defaults to a function that immediately returns true.
+         */
+        until?: () => boolean;
+
+        /**
+         * fail: The error handler.
+         * A function that will be called if limit falsey values are returned by when or until.
+         * Defaults to an empty function.
+         */
+        fail?: (err: Error) => void;
+
+        /**
+         * pass: Success handler.
+         * A function that will be called after until has returned truthily.
+         * Defaults to an empty function.
+         */
+        pass?: () => void;
+
+        /**
+         * limit: Failure limit, representing the maximum number of falsey returns from when or until that will be permitted before invocation is deemed to have failed.
+         * A negative number indicates that the attempt should never fail, instead continuing for as long as when and until have returned truthy values.
+         * Defaults to -1.
+         */
+        limit?: number;
+
+        /**
+         * interval: The retry interval, in milliseconds.
+         * A negative number indicates that each subsequent retry should wait for twice the interval from the preceding iteration (i.e. exponential backoff).
+         * The default value is -1000, signifying that the initial retry interval should be one second and that each subsequent attempt should wait for double the length of the previous interval.
+         */
+        interval?: number;
+    }
+
+    type TryerStatic = (options: Readonly<Options>) => void;
+}
diff --git a/types/tryer/tryer-tests.ts b/types/tryer/tryer-tests.ts
new file mode 100644
index 0000000000..4be432d3c7
--- /dev/null
+++ b/types/tryer/tryer-tests.ts
@@ -0,0 +1,80 @@
+import * as tryer from "tryer";
+
+tryer(); // $ExpectError
+
+// $ExpectError
+tryer({
+    action: null
+});
+
+// $ExpectError
+tryer({
+    fail: null
+});
+
+// $ExpectError
+tryer({
+    fail: null
+});
+
+// $ExpectError
+tryer({
+    interval: null
+});
+
+// $ExpectError
+tryer({
+    limit: null
+});
+
+// $ExpectError
+tryer({
+    pass: null
+});
+
+// $ExpectError
+tryer({
+    until: null
+});
+
+// $ExpectError
+tryer({
+    when: null
+});
+
+// $ExpectError
+tryer({
+    when: () => 1
+});
+
+// $ExpectError
+tryer({
+    until: () => 1
+});
+
+// $ExpectError
+tryer({
+    limit: "notNumber"
+});
+
+// $ExpectError
+tryer({
+    interval: "notNumber"
+});
+
+tryer({});
+
+tryer({
+    action: done => {
+        done();
+    },
+    fail: error => {
+        error.message;
+        error.name;
+    },
+    interval: 1,
+    until: () => true,
+    when: () => false,
+    limit: 1,
+    pass: () => {}
+});
diff --git a/types/tryer/tsconfig.json b/types/tryer/tsconfig.json
new file mode 100644
index 0000000000..260613aabf
--- /dev/null
+++ b/types/tryer/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "tryer-tests.ts"]
+}
diff --git a/types/tryer/tslint.json b/types/tryer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/tryer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 40d39fb1fa3273064ee4bd13daba32ffb21f0c36 Mon Sep 17 00:00:00 2001
From: Christopher Woodland <christopher.woodland@pearson.com>
Date: Thu, 1 Mar 2018 14:02:28 -0500
Subject: [PATCH 372/388] Change Joi export to export import Joi =
 require("joi");

---
 types/frisby/index.d.ts | 164 +---------------------------------------
 1 file changed, 1 insertion(+), 163 deletions(-)

diff --git a/types/frisby/index.d.ts b/types/frisby/index.d.ts
index 899e45ef5e..bdec0fbf7f 100644
--- a/types/frisby/index.d.ts
+++ b/types/frisby/index.d.ts
@@ -12,169 +12,7 @@ import { Response } from 'node-fetch'; // Import all definitions from node-fetch
 
 // #region Joi Methods
 // Reference file: https://github.com/hapijs/joi
-export namespace Joi {
-    const isImmutable: boolean;
-    const isJoi: boolean;
-    const schemaType: string;
-    const version: string;
-    function allow(...args: any[]): void;
-    function alt(args: any): any;
-    function alternatives(args: any): any;
-    function any(args: any): any;
-    function applyFunctionToChildren(...args: any[]): void;
-    function array(args: any): any;
-    function assert(value: any, schema: any, message: string): void;
-    function attempt(value: any, schema: any, message: string): any;
-    function binary(args: any): any;
-    function bool(args: any): any;
-    function checkOptions(...args: any[]): void;
-    function clone(...args: any[]): void;
-    function compile(schema: any): any;
-    function concat(...args: any[]): void;
-    function createError(...args: any[]): void;
-    function createOverrideError(...args: any[]): void;
-    function date(args: any): any;
-    function defaults(fn: any): any;
-    function describe(args: any): any;
-    function description(...args: any[]): void;
-    function disallow(...args: any[]): void;
-    function empty(...args: any[]): void;
-    function equal(...args: any[]): void;
-    function error(...args: any[]): void;
-    function example(...args: any[]): void;
-    function exist(...args: any[]): void;
-    function extend(args: any): any;
-    function forbidden(...args: any[]): void;
-    function func(args: any): any;
-    function invalid(...args: any[]): void;
-    function isRef(ref: any): any;
-    function label(...args: any[]): void;
-    function lazy(fn: any): any;
-    function meta(...args: any[]): void;
-    function not(...args: any[]): void;
-    function notes(...args: any[]): void;
-    function number(args: any): any;
-    function object(args: any): any;
-    function only(...args: any[]): void;
-    function optional(...args: any[]): void;
-    function options(...args: any[]): void;
-    function raw(...args: any[]): void;
-    function reach(schema: any, path: any): any;
-    function ref(args: any): any;
-    function required(...args: any[]): void;
-    function strict(...args: any[]): void;
-    function string(args: any): any;
-    function strip(...args: any[]): void;
-    function tags(...args: any[]): void;
-    function unit(...args: any[]): void;
-    function valid(...args: any[]): void;
-    function validate(value: any, args: any): any;
-    function when(...args: any[]): void;
-
-    namespace extensionSchema {
-        const isImmutable: boolean;
-        const isJoi: boolean;
-        const schemaType: string;
-        function allow(...args: any[]): void;
-        function and(...args: any[]): void;
-        function applyFunctionToChildren(...args: any[]): void;
-        function assert(...args: any[]): void;
-        function checkOptions(...args: any[]): void;
-        function clone(...args: any[]): void;
-        function concat(...args: any[]): void;
-        function createError(...args: any[]): void;
-        function createOverrideError(...args: any[]): void;
-        function describe(...args: any[]): void;
-        function description(...args: any[]): void;
-        function disallow(...args: any[]): void;
-        function empty(...args: any[]): void;
-        function equal(...args: any[]): void;
-        function error(...args: any[]): void;
-        function example(...args: any[]): void;
-        function exist(...args: any[]): void;
-        function forbidden(...args: any[]): void;
-        function forbiddenKeys(...args: any[]): void;
-        function invalid(...args: any[]): void;
-        function keys(...args: any[]): void;
-        function label(...args: any[]): void;
-        function length(...args: any[]): void;
-        function max(...args: any[]): void;
-        function meta(...args: any[]): void;
-        function min(...args: any[]): void;
-        function nand(...args: any[]): void;
-        function not(...args: any[]): void;
-        function notes(...args: any[]): void;
-        function only(...args: any[]): void;
-        function optional(...args: any[]): void;
-        function optionalKeys(...args: any[]): void;
-        function options(...args: any[]): void;
-        function or(...args: any[]): void;
-        function pattern(...args: any[]): void;
-        function raw(...args: any[]): void;
-        function rename(...args: any[]): void;
-        function required(...args: any[]): void;
-        function requiredKeys(...args: any[]): void;
-        function schema(...args: any[]): void;
-        function strict(...args: any[]): void;
-        function strip(...args: any[]): void;
-        function tags(...args: any[]): void;
-        function type(...args: any[]): void;
-        function unit(...args: any[]): void;
-        function unknown(...args: any[]): void;
-        function valid(...args: any[]): void;
-        function validate(...args: any[]): void;
-        function when(...args: any[]): void;
-        function without(...args: any[]): void;
-        function xor(...args: any[]): void;
-    }
-
-    namespace extensionsSchema {
-        const isImmutable: boolean;
-        const isJoi: boolean;
-        const schemaType: string;
-        function allow(...args: any[]): void;
-        function applyFunctionToChildren(...args: any[]): void;
-        function checkOptions(...args: any[]): void;
-        function clone(...args: any[]): void;
-        function concat(...args: any[]): void;
-        function createError(...args: any[]): void;
-        function createOverrideError(...args: any[]): void;
-        function describe(...args: any[]): void;
-        function description(...args: any[]): void;
-        function disallow(...args: any[]): void;
-        function empty(...args: any[]): void;
-        function equal(...args: any[]): void;
-        function error(...args: any[]): void;
-        function example(...args: any[]): void;
-        function exist(...args: any[]): void;
-        function forbidden(...args: any[]): void;
-        function invalid(...args: any[]): void;
-        function items(...args: any[]): void;
-        function label(...args: any[]): void;
-        function length(...args: any[]): void;
-        function max(...args: any[]): void;
-        function meta(...args: any[]): void;
-        function min(...args: any[]): void;
-        function not(...args: any[]): void;
-        function notes(...args: any[]): void;
-        function only(...args: any[]): void;
-        function optional(...args: any[]): void;
-        function options(...args: any[]): void;
-        function ordered(...args: any[]): void;
-        function raw(...args: any[]): void;
-        function required(...args: any[]): void;
-        function single(...args: any[]): void;
-        function sparse(...args: any[]): void;
-        function strict(...args: any[]): void;
-        function strip(...args: any[]): void;
-        function tags(...args: any[]): void;
-        function unique(...args: any[]): void;
-        function unit(...args: any[]): void;
-        function valid(...args: any[]): void;
-        function validate(...args: any[]): void;
-        function when(...args: any[]): void;
-    }
-}
+export import Joi = require("joi");
 // #endregion
 
 // #region Frisby FrisbySpec Methods

From f09fdbe9da0b9b518ed2bd7e07878cc8c55e2768 Mon Sep 17 00:00:00 2001
From: Christopher Woodland <christopher.woodland@pearson.com>
Date: Thu, 1 Mar 2018 14:18:10 -0500
Subject: [PATCH 373/388] Change promise() return type.

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

diff --git a/types/frisby/index.d.ts b/types/frisby/index.d.ts
index bdec0fbf7f..859bb3e3db 100644
--- a/types/frisby/index.d.ts
+++ b/types/frisby/index.d.ts
@@ -7,7 +7,7 @@
 /// <reference types='jasmine'/>
 
 // #region Imports
-import { Response } from 'node-fetch'; // Import all definitions from node-fetch.
+export import nodeFetch = require('node-fetch'); // Import all definitions from node-fetch.
 //#endregion
 
 // #region Joi Methods
@@ -38,7 +38,7 @@ export class FrisbySpec {
     inspectStatus(): FrisbySpec;
     patch(url: string, params: {}): FrisbySpec;
     post(url: string, params: {}): FrisbySpec;
-    promise(): Promise<Response>;
+    promise(): Promise<nodeFetch.Response>;
     put(url: string, params: {}): FrisbySpec;
     setup(opts: {}, replace: boolean): FrisbySpec;
     then(onFulfilled: {} | ((...args: any[]) => void), onRejected: (...args: any[]) => void): FrisbySpec;

From 5b0ff4bc9f7b356fa0c1c6dc4e5628e85632912d Mon Sep 17 00:00:00 2001
From: Christopher Woodland <christopher.woodland@pearson.com>
Date: Thu, 1 Mar 2018 16:03:15 -0500
Subject: [PATCH 374/388] Add  Johnny Li <https://github.com/johnny4753> to 
 Definitions by

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

diff --git a/types/frisby/index.d.ts b/types/frisby/index.d.ts
index 859bb3e3db..366a3998d7 100644
--- a/types/frisby/index.d.ts
+++ b/types/frisby/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Frisby 2.0
 // Project: https://github.com/vlucas/frisby
 // Definitions by: Christopher E. Woodland <https://github.com/cwoodland>
+//                 Johnny Li <https://github.com/johnny4753>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 6ce9368ebd6dc8b6f7d4e2955a9da6dfe01d71de Mon Sep 17 00:00:00 2001
From: Alex Sherwin <alex.sherwin@gmail.com>
Date: Thu, 1 Mar 2018 16:40:46 -0500
Subject: [PATCH 375/388] Existing "QueryResult" interface is  missing property
 "fields" only the array "QueryArrayResult" variant contained the "fields"
 property

Added a new "QueryResultBase" interface with the shared set of
fields between the single/array results and refactored both
QueryResult and QueryArrayResult to extend from it, each now
only needing to specify their own type variation of the "row"
property for the type of results they contain (single vs array)

Modified the tests to reference the "fields" array on single
select results similarly to how it was done for the array
select results
---
 types/pg/index.d.ts  | 18 +++++++++---------
 types/pg/pg-tests.ts |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index b2b8af73e5..a0efbb1555 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -53,13 +53,6 @@ export interface QueryArrayConfig extends QueryConfig {
     rowMode: 'array';
 }
 
-export interface QueryResult {
-    command: string;
-    rowCount: number;
-    oid: number;
-    rows: any[];
-}
-
 export interface FieldDef {
     name: string;
     tableID: number;
@@ -70,14 +63,21 @@ export interface FieldDef {
     format: string;
 }
 
-export interface QueryArrayResult {
+export interface QueryResultBase {
     command: string;
     rowCount: number;
     oid: number;
-    rows: any[][];
     fields: FieldDef[];
 }
 
+export interface QueryResult extends QueryResultBase {
+    rows: any[];
+}
+
+export interface QueryArrayResult extends QueryResultBase {
+    rows: any[][];
+}
+
 export interface Notification {
     processId: number;
     channel: string;
diff --git a/types/pg/pg-tests.ts b/types/pg/pg-tests.ts
index 7f9fb04d69..f0defa0fb2 100644
--- a/types/pg/pg-tests.ts
+++ b/types/pg/pg-tests.ts
@@ -55,11 +55,13 @@ client.query(query, (err, res) => {
     console.error(err.stack);
   } else {
     console.log(res.rows);
+    console.log(res.fields.map(f => f.name));
   }
 });
 client.query(query)
   .then(res => {
     console.log(res.rows);
+    console.log(res.fields.map(f => f.name));
   })
   .catch(e => {
     console.error(e.stack);

From 993265faef949dadedb12a4cce7e0b39197b44e7 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Thu, 1 Mar 2018 14:21:25 -0800
Subject: [PATCH 376/388] Correct 'recluster' to a CJS 'export ='-style
 declaration.

---
 types/recluster/index.d.ts         | 73 ++++++++++++++++--------------
 types/recluster/recluster-tests.ts |  4 +-
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/types/recluster/index.d.ts b/types/recluster/index.d.ts
index 71d198b8f5..598aeed645 100644
--- a/types/recluster/index.d.ts
+++ b/types/recluster/index.d.ts
@@ -7,40 +7,43 @@
 
 import { ChildProcess } from "child_process";
 
-export interface LogOptions {
-  respawns?: boolean;
+declare namespace recluster {
+  export interface LogOptions {
+    respawns?: boolean;
+  }
+
+  export interface Logger {
+    log(message?: any, ...optionalParams: any[]): void;
+  }
+
+  export interface BalancerOptions {
+    /** number of active workers */
+    workers?: number;
+    /** kill timeout for old workers after reload (sec) */
+    timeout?: number;
+    /** min time between respawns when workers die */
+    respawn?: number;
+    /** max time between respawns when workers die */
+    backoff?: number;
+    /** when does the worker become ready? 'listening' or 'started' */
+    readyWhen?: string;
+    /** arguments to pass to the worker (default: []) */
+    args?: string[];
+    /** what to log to stdout (default: {respawns: true}) */
+    log?: LogOptions;
+    /** logger to use, needs `log` method (default: console) */
+    logger?: Logger;
+  }
+
+  export class Balancer {
+    constructor(file: string, options: BalancerOptions);
+    run(): void;
+    reload(cb?: () => void): void;
+    stop(): void;
+    workers(): ChildProcess[];
+    activeWorkers(): ChildProcess[];
+  }
 }
 
-export interface Logger {
-  log(message?: any, ...optionalParams: any[]): void;
-}
-
-export interface BalancerOptions {
-  /** number of active workers */
-  workers?: number;
-  /** kill timeout for old workers after reload (sec) */
-  timeout?: number;
-  /** min time between respawns when workers die */
-  respawn?: number;
-  /** max time between respawns when workers die */
-  backoff?: number;
-  /** when does the worker become ready? 'listening' or 'started' */
-  readyWhen?: string;
-  /** arguments to pass to the worker (default: []) */
-  args?: string[];
-  /** what to log to stdout (default: {respawns: true}) */
-  log?: LogOptions;
-  /** logger to use, needs `log` method (default: console) */
-  logger?: Logger;
-}
-
-export class Balancer {
-  constructor(file: string, options: BalancerOptions);
-  run(): void;
-  reload(cb?: () => void): void;
-  stop(): void;
-  workers(): ChildProcess[];
-  activeWorkers(): ChildProcess[];
-}
-
-export default function recluster(file: string, options?: BalancerOptions): Balancer;
+declare function recluster(file: string, options?: recluster.BalancerOptions): recluster.Balancer;
+export = recluster;
diff --git a/types/recluster/recluster-tests.ts b/types/recluster/recluster-tests.ts
index b2641f03ff..62c5f153cd 100644
--- a/types/recluster/recluster-tests.ts
+++ b/types/recluster/recluster-tests.ts
@@ -1,5 +1,5 @@
-import recluster from "recluster";
-import path = require("path");
+import recluster = require('recluster');
+import path = require('path');
 
 const cluster = recluster(path.join(__dirname, 'server.js'));
 cluster.run();

From 41b75d423cd0d1bf3b2c025182846c17cf3e7eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vilim=20Stubi=C4=8Dan?= <vilim.stubican@degordian.com>
Date: Thu, 1 Mar 2018 23:29:57 +0100
Subject: [PATCH 377/388] Configurable type definitions (#24008)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Configurable type definitionsπ

* Updated tests

* Added tests for errorsπ

* Updated project link

* Changed definitions to the proposed structure
---
 types/configurable/configurable-tests.ts | 50 ++++++++++++++++++++++++
 types/configurable/index.d.ts            | 27 +++++++++++++
 types/configurable/tsconfig.json         | 23 +++++++++++
 types/configurable/tslint.json           |  1 +
 4 files changed, 101 insertions(+)
 create mode 100644 types/configurable/configurable-tests.ts
 create mode 100644 types/configurable/index.d.ts
 create mode 100644 types/configurable/tsconfig.json
 create mode 100644 types/configurable/tslint.json

diff --git a/types/configurable/configurable-tests.ts b/types/configurable/configurable-tests.ts
new file mode 100644
index 0000000000..c718e53395
--- /dev/null
+++ b/types/configurable/configurable-tests.ts
@@ -0,0 +1,50 @@
+import configurable = require('configurable');
+
+// Arrange
+class A {
+    something(): void {
+        // nothing
+    }
+}
+
+const obj = new A();
+const c = configurable(obj);
+
+// $ExpectType A & Configurable<A>
+c.set('first', 'first as a string');
+
+// $ExpectType any
+c.get('first');
+
+// $ExpectType A & Configurable<A>
+c.enable('first');
+
+// $ExpectType boolean
+c.enabled('first');
+
+// $ExpectType A & Configurable<A>
+c.disable('first');
+
+// $ExpectType boolean
+c.disabled('first');
+
+// $ExpectError
+c.set(5, 'first as a string');
+
+// $ExpectError
+c.set('first');
+
+// $ExpectError
+c.get(5);
+
+// $ExpectError
+c.enable(5);
+
+// $ExpectError
+c.enabled(5);
+
+// $ExpectError
+c.disable(5);
+
+// $ExpectError
+c.disabled(5);
diff --git a/types/configurable/index.d.ts b/types/configurable/index.d.ts
new file mode 100644
index 0000000000..470993e21a
--- /dev/null
+++ b/types/configurable/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for configurable 0.0
+// Project: https://www.npmjs.com/package/configurable
+// Definitions by: Vilim Stubičan <https://github.com/jewbre>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+// Make any object configurable
+declare function configurable<T extends object>(obj: T): T & Configurable<T>;
+export = configurable;
+
+interface Configurable<T> {
+    settings: {
+        [key: string]: any;
+    };
+
+    set(name: string, val: any): T & Configurable<T>;
+
+    get(name: string): any;
+
+    enable(name: string): T & Configurable<T>;
+
+    disable(name: string): T & Configurable<T>;
+
+    enabled(name: string): boolean;
+
+    disabled(name: string): boolean;
+}
diff --git a/types/configurable/tsconfig.json b/types/configurable/tsconfig.json
new file mode 100644
index 0000000000..2448b794e0
--- /dev/null
+++ b/types/configurable/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",
+        "configurable-tests.ts"
+    ]
+}
diff --git a/types/configurable/tslint.json b/types/configurable/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/configurable/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2c1ed96a4aa7cd3d1c1a87e4e6a3a0d5c4a65f25 Mon Sep 17 00:00:00 2001
From: Luigi Baute <36426974+LuigiBaute@users.noreply.github.com>
Date: Thu, 1 Mar 2018 22:05:50 -0400
Subject: [PATCH 378/388] Update README.es.md

---
 README.es.md | 72 ++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/README.es.md b/README.es.md
index 2d2e7acc29..48322596b3 100644
--- a/README.es.md
+++ b/README.es.md
@@ -9,39 +9,39 @@ Vea también el sitio web [definitelytyped.org](http://definitelytyped.org), aun
 
 ## ¿Qué son los `declaration files`?
 
-vea el [Manual de TypeScript](http://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html).
+Vea el [Manual de TypeScript](http://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html).
 
 
 ## ¿Cómo los obtengo?
 
 ### npm
 
-Este es el método preferido. Solo está disponible para usuarios TypeScript 2.0+. Por Ejemplo:
+Este es el método preferido. Solo está disponible para usuarios TypeScript 2.0+. Por ejemplo:
 
 ```sh
 npm install --save-dev @types/node
 ```
 
-Los types deberían ser incluidos automáticamentes por el compilador.
+Los types deberían ser incluidos automaticamente por el compilador.
 Vea más en el [manual](http://www.typescriptlang.org/docs/handbook/declaration-files/consumption.html).
 
 Para un paquete NPM "foo", Estos `typings` estarán en "@types/foo".
 Si no puedes encontrar tu paquete, búscalo en [TypeSearch](https://microsoft.github.io/TypeSearch/).
 
-Si aún no puedes encontrarlo, comprueba si el type ha sido [bundled](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) por su cuenta.
-Este provee usualmente un archivo `"types"` o `"typings"` en el `package.json`,
-o solo busca por cualquier archivo ".d.ts" en el paquete y manualmente puedes incluirlos con un `/// <reference path="" />`.
+Si aún no puedes encontrarlo, comprueba si el paquete ya [incluye](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) los typings.
+Esto es provisto usualmente en el campo `"types"` o `"typings"` en el `package.json`,
+o solo busca por cualquier archivo ".d.ts" en el paquete e incluyelo manualmente con un `/// <reference path="" />`.
 
 
-### Otros metodos
+### Otros métodos
 
 Estos pueden ser utilizados por TypeScript 1.0.
 
 * [Typings](https://github.com/typings/typings)
 * ~~[NuGet](http://nuget.org/packages?q=DefinitelyTyped)~~ (use las alternativas preferidas, la publicación DT type de nuget ha sido desactivada)
-* Descarguelo manualmente desde la branch de el `master` de este repositorio
+* Descarguelo manualmente desde la `master` branch de este repositorio
 
-Tal vez debas añadir manualmente [referencias](http://www.typescriptlang.org/docs/handbook/triple-slash-directives.html).
+Tal vez debas añadir manualmente las [referencias](http://www.typescriptlang.org/docs/handbook/triple-slash-directives.html).
 
 
 ## ¿Cómo puedo contribuir?
@@ -52,10 +52,10 @@ Tal vez debas añadir manualmente [referencias](http://www.typescriptlang.org/do
 
 Antes de compartir tu mejora con el mundo, úselo usted mismo.
 
-#### Prueba de edición de un paquete existente
+#### Prueba editando un paquete existente
 
 Para agregar nuevas funciones puedes usar el [module augmentation](http://www.typescriptlang.org/docs/handbook/declaration-merging.html).
-También puedes editar directamente los types en `node_modules/@types/foo/index.d.ts`, o copiarlos de ahi y seguir los pasos explicados a continuación.
+También puedes editar directamente los types en `node_modules/@types/foo/index.d.ts`, o copiarlos de ahí y seguir los pasos explicados a continuación.
 
 
 #### Prueba un nuevo paquete
@@ -70,9 +70,9 @@ Añade a tu `tsconfig.json`:
 (También puedes usar `src/types`.)
 Crea un `types/foo/index.d.ts` que contenga declaraciones del módulo "foo".
 Ahora deberías poder importar desde `"foo"` a tu código y te enviara a un nuevo tipo de definición.
-Entonces crea *y* ejecuta el código para asegurarte que el tipo de definición en realidad corresponde a lo que suceda en el momento de la ejecución.
+Entonces compila *y* ejecuta el código para asegurarte que el tipo de definición en realidad corresponde a lo que suceda en el momento de la ejecución.
 Una vez que hayas probado tus definiciones con el código real, haz un [PR](#make-a-pull-request)
-luego sigue las intrucciones para [editar un paquete existente](#edit-an-existing-package) o
+luego sigue las instrucciones para [editar un paquete existente](#edit-an-existing-package) o
 [crear un nuevo paquete](#create-a-new-package).
 
 
@@ -87,17 +87,17 @@ Primero, haz un [fork](https://guides.github.com/activities/forking/) en este re
 
 * `cd types/my-package-to-edit`
 * Haz cambios. Recuerda editar las pruebas.
-* También puede que quieras añadirle la sección "Definitions by" en el encabezado del paquete.
-  - Esto hará que seas notificado (Através de tu nombre de usuario en GitHub) cada vez que alguien haga un pull request o issue sobre el paquete.
-  - Haz esto añadiendo tu nombre al final de la línea, asi como en `// Definitions by: Alice <https://github.com/alice>, Bob <https://github.com/bob>`.
-  - Y si hay más personas, puede ser multiline
+* También puede que quieras añadirte la sección "Definitions by" en el encabezado del paquete.
+  - Esto hará que seas notificado (a través de tu nombre de usuario en GitHub) cada vez que alguien haga un pull request o issue sobre el paquete.
+  - Haz esto añadiendo tu nombre al final de la línea, así como en `// Definitions by: Alice <https://github.com/alice>, Bob <https://github.com/bob>`.
+  - O si hay más personas, puede ser multiline
   ```typescript
   // Definitions by: Alice <https://github.com/alice>
   //                 Bob <https://github.com/bob>
   //                 Steve <https://github.com/steve>
   //                 John <https://github.com/john>
   ```
-* Si hay un `tslint.json`, ejecuta `npm run lint package-name`. Otra manera seria, ejecutando `tsc` en el paquete del directorio.
+* Si hay un `tslint.json`, ejecuta `npm run lint package-name`. De lo contrario, ejecuta `tsc` en el directorio del paquete.
 
 Cuando hagas un PR para editar un paquete existente, `dt-bot` deberá @-mencionar a los autores previos.
 Si no lo hace, puedes hacerlo en el comentario asociado con el PR.
@@ -105,17 +105,17 @@ Si no lo hace, puedes hacerlo en el comentario asociado con el PR.
 
 #### Crear un nuevo paquete
 
-Si eres el autor de la biblioteca, o puedes hacer un pull request a la biblioteca, [bundle types](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) En vez de publicarlo en DefinitelyTyped.
+Si eres el autor de la librería, o puedes hacer un pull request a la biblioteca, [bundle types](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) en vez de publicarlo en DefinitelyTyped.
 
 Si estás agregando typings para un paquete NPM, crea un directorio con el mismo nombre.
-Si el paquete al que le estás agregando escritura no es para NPM, asegurate de que el nombre que escojas no genere problemas con el nombre del paquete en NPM.
+Si el paquete al que le estás agregando typings no es para NPM, asegurate de que el nombre que escojas no genere problemas con el nombre del paquete en NPM.
 (Puedes usar `npm info foo` para verificar la existencia del paquete `foo`.)
 
 Tu paquete debería tener esta estructura:
 
-| File | Purpose |
+| Archivo | Propósito |
 | --- | --- |
-| index.d.ts | Este contiene la escritura del paquete. |
+| index.d.ts | Este contiene los typings del paquete. |
 | foo-tests.ts | Este contiene una muestra del código con el que se realiza la prueba de escritura. Este código *no* es ejecutable, pero sí es type-checked. |
 | tsconfig.json | Este permite ejecutar `tsc` dentro del paquete. |
 | tslint.json | Permite linting. |
@@ -123,9 +123,9 @@ Tu paquete debería tener esta estructura:
 Generalas ejecutando `npm install -g dts-gen` y `dts-gen --dt --name my-package-name --template module`.
 Ve todas las opciones en [dts-gen](https://github.com/Microsoft/dts-gen).
 
-También puedes configurar la `tsconfig.json` para añadir nuevos archivos, para agregar un `"target": "es6"` (necesita la función asincrónica), para agregar a la `"lib"`, o para agregar la opción de compilación `"jsx"`.
+También puedes configurar el `tsconfig.json` para añadir nuevos archivos, para agregar un `"target": "es6"` (necesitado por las funciones asíncronas), para agregar a la `"lib"`, o para agregar la opción de compilación `"jsx"`.
 
-Los miembros de DefinitelyTyped están en busqueda frecuente de nuevos PRs, Pero ten en mente que mientras hayan más PRs de otros podrían alentizar el proceso.
+Los miembros de DefinitelyTyped frecuentemente monitorean nuevos PRs, pero ten en mente que la cantidad de PRs podrian ralentizar el proceso.
 
 Para un buen paquete de ejemplo, vea [base64-js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/base64-js).
 
@@ -133,35 +133,35 @@ Para un buen paquete de ejemplo, vea [base64-js](https://github.com/DefinitelyTy
 #### Errores comunes
 
 * Primero, sigue el consejo del [manual](http://www.typescriptlang.org/docs/handbook/declaration-files/do-s-and-don-ts.html).
-* Formatear: Ya sea utilizar todas las pestañas, o siempre utiliza 4 espacios.
-* `function sum(nums: number[]): number`: Utiliza `ReadonlyArray` si una funcion no se apega a sus parámetros.
+* Formatear: Ya sea utilizar todo en tabs, o siempre utiliza 4 espacios.
+* `function sum(nums: number[]): number`: Utiliza `ReadonlyArray` si una funcion no escribe a sus parámetros.
 * `interface Foo { new(): Foo; }`:
     Este define el tipo de objeto que esten nuevos. Probablemente quieras `declare class Foo { constructor(); }`.
 * `const Class: { new(): IClass; }`:
     Prefiere usar una declaración de clase `class Class { constructor(); }` En vez de una nueva constante.
 * `getMeAT<T>(): T`:
-    Si un tipo de parámetro no aparece en los tipos de ningún parámetro, No tienes una función generica,solo tienes una afirmación de tipo disfrazada.
+    Si un tipo de parámetro no aparece en los tipos de ningún parámetro, no tienes una función genérica, solo tienes un afirmación del tipo disfrazado.
      Prefiera utilizar una afirmación de tipo real, p.ej. `getMeAT() as number`.
     Un ejemplo donde un tipo de parámetro es aceptable: `function id<T>(value: T): T;`.
     Un ejemplo donde no es aceptable: `function parseJson<T>(json: string): T;`.
     Una excepción: `new Map<string, number>()` está bien.
-* Utilizando los types `Function` y `Object` casi nunca es una buena idea. En 99% de los casos es posible especificar un tipo más especifico. Los ejemplos son `(x: number) => number` for [functions](http://www.typescriptlang.org/docs/handbook/functions.html#function-types) and `{ x: number, y: number }` for objects. If there is no certainty at all about the type, [`any`](http://www.typescriptlang.org/docs/handbook/basic-types.html#any) is the right choice, not `Object`. If the only known fact about the type is that it's some object, use the type [`object`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-2.html#object-type), not `Object` or `{ [key: string]: any }`.
+* Utilizando los tipos `Function` y `Object` casi nunca es una buena idea. En 99% de los casos es posible especificar un tipo más especifico. Los ejemplos son `(x: number) => number` para [funciones](http://www.typescriptlang.org/docs/handbook/functions.html#function-types) y `{ x: number, y: number }` para objetos. Si no hay certeza en lo absoluto del tipo, [`any`](http://www.typescriptlang.org/docs/handbook/basic-types.html#any) es la opción correcta, no `Object`. Si el único hecho conocido sobre el tipo es que es un objecto, usa el tipo [`object`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-2.html#object-type), no `Object` o `{ [key: string]: any }`.
 * `var foo: string | any`:
-    Cuando es usado `any` En un tipo de unión, El tipo resultante todavía es `any`. Así que mientras la porción `string` de este tipo de anotación puede _verse_ útil, de hecho, no ofrece ningún typechecking adicional más que un simple `any`.
+    Cuando es usado `any` en un tipo de unión, el tipo resultante todavía es `any`. Así que mientras la porción `string` de este tipo de anotación puede _verse_ útil, de hecho, no ofrece ningún typechecking adicional más que un simple `any`.
     Dependiendo de la intención, una alternativa aceptable puede ser `any`, `string`, o `string | object`.
 
 
 #### Remover un paquete
 
-Cuando un paquete [bundles](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) sus propios tipos, Estos tipos deberán ser removidos de DefinitelyTyped para evitar que generen confusión.
+Cuando un paquete [bundles](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) sus propios tipos, estos tipos deberán ser removidos de DefinitelyTyped para evitar que generen confusión.
 
 Se puede remover ejecutando `npm run not-needed -- typingsPackageName asOfVersion sourceRepoURL [libraryName]`.
 - `typingsPackageName`: Este es el nombre del directorio que tienes que eliminar.
-- `asOfVersion`: Un stub será publicado a `@types/foo` con esta versión. Debería ser mas grande que cualquier versión publicada actualmente.
+- `asOfVersion`: Un stub será publicado a `@types/foo` con esta versión. Debería ser más grande que cualquier versión publicada actualmente.
 - `sourceRepoURL`: Esto debería señalar el repositorio que contiene los typings.
-- `libraryName`: Un nombre descriptivo de la biblioteca, p.ej. "Angular 2" en vez de "angular2". (Si es omitido, será identico a "typingsPackageName".)
+- `libraryName`: Un nombre descriptivo de la librería, p.ej. "Angular 2" en vez de "angular2". (Si es omitido, será idéntico a "typingsPackageName".)
 
-Cualquier otro paquete en DefinitelyTyped que referencia el paquete eliminado deberá ser actualizado para referenciar los tipos de bundled. para hacer esto, añade `package.json` con `"dependencies": { "foo": "x.y.z" }`.
+Cualquier otro paquete en DefinitelyTyped que referencie el paquete eliminado deberá ser actualizado para referenciar los tipos bundled. para hacer esto, añade `package.json` con `"dependencies": { "foo": "x.y.z" }`.
 
 Si un paquete nunca estuvo en DefinitelyTyped, no será necesario añadirlo a `notNeededPackages.json`.
 
@@ -169,7 +169,7 @@ Si un paquete nunca estuvo en DefinitelyTyped, no será necesario añadirlo a `n
 #### Lint
 
 Para realizar el lint a un paquete, solo añade `tslint.json` al paquete que contiene `{ "extends": "dtslint/dt.json" }`. Todos los paquetes nuevos deberán pasar por el proceso de linted.
-Si el `tslint.json` no sigue las reglas, esto se debe a que aún no se ha acomodado. por ejemplo:
+Si el `tslint.json` deshabilita algunas reglas esto se debe a que aún no se ha acomodado. Por ejemplo:
 
 ```js
 {
@@ -181,7 +181,7 @@ Si el `tslint.json` no sigue las reglas, esto se debe a que aún no se ha acomod
 }
 ```
 
-(Para indicar que la regla lint no siempre será aplicada, utiliza `// tslint:disable rule-name` o mejor, `//tslint:disable-next-line rule-name`.)
+(Para indicar que la regla lint realmente no es utilizada, usa `// tslint:disable rule-name` o mejor, `//tslint:disable-next-line rule-name`.)
 
 Para afirmar que una expresión es de un tipo dado, utilice `$ExpectType`. Para afirmar que una expresión causa un error de compilación, utilice `$ExpectError`.
 
@@ -195,6 +195,6 @@ f("one");
 
 Para más detalles, vea el [dtslint](https://github.com/Microsoft/dtslint#write-tests) readme.
 
-Realiza una prueba ejecutando `npm run lint package-name` donde  está el nombre de tu paquete `package-name`.
+Realiza una prueba ejecutando `npm run lint package-name` donde `package-name` es el nombre de tu paquete.
 Este script utiliza [dtslint](https://github.com/Microsoft/dtslint).
 

From 325b61e5461ff3ec690bba02f6197b2c631659e2 Mon Sep 17 00:00:00 2001
From: Luigi Baute <36426974+LuigiBaute@users.noreply.github.com>
Date: Thu, 1 Mar 2018 23:39:46 -0400
Subject: [PATCH 379/388] Create README2.es.md

---
 README2.es.md | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 README2.es.md

diff --git a/README2.es.md b/README2.es.md
new file mode 100644
index 0000000000..9189d5ea2a
--- /dev/null
+++ b/README2.es.md
@@ -0,0 +1,135 @@
+## FAQ
+
+#### ¿Cuál es exactamente la relación entre este repositorio y los paquetes de `@types` en NPM?
+
+La `master` branch es automaticamente publicada en el alcance de los  `@types` en NPM gracias a los [types-publisher](https://github.com/Microsoft/types-publisher).
+
+#### He enviado un pull request. ¿Cuánto tardará en ser merged?
+
+Esto depende, pero la mayoría de los pull requests serán merged en alrededor de una semana. PRs que hayan sido aprovados por un autor listado en el encabezado de las definiciones usualmente son merged más rápidamente; PRs para nuevas definiciones tomarán más tiempo ya que requieren más revisiones de los mantenedores. Cada PR es revisado por un miembro de TypeScript o DefinitelyTyped antes de ser merged, por favor se paciente debido a que factores humanos pueden causar retrasos. Revisa el [PR Burndown Board](https://github.com/DefinitelyTyped/DefinitelyTyped/projects/3?card_filter_query=is%3Aopen) para ver el progreso mientras los mantenedores trabajan on los PRs abiertos.
+
+#### Mi PR ha sido merged; ¿cuándo será actualizado el paquete de `@types` NPM?
+
+Los paquetes NPM deberán ser actualizados en unas cuantas horas. Si ha pasado más de 24 horas, menciona a @RyanCavanaugh y/o a @andy-ms en el PR para investigar.
+
+#### Estoy escribiendo una definición que depende de otra definición. Debería utilizar `<reference types="" />` o una import?
+
+Si el modulo al cual te estás refiriendo es un módulo externo (utiliza `export`), utilice una import.
+Si el módulo al cual te refieres es un módulo ambiente (utiliza `declare module`, o simplemente declara las globales), utilice `<reference types="" />`.
+
+#### He notado que algunos paquetes aquí tienen `package.json`.
+
+Normalmente no lo necesitaras. Cuando publicas un paquete normalmente nosotros automáticamente crearemos un `package.json` para eso.
+Un `package.json` puede ser incluido por el bien de especificar dependencias. Aquí tienen un [ejemplo](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/pikaday/package.json).
+No aceptamos otros campos, tales como `"description"`, para que sean definidos manualmente.
+Además, si necesitas referencia a una versión anterior de typings, debes hacerlo añadiendo `"dependencies": { "@types/foo": "x.y.z" }` al package.json.
+
+#### Algunos paquetes no tienen `tslint.json`, y algunos `tsconfig.json` no contienen `"noImplicitAny": true`, `"noImplicitThis": true`, o `"strictNullChecks": true`.
+
+Entonces están equivocados. Puedes ayudar enviando un pull request para arreglarlos.
+
+#### Puedo pedir una definition?
+
+Aquí están las [definiciones solicitadas actualmente](https://github.com/DefinitelyTyped/DefinitelyTyped/labels/Definition%3ARequest).
+
+#### ¿Qué pasa con las type definitions para el DOM?
+
+Si las types son parte de los estándares web, estas deberán ser contribuidas a [TSJS-lib-generator](https://github.com/Microsoft/TSJS-lib-generator) para que se hagan parte de la librería predeterminada  `lib.dom.d.ts`.
+
+#### Un paquete utiliza `export =`, pero prefiero utilizar las import predeterminadas. ¿Puedo cambiar `export =` por `export default`?
+
+Si la import predeterminada trabaja en tu ambiente, considera hacer un cambio en la opción de compilación [`--allowSyntheticDefaultImports`](http://www.typescriptlang.org/docs/handbook/compiler-options.html) opción compilar.
+No cambies la type definition si es preciso.
+Para un paquete NPM, `export =` es exacto si `node -p 'require("foo")'` es la export, y `export default` es exacto si `node -p 'require("foo").default'` es el export.
+
+#### Quiero usar las características de TypeScript 2.1 o superior.
+
+Entonces deberás añadir un comentario a la última línea de la definición en el encabezado (despues de `// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`): `// TypeScript Version: 2.1`.
+
+#### Quiero añadir un DOM API que no está presente en TypeScript por defecto.
+
+Esto puede pertenecer a [TSJS-Lib-Generator](https://github.com/Microsoft/TSJS-lib-generator#readme). Vea las guías allí.
+Si el estándar sigue siendo un borrador, este pertenece aquí.
+Utilice un nombre que empiece con `dom-` e incluya un link al estándar como el "Project" con el link en el encabezado.
+Cuando ya no sea un borrador, lo podremos eliminar desde DefinitelyType y hacer obsoleto el paquete `@types` asociado.
+
+#### Quiero actualizar un paquete a una nueva versión principal
+
+Si planeas continuar actualizando la versión anterior del paquete, puedes crear una subcarpeta con la versión actual p.ej. `v2`, y copia los archivos existentes. Si es así, necesitarás:
+
+1. Actualiza las rutas relativas en `tsconfig.json` al igual que `tslint.json`.
+2. Añadir reglas de mapeo de rutas para asegurart de que la prueba se está ejecutando contra la versión prevista.
+
+Por ejemplo [history v2 `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/history/v2/tsconfig.json) se ve así:
+
+```json
+{
+    "compilerOptions": {
+        "baseUrl": "../../",
+        "typeRoots": ["../../"],
+        "paths": {
+            "history": [ "history/v2" ]
+        },
+    },
+    "files": [
+        "index.d.ts",
+        "history-tests.ts"
+    ]
+}
+```
+
+Si hay otros paquetes en DefinitelyTyped que son incompatibles con la nueva versión, necesitaras mapear las rutas a la versión anterior. También deberá hacer esto para los paquetes que dependen de paquetes que dependen de una version anterior.
+
+Por ejemplo, `react-router` depende de `history@2`, así que [react-router `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router/tsconfig.json) tiene una ruta mapeada a "history": `[ "history/v2" ]`;
+transitivo así mismo, `react-router-bootstrap` (que depende de `react-router`) también añade una ruta mapeada en su [tsconfig.json](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router-bootstrap/tsconfig.json).
+
+Además, `/// <reference types=".." />` no trabajara con rutas mapeadas, así que las dependencias deberán utilizar `import`.
+
+#### ¿Cómo escribo definitions para paquetes que pueden ser usados globalmente y como un módulo?
+
+El manual de TypeScript contiene excelente [información general para escribir definiciones](https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html), ademas [este archivo de definiciones de ejemplo](https://www.typescriptlang.org/docs/handbook/declaration-files/templates/global-modifying-module-d-ts.html)  el cual muestra como crear una definición utilizando la sintaxis de módulo en ES6, asi como también especificando objetos que son disponibles en el alcance global. Esta técnica es demostrada practicamente en la [definición para big.js](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/big.js/index.d.ts), el cual es una librería que puede ser cargada globalmente a travéz de una etiqueta script en una página web, o importada via require o imports estilo ES6.
+
+Para probar como puede ser usada tu definición cuando se refieren globalmente o como un módulo importado, crea una carpeta `test`, y coloca dos archivos de prueba en él.  nombra uno `YourLibraryName-global.test.ts` y el otro `YourLibraryName-module.test.ts`.  El archivo de prueba _global_ debe ejercer la definición de acuerdo como va a ser usado en un script cargado en una página web donde la librería estará disponible en el alcance global - en este escenario no debes de especificar la sentencia de import. El archivo _módulo_ de prueba debe de ejercer la definición de acuerdo a como va a ser utilizado cuando sea importado (incluyendo las sentencias `import`). Si especificas un propiedad `files` en tu archivo tsconfig.json, asegurate de incluir ambos archivos de prueba. Un [ejemplo práctico de esto](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/big.js/test) es también disponible en la definición de big.js.
+
+Por favor tenga en cuenta que no es necesario para ejercer plenamente la definición en cada archivo de prueba - Es suficiente con probar solo los elementos globalmente accesibles en la prueba de archivos globales y ejercer la definición en el módulo del archivo de prueba, o viceversa.
+
+#### ¿Qué pasa con paquetes scoped?
+
+Types para un paquete scoped `@foo/bar` deberán ir en `types/foo__bar`. tenga en cuenta el doble guion bajo.
+
+Cuando `dts-gen` es utilizado como scaffold en un paquete scoped, las propiedades `paths` deberán ser adaptadas manualmente en el paquete generado
+`tsconfig.json` para referenciar correctamente el paquete scoped:
+
+```json
+{
+    "paths":{
+      "@foo/bar": ["foo__bar"]
+    }
+}
+```
+
+
+#### El historial de archivos en GitHub parece incompleto.
+
+GitHub no le hace [support](http://stackoverflow.com/questions/5646174/how-to-make-github-follow-directory-history-after-renames) historial de archivos para archivos renombrados. Utilice [`git log --follow`](https://www.git-scm.com/docs/git-log) en su lugar.
+
+#### Debería añadir un namespace que no exporte un módulo que utilice que utilice imports estilo ES6?
+
+Algunos paquetes, como [chai-http](https://github.com/chaijs/chai-http), exportan una función.
+
+importar este módulo con un ES6 style import de forma `import * as foo from "foo";` conduce al error:
+
+> error ts2497: El módulo 'foo' se resuelve en una entidad que no es un módulo y no se puede importar mediante esta construcción
+
+Este error puede ser suprimido al unir la declaración de una función con un namespace vacío del mismo nombre pero esta práctica no es recomendable.
+Esto es un citado común [Respuestas de Stack Overflow](https://stackoverflow.com/questions/39415661/what-does-resolves-to-a-non-module-entity-and-cannot-be-imported-using-this) con respecto a este asunto.
+
+Es más apropiado importar este módulo utilizando la sintaxis `import foo = require("foo");`, o utilizando una importación predeterminada como `import foo from "foo";` si usas la bandera `--allowSyntheticDefaultImports` si la ejecución de tu módulo soporta un esquema de interoperación para módulos no ECMAScript como tal.
+
+## Licencia
+
+Este proyecto es licenciado bajo la licencia MIT.
+
+Los derechos de autor de cada archivo de definición son respectivos de cada contribuidor listado al comienzo de cada archivo de definición.
+
+[![Analytics](https://ga-beacon.appspot.com/UA-47495295-4/borisyankov/DefinitelyTyped)](https://github.com/igrigorik/ga-beacon)

From 6f2d2f068ea5ba1815e379713ef60ac8175b3f95 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Fri, 2 Mar 2018 00:17:04 -0800
Subject: [PATCH 380/388] Ragga fragga export keywords.

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

diff --git a/types/recluster/index.d.ts b/types/recluster/index.d.ts
index 598aeed645..5333b02581 100644
--- a/types/recluster/index.d.ts
+++ b/types/recluster/index.d.ts
@@ -8,15 +8,15 @@
 import { ChildProcess } from "child_process";
 
 declare namespace recluster {
-  export interface LogOptions {
+  interface LogOptions {
     respawns?: boolean;
   }
 
-  export interface Logger {
+  interface Logger {
     log(message?: any, ...optionalParams: any[]): void;
   }
 
-  export interface BalancerOptions {
+  interface BalancerOptions {
     /** number of active workers */
     workers?: number;
     /** kill timeout for old workers after reload (sec) */
@@ -35,7 +35,7 @@ declare namespace recluster {
     logger?: Logger;
   }
 
-  export class Balancer {
+  class Balancer {
     constructor(file: string, options: BalancerOptions);
     run(): void;
     reload(cb?: () => void): void;

From da682e777764be011399f247742ec65597e35251 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Fri, 2 Mar 2018 00:23:27 -0800
Subject: [PATCH 381/388] Remove optionality in parameter.

https://github.com/Automattic/mongoose/blob/349b267629ba823e3d5064a4013a0e14513f45ab/lib/model.js#L2803-L2805
---
 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 122de69b7f..d8f6efaf09 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -2436,7 +2436,7 @@ declare module "mongoose" {
      * @param aggregations pipeline operator(s) or operator array
      */
     aggregate(aggregations?: any[]): Aggregate<any[]>;
-    aggregate(aggregations: any[], cb?: Function): Promise<any[]>;
+    aggregate(aggregations: any[], cb: Function): Promise<any[]>;
 
     /** Counts number of matching documents in a database collection. */
     count(conditions: any, callback?: (err: any, count: number) => void): Query<number>;

From 5be659e9e5786ef9f16bb2ac0636abc3eae35c64 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Fri, 2 Mar 2018 00:28:46 -0800
Subject: [PATCH 382/388] Link to Spanish README

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

diff --git a/README.md b/README.md
index c50d026338..cc59284394 100644
--- a/README.md
+++ b/README.md
@@ -6,12 +6,12 @@
 
 Also see the [definitelytyped.org](http://definitelytyped.org) website, although information in this README is more up-to-date.
 
+*[You can also read this README in Spanish!](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/README.es.md)*
 
 ## What are declaration files?
 
 See the [TypeScript handbook](http://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html).
 
-
 ## How do I get them?
 
 ### npm

From f9519b0e2e23a21f7ca12de16498ed57b4db034b Mon Sep 17 00:00:00 2001
From: PINGUET Julien <pinguet62@gmail.com>
Date: Fri, 2 Mar 2018 09:47:05 +0100
Subject: [PATCH 383/388] Fix review

---
 types/mongorito/index.d.ts | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/types/mongorito/index.d.ts b/types/mongorito/index.d.ts
index 3e54ce0791..2c69c14fd0 100644
--- a/types/mongorito/index.d.ts
+++ b/types/mongorito/index.d.ts
@@ -127,90 +127,90 @@ export enum ActionTypes {
 }
 
 export interface GetAction {
-    type: string; // ActionTypes.GET
+    type: ActionTypes.GET;
     key?: string;
 }
 
 export interface SetAction {
-    type: string; // ActionTypes.SET
+    type: ActionTypes.SET;
     fields: object;
 }
 
 export interface UnsetAction {
-    type: string; // ActionTypes.UNSET
+    type: ActionTypes.UNSET;
     keys: string | string[];
 }
 
 export interface RefreshAction {
-    type: string; // ActionTypes.REFRESH
+    type: ActionTypes.REFRESH;
 }
 
 export interface RefreshedAction {
-    type: string; // ActionTypes.REFRESHED
+    type: ActionTypes.REFRESHED;
     fields: object;
 }
 
 export interface SaveAction {
-    type: string; // ActionTypes.SAVE
+    type: ActionTypes.SAVE;
     fields: object;
 }
 
 export interface CreateAction {
-    type: string; // ActionTypes.CREATE
+    type: ActionTypes.CREATE;
     id: object;
 }
 
 export interface CreatedAction {
-    type: string; // ActionTypes.CREATED
+    type: ActionTypes.CREATED;
     id: object;
 }
 
 export interface UpdateAction {
-    type: string; // ActionTypes.UPDATE
+    type: ActionTypes.UPDATE;
     fields: object;
 }
 
 export interface UpdatedAction {
-    type: string; // ActionTypes.UPDATED
+    type: ActionTypes.UPDATED;
     fields: object;
 }
 
 export interface RemoveAction {
-    type: string; // ActionTypes.REMOVE
+    type: ActionTypes.REMOVE;
 }
 
 export interface RemovedAction {
-    type: string; // ActionTypes.REMOVED
+    type: ActionTypes.REMOVED;
 }
 
 export interface IncrementAction {
-    type: string; // ActionTypes.INCREMENT
+    type: ActionTypes.INCREMENT;
     fields: object;
 }
 
 export interface CreateIndexAction {
-    type: string; // ActionTypes.CREATE_INDEX
+    type: ActionTypes.CREATE_INDEX;
     args: any[];
 }
 
 export interface DropIndexAction {
-    type: string; // ActionTypes.DROP_INDEX
+    type: ActionTypes.DROP_INDEX;
     args: any[];
 }
 
 export interface ListIndexesAction {
-    type: string; // ActionTypes.LIST_INDEXES
+    type: ActionTypes.LIST_INDEXES;
     args: any[];
 }
 
 export interface QueryAction {
-    type: string; // ActionTypes.QUERY
+    type: ActionTypes.QUERY;
     method: string;
     query: Array<{ method: string, args: any }>;
 }
 
 export interface CallAction {
-    type: string; // ActionTypes.CALL
+    type: ActionTypes.CALL;
     method: string;
     args: Array<{ method: string, args: any }>;
 }

From 1e82b25e3e44e752368b43c33549f899d037aba5 Mon Sep 17 00:00:00 2001
From: Ben Wildeman <wildeman.benjamin@gmail.com>
Date: Fri, 2 Mar 2018 10:20:28 +0000
Subject: [PATCH 384/388] [react-native] updated viewOffset on FlatList to be
 optional

although the react-native docs says that viewOffset is required, the flow types of the flatlist, and the code for the flatlist shows that this is actually optional and defaults to 0 when not used.
---
 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 1faa31da8f..01b7651dec 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3652,7 +3652,7 @@ export interface FlatListStatic<ItemT> extends React.ComponentClass<FlatListProp
      * such that viewPosition 0 places it at the top, 1 at the bottom, and 0.5 centered in the middle.
      * Cannot scroll to locations outside the render window without specifying the getItemLayout prop.
      */
-    scrollToIndex: (params: { animated?: boolean; index: number; viewOffset: number; viewPosition?: number }) => void;
+    scrollToIndex: (params: { animated?: boolean; index: number; viewOffset?: number; viewPosition?: number }) => void;
 
     /**
      * Requires linear scan through data - use `scrollToIndex` instead if possible.

From 4e63ce585a171236ecacc9915b202835874b504f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 2 Mar 2018 11:41:39 +0100
Subject: [PATCH 385/388] [clipboard] Update to version 2 (Clipboard =>
 Clipboard JS renaming)

Changelog: https://github.com/zenorocha/clipboard.js/releases/tag/v2.0.0
---
 types/clipboard/clipboard-tests.ts | 14 +++++++-------
 types/clipboard/index.d.ts         | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/types/clipboard/clipboard-tests.ts b/types/clipboard/clipboard-tests.ts
index e92bbf30ba..a2ae8f9354 100644
--- a/types/clipboard/clipboard-tests.ts
+++ b/types/clipboard/clipboard-tests.ts
@@ -1,22 +1,22 @@
-import * as Clipboard from "clipboard";
+import * as ClipboardJS from "clipboard";
 
-const cb1 = new Clipboard(".btn");
-const cb2 = new Clipboard(document.getElementById("id"), {
+const cb1 = new ClipboardJS(".btn");
+const cb2 = new ClipboardJS(document.getElementById("id"), {
     action: elem => "copy"
 });
-const cb3 = new Clipboard(document.querySelectorAll("query"), {
+const cb3 = new ClipboardJS(document.querySelectorAll("query"), {
     text: elem => null
 });
-const cb4 = new Clipboard(".btn", {
+const cb4 = new ClipboardJS(".btn", {
     target: elem => null
 });
-const cb5 = new Clipboard(".btn", {
+const cb5 = new ClipboardJS(".btn", {
     action: elem => "copy",
     target: elem => null
 });
 
 cb1.destroy();
-Clipboard.isSupported();
+ClipboardJS.isSupported();
 
 cb2.on("success", e => {
     console.info("Action:", e.action);
diff --git a/types/clipboard/index.d.ts b/types/clipboard/index.d.ts
index 61b27cbb32..2405c0c6f0 100644
--- a/types/clipboard/index.d.ts
+++ b/types/clipboard/index.d.ts
@@ -1,12 +1,12 @@
-// Type definitions for clipboard.js 1.5
+// Type definitions for clipboard.js 2.0
 // Project: https://github.com/zenorocha/clipboard.js
 // Definitions by: Andrei Kurosh <https://github.com/impworks>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare class Clipboard {
+declare class ClipboardJS {
     constructor(
         selector: string | Element | NodeListOf<Element>,
-        options?: Clipboard.Options
+        options?: ClipboardJS.Options
     );
 
     /**
@@ -14,7 +14,7 @@ declare class Clipboard {
      * @param type Event type ('success' or 'error').
      * @param handler Callback function.
      */
-    on(type: "success" | "error", handler: (e: Clipboard.Event) => void): this;
+    on(type: "success" | "error", handler: (e: ClipboardJS.Event) => void): this;
     on(type: string, handler: (...args: any[]) => void): this;
 
     /**
@@ -28,7 +28,7 @@ declare class Clipboard {
     static isSupported(): boolean;
 }
 
-declare namespace Clipboard {
+declare namespace ClipboardJS {
     interface Options {
         /**
          * Overwrites default command ('cut' or 'copy').
@@ -59,6 +59,6 @@ declare namespace Clipboard {
     }
 }
 
-export = Clipboard;
+export = ClipboardJS;
 
-export as namespace Clipboard;
+export as namespace ClipboardJS;

From 70f98cf873c3e1570542e19c876ae29cc8fd6dda Mon Sep 17 00:00:00 2001
From: Thomas Bruun <thomas.bruun@gmail.com>
Date: Fri, 2 Mar 2018 15:38:49 +0100
Subject: [PATCH 386/388] Fix incorrect definition for ITransfer createReversal

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

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 83fabae861..086d9d161f 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -6648,9 +6648,9 @@ declare namespace Stripe {
              * Once entirely reversed, a transfer can't be reversed again. This method will return an error when called on an already-reversed transfer,
              * or when trying to reverse more money than is left on a transfer.
              */
-            createReverse(transferId: string, data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            createReverse(transferId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
-            createReverse(transferId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            createReversal(transferId: string, data: transferReversals.IReversalCreationOptions, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            createReversal(transferId: string, options: HeaderOptions, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
+            createReversal(transferId: string, response?: IResponseFn<transferReversals.IReversal>): Promise<transferReversals.IReversal>;
 
             /**
              * By default, you can see the 10 most recent reversals stored directly on the transfer object, but you can also retrieve details about a
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 52e8579f45..6aef5e1432 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -602,6 +602,15 @@ stripe.customers.deleteSubscriptionDiscount("cus_5rfJKDJkuxzh5Q", "sub_5rfJxnBLG
 //#region Transfers Reversals tests
 // ##################################################################################
 
+stripe.transfers.createReversal("tr_17F2JBFuhr4V1legrq97JrFE", function (err, reversal) {
+    // asynchronously called
+});
+
+stripe.transfers.createReversal("tr_17F2JBFuhr4V1legrq97JrFE").then(function (reversal) {
+    // asynchronously called
+});
+
+
 //#endregion
 
 //#region Accounts test

From c7630e868ebb183b11d5d87ef0715efc48207c62 Mon Sep 17 00:00:00 2001
From: Armando Aguirre <armando.aguirre@microsoft.com>
Date: Fri, 2 Mar 2018 12:57:34 -0800
Subject: [PATCH 387/388] Removed README2.es.md and merge it to README.es.me

---
 README.es.md  | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++
 README2.es.md | 135 --------------------------------------------------
 2 files changed, 135 insertions(+), 135 deletions(-)
 delete mode 100644 README2.es.md

diff --git a/README.es.md b/README.es.md
index 48322596b3..ce94bb0298 100644
--- a/README.es.md
+++ b/README.es.md
@@ -198,3 +198,138 @@ Para más detalles, vea el [dtslint](https://github.com/Microsoft/dtslint#write-
 Realiza una prueba ejecutando `npm run lint package-name` donde `package-name` es el nombre de tu paquete.
 Este script utiliza [dtslint](https://github.com/Microsoft/dtslint).
 
+
+## FAQ
+
+#### ¿Cuál es exactamente la relación entre este repositorio y los paquetes de `@types` en NPM?
+
+La `master` branch es automaticamente publicada en el alcance de los  `@types` en NPM gracias a los [types-publisher](https://github.com/Microsoft/types-publisher).
+
+#### He enviado un pull request. ¿Cuánto tardará en ser merged?
+
+Esto depende, pero la mayoría de los pull requests serán merged en alrededor de una semana. PRs que hayan sido aprovados por un autor listado en el encabezado de las definiciones usualmente son merged más rápidamente; PRs para nuevas definiciones tomarán más tiempo ya que requieren más revisiones de los mantenedores. Cada PR es revisado por un miembro de TypeScript o DefinitelyTyped antes de ser merged, por favor se paciente debido a que factores humanos pueden causar retrasos. Revisa el [PR Burndown Board](https://github.com/DefinitelyTyped/DefinitelyTyped/projects/3?card_filter_query=is%3Aopen) para ver el progreso mientras los mantenedores trabajan on los PRs abiertos.
+
+#### Mi PR ha sido merged; ¿cuándo será actualizado el paquete de `@types` NPM?
+
+Los paquetes NPM deberán ser actualizados en unas cuantas horas. Si ha pasado más de 24 horas, menciona a @RyanCavanaugh y/o a @andy-ms en el PR para investigar.
+
+#### Estoy escribiendo una definición que depende de otra definición. Debería utilizar `<reference types="" />` o una import?
+
+Si el modulo al cual te estás refiriendo es un módulo externo (utiliza `export`), utilice una import.
+Si el módulo al cual te refieres es un módulo ambiente (utiliza `declare module`, o simplemente declara las globales), utilice `<reference types="" />`.
+
+#### He notado que algunos paquetes aquí tienen `package.json`.
+
+Normalmente no lo necesitaras. Cuando publicas un paquete normalmente nosotros automáticamente crearemos un `package.json` para eso.
+Un `package.json` puede ser incluido por el bien de especificar dependencias. Aquí tienen un [ejemplo](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/pikaday/package.json).
+No aceptamos otros campos, tales como `"description"`, para que sean definidos manualmente.
+Además, si necesitas referencia a una versión anterior de typings, debes hacerlo añadiendo `"dependencies": { "@types/foo": "x.y.z" }` al package.json.
+
+#### Algunos paquetes no tienen `tslint.json`, y algunos `tsconfig.json` no contienen `"noImplicitAny": true`, `"noImplicitThis": true`, o `"strictNullChecks": true`.
+
+Entonces están equivocados. Puedes ayudar enviando un pull request para arreglarlos.
+
+#### Puedo pedir una definition?
+
+Aquí están las [definiciones solicitadas actualmente](https://github.com/DefinitelyTyped/DefinitelyTyped/labels/Definition%3ARequest).
+
+#### ¿Qué pasa con las type definitions para el DOM?
+
+Si las types son parte de los estándares web, estas deberán ser contribuidas a [TSJS-lib-generator](https://github.com/Microsoft/TSJS-lib-generator) para que se hagan parte de la librería predeterminada  `lib.dom.d.ts`.
+
+#### Un paquete utiliza `export =`, pero prefiero utilizar las import predeterminadas. ¿Puedo cambiar `export =` por `export default`?
+
+Si la import predeterminada trabaja en tu ambiente, considera hacer un cambio en la opción de compilación [`--allowSyntheticDefaultImports`](http://www.typescriptlang.org/docs/handbook/compiler-options.html) opción compilar.
+No cambies la type definition si es preciso.
+Para un paquete NPM, `export =` es exacto si `node -p 'require("foo")'` es la export, y `export default` es exacto si `node -p 'require("foo").default'` es el export.
+
+#### Quiero usar las características de TypeScript 2.1 o superior.
+
+Entonces deberás añadir un comentario a la última línea de la definición en el encabezado (despues de `// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`): `// TypeScript Version: 2.1`.
+
+#### Quiero añadir un DOM API que no está presente en TypeScript por defecto.
+
+Esto puede pertenecer a [TSJS-Lib-Generator](https://github.com/Microsoft/TSJS-lib-generator#readme). Vea las guías allí.
+Si el estándar sigue siendo un borrador, este pertenece aquí.
+Utilice un nombre que empiece con `dom-` e incluya un link al estándar como el "Project" con el link en el encabezado.
+Cuando ya no sea un borrador, lo podremos eliminar desde DefinitelyType y hacer obsoleto el paquete `@types` asociado.
+
+#### Quiero actualizar un paquete a una nueva versión principal
+
+Si planeas continuar actualizando la versión anterior del paquete, puedes crear una subcarpeta con la versión actual p.ej. `v2`, y copia los archivos existentes. Si es así, necesitarás:
+
+1. Actualiza las rutas relativas en `tsconfig.json` al igual que `tslint.json`.
+2. Añadir reglas de mapeo de rutas para asegurart de que la prueba se está ejecutando contra la versión prevista.
+
+Por ejemplo [history v2 `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/history/v2/tsconfig.json) se ve así:
+
+```json
+{
+    "compilerOptions": {
+        "baseUrl": "../../",
+        "typeRoots": ["../../"],
+        "paths": {
+            "history": [ "history/v2" ]
+        },
+    },
+    "files": [
+        "index.d.ts",
+        "history-tests.ts"
+    ]
+}
+```
+
+Si hay otros paquetes en DefinitelyTyped que son incompatibles con la nueva versión, necesitaras mapear las rutas a la versión anterior. También deberá hacer esto para los paquetes que dependen de paquetes que dependen de una version anterior.
+
+Por ejemplo, `react-router` depende de `history@2`, así que [react-router `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router/tsconfig.json) tiene una ruta mapeada a "history": `[ "history/v2" ]`;
+transitivo así mismo, `react-router-bootstrap` (que depende de `react-router`) también añade una ruta mapeada en su [tsconfig.json](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router-bootstrap/tsconfig.json).
+
+Además, `/// <reference types=".." />` no trabajara con rutas mapeadas, así que las dependencias deberán utilizar `import`.
+
+#### ¿Cómo escribo definitions para paquetes que pueden ser usados globalmente y como un módulo?
+
+El manual de TypeScript contiene excelente [información general para escribir definiciones](https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html), ademas [este archivo de definiciones de ejemplo](https://www.typescriptlang.org/docs/handbook/declaration-files/templates/global-modifying-module-d-ts.html)  el cual muestra como crear una definición utilizando la sintaxis de módulo en ES6, asi como también especificando objetos que son disponibles en el alcance global. Esta técnica es demostrada practicamente en la [definición para big.js](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/big.js/index.d.ts), el cual es una librería que puede ser cargada globalmente a travéz de una etiqueta script en una página web, o importada via require o imports estilo ES6.
+
+Para probar como puede ser usada tu definición cuando se refieren globalmente o como un módulo importado, crea una carpeta `test`, y coloca dos archivos de prueba en él.  nombra uno `YourLibraryName-global.test.ts` y el otro `YourLibraryName-module.test.ts`.  El archivo de prueba _global_ debe ejercer la definición de acuerdo como va a ser usado en un script cargado en una página web donde la librería estará disponible en el alcance global - en este escenario no debes de especificar la sentencia de import. El archivo _módulo_ de prueba debe de ejercer la definición de acuerdo a como va a ser utilizado cuando sea importado (incluyendo las sentencias `import`). Si especificas un propiedad `files` en tu archivo tsconfig.json, asegurate de incluir ambos archivos de prueba. Un [ejemplo práctico de esto](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/big.js/test) es también disponible en la definición de big.js.
+
+Por favor tenga en cuenta que no es necesario para ejercer plenamente la definición en cada archivo de prueba - Es suficiente con probar solo los elementos globalmente accesibles en la prueba de archivos globales y ejercer la definición en el módulo del archivo de prueba, o viceversa.
+
+#### ¿Qué pasa con paquetes scoped?
+
+Types para un paquete scoped `@foo/bar` deberán ir en `types/foo__bar`. tenga en cuenta el doble guion bajo.
+
+Cuando `dts-gen` es utilizado como scaffold en un paquete scoped, las propiedades `paths` deberán ser adaptadas manualmente en el paquete generado
+`tsconfig.json` para referenciar correctamente el paquete scoped:
+
+```json
+{
+    "paths":{
+      "@foo/bar": ["foo__bar"]
+    }
+}
+```
+
+#### El historial de archivos en GitHub parece incompleto.
+
+GitHub no le hace [support](http://stackoverflow.com/questions/5646174/how-to-make-github-follow-directory-history-after-renames) historial de archivos para archivos renombrados. Utilice [`git log --follow`](https://www.git-scm.com/docs/git-log) en su lugar.
+
+#### Debería añadir un namespace que no exporte un módulo que utilice que utilice imports estilo ES6?
+
+Algunos paquetes, como [chai-http](https://github.com/chaijs/chai-http), exportan una función.
+
+importar este módulo con un ES6 style import de forma `import * as foo from "foo";` conduce al error:
+
+> error ts2497: El módulo 'foo' se resuelve en una entidad que no es un módulo y no se puede importar mediante esta construcción
+
+Este error puede ser suprimido al unir la declaración de una función con un namespace vacío del mismo nombre pero esta práctica no es recomendable.
+Esto es un citado común [Respuestas de Stack Overflow](https://stackoverflow.com/questions/39415661/what-does-resolves-to-a-non-module-entity-and-cannot-be-imported-using-this) con respecto a este asunto.
+
+Es más apropiado importar este módulo utilizando la sintaxis `import foo = require("foo");`, o utilizando una importación predeterminada como `import foo from "foo";` si usas la bandera `--allowSyntheticDefaultImports` si la ejecución de tu módulo soporta un esquema de interoperación para módulos no ECMAScript como tal.
+
+## Licencia
+
+Este proyecto es licenciado bajo la licencia MIT.
+
+Los derechos de autor de cada archivo de definición son respectivos de cada contribuidor listado al comienzo de cada archivo de definición.
+
+[![Analytics](https://ga-beacon.appspot.com/UA-47495295-4/borisyankov/DefinitelyTyped)](https://github.com/igrigorik/ga-beacon)
diff --git a/README2.es.md b/README2.es.md
deleted file mode 100644
index 9189d5ea2a..0000000000
--- a/README2.es.md
+++ /dev/null
@@ -1,135 +0,0 @@
-## FAQ
-
-#### ¿Cuál es exactamente la relación entre este repositorio y los paquetes de `@types` en NPM?
-
-La `master` branch es automaticamente publicada en el alcance de los  `@types` en NPM gracias a los [types-publisher](https://github.com/Microsoft/types-publisher).
-
-#### He enviado un pull request. ¿Cuánto tardará en ser merged?
-
-Esto depende, pero la mayoría de los pull requests serán merged en alrededor de una semana. PRs que hayan sido aprovados por un autor listado en el encabezado de las definiciones usualmente son merged más rápidamente; PRs para nuevas definiciones tomarán más tiempo ya que requieren más revisiones de los mantenedores. Cada PR es revisado por un miembro de TypeScript o DefinitelyTyped antes de ser merged, por favor se paciente debido a que factores humanos pueden causar retrasos. Revisa el [PR Burndown Board](https://github.com/DefinitelyTyped/DefinitelyTyped/projects/3?card_filter_query=is%3Aopen) para ver el progreso mientras los mantenedores trabajan on los PRs abiertos.
-
-#### Mi PR ha sido merged; ¿cuándo será actualizado el paquete de `@types` NPM?
-
-Los paquetes NPM deberán ser actualizados en unas cuantas horas. Si ha pasado más de 24 horas, menciona a @RyanCavanaugh y/o a @andy-ms en el PR para investigar.
-
-#### Estoy escribiendo una definición que depende de otra definición. Debería utilizar `<reference types="" />` o una import?
-
-Si el modulo al cual te estás refiriendo es un módulo externo (utiliza `export`), utilice una import.
-Si el módulo al cual te refieres es un módulo ambiente (utiliza `declare module`, o simplemente declara las globales), utilice `<reference types="" />`.
-
-#### He notado que algunos paquetes aquí tienen `package.json`.
-
-Normalmente no lo necesitaras. Cuando publicas un paquete normalmente nosotros automáticamente crearemos un `package.json` para eso.
-Un `package.json` puede ser incluido por el bien de especificar dependencias. Aquí tienen un [ejemplo](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/pikaday/package.json).
-No aceptamos otros campos, tales como `"description"`, para que sean definidos manualmente.
-Además, si necesitas referencia a una versión anterior de typings, debes hacerlo añadiendo `"dependencies": { "@types/foo": "x.y.z" }` al package.json.
-
-#### Algunos paquetes no tienen `tslint.json`, y algunos `tsconfig.json` no contienen `"noImplicitAny": true`, `"noImplicitThis": true`, o `"strictNullChecks": true`.
-
-Entonces están equivocados. Puedes ayudar enviando un pull request para arreglarlos.
-
-#### Puedo pedir una definition?
-
-Aquí están las [definiciones solicitadas actualmente](https://github.com/DefinitelyTyped/DefinitelyTyped/labels/Definition%3ARequest).
-
-#### ¿Qué pasa con las type definitions para el DOM?
-
-Si las types son parte de los estándares web, estas deberán ser contribuidas a [TSJS-lib-generator](https://github.com/Microsoft/TSJS-lib-generator) para que se hagan parte de la librería predeterminada  `lib.dom.d.ts`.
-
-#### Un paquete utiliza `export =`, pero prefiero utilizar las import predeterminadas. ¿Puedo cambiar `export =` por `export default`?
-
-Si la import predeterminada trabaja en tu ambiente, considera hacer un cambio en la opción de compilación [`--allowSyntheticDefaultImports`](http://www.typescriptlang.org/docs/handbook/compiler-options.html) opción compilar.
-No cambies la type definition si es preciso.
-Para un paquete NPM, `export =` es exacto si `node -p 'require("foo")'` es la export, y `export default` es exacto si `node -p 'require("foo").default'` es el export.
-
-#### Quiero usar las características de TypeScript 2.1 o superior.
-
-Entonces deberás añadir un comentario a la última línea de la definición en el encabezado (despues de `// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`): `// TypeScript Version: 2.1`.
-
-#### Quiero añadir un DOM API que no está presente en TypeScript por defecto.
-
-Esto puede pertenecer a [TSJS-Lib-Generator](https://github.com/Microsoft/TSJS-lib-generator#readme). Vea las guías allí.
-Si el estándar sigue siendo un borrador, este pertenece aquí.
-Utilice un nombre que empiece con `dom-` e incluya un link al estándar como el "Project" con el link en el encabezado.
-Cuando ya no sea un borrador, lo podremos eliminar desde DefinitelyType y hacer obsoleto el paquete `@types` asociado.
-
-#### Quiero actualizar un paquete a una nueva versión principal
-
-Si planeas continuar actualizando la versión anterior del paquete, puedes crear una subcarpeta con la versión actual p.ej. `v2`, y copia los archivos existentes. Si es así, necesitarás:
-
-1. Actualiza las rutas relativas en `tsconfig.json` al igual que `tslint.json`.
-2. Añadir reglas de mapeo de rutas para asegurart de que la prueba se está ejecutando contra la versión prevista.
-
-Por ejemplo [history v2 `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/history/v2/tsconfig.json) se ve así:
-
-```json
-{
-    "compilerOptions": {
-        "baseUrl": "../../",
-        "typeRoots": ["../../"],
-        "paths": {
-            "history": [ "history/v2" ]
-        },
-    },
-    "files": [
-        "index.d.ts",
-        "history-tests.ts"
-    ]
-}
-```
-
-Si hay otros paquetes en DefinitelyTyped que son incompatibles con la nueva versión, necesitaras mapear las rutas a la versión anterior. También deberá hacer esto para los paquetes que dependen de paquetes que dependen de una version anterior.
-
-Por ejemplo, `react-router` depende de `history@2`, así que [react-router `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router/tsconfig.json) tiene una ruta mapeada a "history": `[ "history/v2" ]`;
-transitivo así mismo, `react-router-bootstrap` (que depende de `react-router`) también añade una ruta mapeada en su [tsconfig.json](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router-bootstrap/tsconfig.json).
-
-Además, `/// <reference types=".." />` no trabajara con rutas mapeadas, así que las dependencias deberán utilizar `import`.
-
-#### ¿Cómo escribo definitions para paquetes que pueden ser usados globalmente y como un módulo?
-
-El manual de TypeScript contiene excelente [información general para escribir definiciones](https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html), ademas [este archivo de definiciones de ejemplo](https://www.typescriptlang.org/docs/handbook/declaration-files/templates/global-modifying-module-d-ts.html)  el cual muestra como crear una definición utilizando la sintaxis de módulo en ES6, asi como también especificando objetos que son disponibles en el alcance global. Esta técnica es demostrada practicamente en la [definición para big.js](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/big.js/index.d.ts), el cual es una librería que puede ser cargada globalmente a travéz de una etiqueta script en una página web, o importada via require o imports estilo ES6.
-
-Para probar como puede ser usada tu definición cuando se refieren globalmente o como un módulo importado, crea una carpeta `test`, y coloca dos archivos de prueba en él.  nombra uno `YourLibraryName-global.test.ts` y el otro `YourLibraryName-module.test.ts`.  El archivo de prueba _global_ debe ejercer la definición de acuerdo como va a ser usado en un script cargado en una página web donde la librería estará disponible en el alcance global - en este escenario no debes de especificar la sentencia de import. El archivo _módulo_ de prueba debe de ejercer la definición de acuerdo a como va a ser utilizado cuando sea importado (incluyendo las sentencias `import`). Si especificas un propiedad `files` en tu archivo tsconfig.json, asegurate de incluir ambos archivos de prueba. Un [ejemplo práctico de esto](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/big.js/test) es también disponible en la definición de big.js.
-
-Por favor tenga en cuenta que no es necesario para ejercer plenamente la definición en cada archivo de prueba - Es suficiente con probar solo los elementos globalmente accesibles en la prueba de archivos globales y ejercer la definición en el módulo del archivo de prueba, o viceversa.
-
-#### ¿Qué pasa con paquetes scoped?
-
-Types para un paquete scoped `@foo/bar` deberán ir en `types/foo__bar`. tenga en cuenta el doble guion bajo.
-
-Cuando `dts-gen` es utilizado como scaffold en un paquete scoped, las propiedades `paths` deberán ser adaptadas manualmente en el paquete generado
-`tsconfig.json` para referenciar correctamente el paquete scoped:
-
-```json
-{
-    "paths":{
-      "@foo/bar": ["foo__bar"]
-    }
-}
-```
-
-
-#### El historial de archivos en GitHub parece incompleto.
-
-GitHub no le hace [support](http://stackoverflow.com/questions/5646174/how-to-make-github-follow-directory-history-after-renames) historial de archivos para archivos renombrados. Utilice [`git log --follow`](https://www.git-scm.com/docs/git-log) en su lugar.
-
-#### Debería añadir un namespace que no exporte un módulo que utilice que utilice imports estilo ES6?
-
-Algunos paquetes, como [chai-http](https://github.com/chaijs/chai-http), exportan una función.
-
-importar este módulo con un ES6 style import de forma `import * as foo from "foo";` conduce al error:
-
-> error ts2497: El módulo 'foo' se resuelve en una entidad que no es un módulo y no se puede importar mediante esta construcción
-
-Este error puede ser suprimido al unir la declaración de una función con un namespace vacío del mismo nombre pero esta práctica no es recomendable.
-Esto es un citado común [Respuestas de Stack Overflow](https://stackoverflow.com/questions/39415661/what-does-resolves-to-a-non-module-entity-and-cannot-be-imported-using-this) con respecto a este asunto.
-
-Es más apropiado importar este módulo utilizando la sintaxis `import foo = require("foo");`, o utilizando una importación predeterminada como `import foo from "foo";` si usas la bandera `--allowSyntheticDefaultImports` si la ejecución de tu módulo soporta un esquema de interoperación para módulos no ECMAScript como tal.
-
-## Licencia
-
-Este proyecto es licenciado bajo la licencia MIT.
-
-Los derechos de autor de cada archivo de definición son respectivos de cada contribuidor listado al comienzo de cada archivo de definición.
-
-[![Analytics](https://ga-beacon.appspot.com/UA-47495295-4/borisyankov/DefinitelyTyped)](https://github.com/igrigorik/ga-beacon)

From 0276f68c5c3185fd46c22fd47306f63fb2775fdb Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Fri, 2 Mar 2018 17:22:19 -0800
Subject: [PATCH 388/388] Revert "[jss] Add more granular style typings"

---
 types/jss/css.d.ts        | 130 --------------------------------------
 types/jss/index.d.ts      |  83 ++++++++++++------------
 types/jss/jss-tests.ts    |  29 +--------
 types/jss/observable.d.ts |  17 -----
 types/jss/package.json    |   6 --
 5 files changed, 43 insertions(+), 222 deletions(-)
 delete mode 100644 types/jss/css.d.ts
 delete mode 100644 types/jss/observable.d.ts
 delete mode 100644 types/jss/package.json

diff --git a/types/jss/css.d.ts b/types/jss/css.d.ts
deleted file mode 100644
index 06a9c620cf..0000000000
--- a/types/jss/css.d.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-// These CSS typings adapted from TypeStyle: https://github.com/typestyle/typestyle
-
-import { Observable } from './observable'
-import * as csstype from 'csstype'
-
-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;
-	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 & JssProps & JssExpandArr;
-export type Style = SimpleStyle | Observable<csstype.PropertiesHyphen>;
diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index 767c777bb3..d0136216ed 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -1,15 +1,9 @@
-// Type definitions for jss 9.5
+// Type definitions for jss 9.3
 // 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
-
-import { Style } from './css';
-
-export type Styles<Name extends string = any> = Record<Name, Style>;
-export type Classes<Name extends string = any> = Record<Name, string>;
+// TypeScript Version: 2.2
 
 export interface Rule {
 	className: string;
@@ -19,12 +13,13 @@ export interface Rule {
 	prop(key: string, value: any): this;
 	toJSON(): string;
 }
-
-export interface StyleSheet<Name extends string = any> {
+export interface StyleSheet<T> {
 	// Gives auto-completion on the rules declared in `createStyleSheet` without
 	// causing errors for rules added dynamically after creation.
-	classes: Classes<Name>;
-	options: RuleOptions;
+	classes: {
+		[K in keyof T]: string;
+	} & { [key: string]: string };
+	options: any;
 	linked: boolean;
 	attached: boolean;
 	/**
@@ -40,21 +35,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: string, 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: { [key: string]: Style }, options?: Partial<RuleOptions>): Rule[];
 	/**
 	 * Get a rule by name.
 	 */
-	getRule(name: Name): Rule;
+	getRule(name: string): Rule;
 	/**
 	 * Delete a rule by name.
 	 * Returns `true`: if rule has been deleted from the DOM.
 	 */
-	deleteRule(name: Name): boolean;
+	deleteRule(name: string): boolean;
 	/**
 	 * Get index of a rule.
 	 */
@@ -63,37 +58,39 @@ 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: string, data: {}): this;
 	/**
 	 * Convert rules to a CSS string.
 	 */
 	toString(options?: { indent?: number }): string;
 }
-export type GenerateClassName<Name extends string = any> = (rule: Rule, sheet?: StyleSheet<Name>) => string;
-
+export type GenerateClassName<T> = (rule: Rule, sheet?: StyleSheet<T>) => string;
+export interface Style {
+	[key: string]: any;
+}
 export interface JSSPlugin {
 	[key: string]: () => Partial<{
-		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;
+		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,
 	}>;
 }
 export interface JSSOptions {
-	createGenerateClassName(): GenerateClassName;
+	createGenerateClassName(): GenerateClassName<any>;
 	plugins: ReadonlyArray<JSSPlugin>;
 	virtual: boolean;
 	insertionPoint: string | HTMLElement;
 }
-export interface RuleFactoryOptions<Name extends string = any> {
+export interface RuleFactoryOptions {
 	selector: string;
-	classes: Classes<Name>;
-	sheet: StyleSheet<Name>;
+	classes: { [key: string]: string };
+	sheet: StyleSheet<any>;
 	index: number;
 	jss: JSS;
-	generateClassName: GenerateClassName<Name>;
+	generateClassName: GenerateClassName<any>;
 }
 export interface RuleOptions {
 	index: number;
@@ -101,23 +98,23 @@ export interface RuleOptions {
 }
 declare class JSS {
 	constructor(options?: Partial<JSSOptions>);
-	createStyleSheet<Name extends string>(
-		styles: Partial<Styles<Name>>,
+	createStyleSheet<T>(
+		styles: T,
 		options?: Partial<{
-			media: string;
-			meta: string;
-			link: boolean;
-			element: HTMLStyleElement;
-			index: number;
-			generateClassName: GenerateClassName<Name>;
-			classNamePrefix: string;
+			media: string,
+			meta: string,
+			link: boolean,
+			element: HTMLStyleElement,
+			index: number,
+			generateClassName: GenerateClassName<T>,
+			classNamePrefix: string,
 		}>,
-	): StyleSheet<Name>;
-	removeStyleSheet(sheet: StyleSheet): this;
+	): StyleSheet<T>;
+	removeStyleSheet(sheet: StyleSheet<any>): this;
 	setup(options?: Partial<JSSOptions>): this;
 	use(plugin: JSSPlugin): this;
-	createRule(style: Style, options?: RuleFactoryOptions): Rule;
-	createRule<Name extends string>(name: Name, style: Style, options?: RuleFactoryOptions<Name>): Rule;
+	createRule(style: Style, options?: Partial<RuleFactoryOptions>): Rule;
+	createRule(name: string, style: Style, options?: Partial<RuleFactoryOptions>): Rule;
 }
 /**
  * Creates a new instance of JSS.
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 8e53780988..0cf3f51350 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -7,25 +7,13 @@ import {
 
 const jss = createJSS().setup({});
 
-const styleSheet = jss.createStyleSheet<string>(
+const styleSheet = jss.createStyleSheet(
 	{
 		ruleWithMockObservable: {
-			subscribe: observer => {
-				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() {}
-				};
-			}
+			subscribe() {}
 		},
 		container: {
 			display: 'flex',
-			'align-items': 'center',
 			width: 100,
 			opacity: .5,
 		},
@@ -65,21 +53,10 @@ styleSheet.addRules({
 	},
 });
 
-styleSheet.addRule('badProperty', {
-	thisIsNotAValidProperty: 'blah', // $ExpectError
-});
-
-styleSheet.addRule('badValue', { // $ExpectError
-	'align-items': 'thisIsNotAValidValue',
-});
-
 styleSheet.detach();
 
-const styleSheet2 = sharedInstance.createStyleSheet({
+sharedInstance.createStyleSheet({
 	container: {
 		background: '#000099',
 	}
 });
-
-styleSheet2.classes.container; // $ExpectType string
-styleSheet2.classes.notAValidKey; // $ExpectError
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
deleted file mode 100644
index 201f7e2d14..0000000000
--- a/types/jss/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "private": true,
-  "dependencies": {
-    "csstype": "^1.6.0"
-  }
-}